etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/systemvm
History
Daan Hoogland 148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master 
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py
 		2014-10-16 12:29:37 +02:00
..
bindir Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
certs Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
conf CLOUDSTACK-6204: removing realhostip dependency 2014-03-09 13:46:57 -07:00
conf.dom0 Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
css Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
distro CLOUDSTACK-6220: Take 2, Fix cloudstack init scripts so that they 2014-03-10 16:11:52 -06:00
images Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
js CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI and windows guestOS on VMware. 2014-10-13 00:06:13 -04:00
libexec Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
patches/debian Merge remote-tracking branch 'origin/4.5' into merge-master 2014-10-16 12:29:37 +02:00
scripts CLOUDSTACK-6328: added license header and removed white space 2014-05-27 15:56:47 +05:30
ui Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
vm-script Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
cloudpatch-descriptor.xml Move the system vm to a separate maven project. 2013-09-20 18:31:02 +08:00
pom.xml Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
systemvm-descriptor.xml Remove duplicate scripts and move the remaining items to the systemvm project 2013-10-14 08:02:35 +02:00