etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/engine
History
Rohit Yadav b6302d4e90 Merge remote-tracking branch 'origin/4.11' 
Conflicts resolved for:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/vm/UserVmManagerImpl.java
tools/marvin/setup.py

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 		2018-10-05 05:18:42 +05:30
..
api Support online migration of a virtual disk on XenServer from non-managed storage to managed storage 2018-08-12 00:23:36 -06:00
components-api Merge remote-tracking branch 'origin/4.11' 2018-09-12 14:17:29 +05:30
network Cleanup POMs (#2613) 2018-07-25 14:39:37 -03:00
orchestration Merge remote-tracking branch 'origin/4.11' 2018-10-05 05:18:42 +05:30
schema Merge remote-tracking branch 'origin/4.11' 2018-10-05 05:18:42 +05:30
service Cleanup POMs (#2613) 2018-07-25 14:39:37 -03:00
storage CLOUDSTACK-10365: Change the "getXXX" boolean method names to "isXXX" (#2847) 2018-09-22 17:20:48 +02:00
pom.xml Cleanup POMs (#2613) 2018-07-25 14:39:37 -03:00