frank
15ead099a1
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
able to start vm
Conflicts:
client/tomcatconf/componentContext.xml.in
server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-21 15:48:08 -08:00
frank
55b77c7c8f
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
adding missing scripts back
Conflicts:
client/pom.xml
client/tomcatconf/commands.properties.in
server/src/com/cloud/server/ManagementServerImpl.java
2013-02-21 15:46:11 -08:00
frank
1f15c1e9e7
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
fixing bugs to align to new code base
Conflicts:
client/tomcatconf/componentContext.xml.in
2013-02-21 15:42:38 -08:00
frank
54741a2b0f
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
add api annotation to baremetal related api
2013-02-21 15:41:21 -08:00
Rohit Yadav
80d58b6c73
CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Rohit Yadav
fcb4b7a6a7
CLOUDSTACK-1237: Fix an overriding method that would help find template adapter
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 15:19:30 +05:30
Kelven Yang
7bd8bec68a
Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a
2013-01-31 17:20:19 -08:00
Sheng Yang
5cb9df91a1
Merge branch 'ipv6'
...
Conflicts:
api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
Kelven Yang
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
Rohit Yadav
d7ad2da7e0
server: Fix network refactor regressions for CLOUDSTACK-297
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:53 -08:00
David Nalley
1b39b0e908
fixing licensing headers
2013-01-29 23:45:11 -05:00
frank
1f7eaf3d61
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
merge baremetal feature to master
2013-01-29 17:19:57 -08:00
