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
..
rhel7	Merge branch '4.5' after 4.5.1 vote passes	2015-05-07 16:03:26 +02:00
cloud-agent.rc	Merge release branch 4.9 to master	2017-04-20 19:32:20 +05:30
cloud-ipallocator.rc	CLOUDSTACK-8815 : Issues with cloudstack-management init script	2015-09-28 17:31:07 +05:30
cloud-management.rc	CLOUDSTACK-10012: Migrate to Embedded Jetty	2017-11-03 23:57:25 +05:30
cloud-usage.rc	CLOUDSTACK-7633: fix "Provides" in most LSB headers	2014-10-12 23:58:50 -04:00
cloud.spec	Merge remote-tracking branch 'origin/4.11'	2018-10-05 05:18:42 +05:30
cloudstack-agent.te	CLOUDSTACK-337 - first iteration of an agent SELinux policy	2013-03-16 13:26:24 -04:00
cloudstack-sccs	follow up fix for CLOUDSTACK-1049	2013-10-22 15:53:55 -07:00
replace.properties	Dynamic loading of DB driver + support for other DB providers	2016-05-23 15:50:28 +02:00