Prachi Damle f84375442e Merge branch 'master' into rbac ... Conflicts: api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/api/query/QueryManagerImpl.java server/src/com/cloud/template/TemplateAdapterBase.java setup/db/db/schema-430to440.sql tools/apidoc/gen_toc.py		2014-02-04 12:07:32 -08:00
..
resources/META-INF/cloudstack	Correcting the "security.checkers.order" to include the class name for RoleBasedEntityAccessChecker	2014-01-22 13:59:57 -08:00
src	CLOUDSTACK-5561 Support of multiple public vlans on VR running in HyperV	2014-01-28 07:03:08 +05:30
test	Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials	2014-01-09 21:36:34 -07:00
pom.xml	Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse.	2014-01-09 16:12:25 -08:00