etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
History
Harikrishna Patnala 8992e18836 CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance 
(cherry picked from commit 522208dec2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/template/TemplateManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 		2014-11-25 22:50:03 +05:30
..
conf Summary: Updated sudoers approved commands for cloud user 2013-10-23 13:42:16 -07:00
resources CLOUDSTACK-7144: No GSLB provider is available during assigning load 2014-11-25 19:50:37 +05:30
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance 2014-11-25 22:50:03 +05:30
test CLOUDSTACK-7144: No GSLB provider is available during assigning load 2014-11-25 19:50:37 +05:30
pom.xml Revert "Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path"" 2014-11-21 18:04:33 +05:30