cloudstack/server/src
Nitin Mehta adfb44ec33 CLOUDSTACK-6597: Updatevm - root admin should be allowed to change instance name
(cherry picked from commit 18c6ae0796)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
2014-07-30 12:52:15 +02:00
..
com/cloud CLOUDSTACK-6597: Updatevm - root admin should be allowed to change instance name 2014-07-30 12:52:15 +02:00
org/apache/cloudstack CLOUDSTACK-6864: UploadSSlCert API requires double encoding of URL params 2014-06-12 12:23:52 +02:00