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
..
apidoc	Merge branch 'master' into rbac	2014-02-04 12:07:32 -08:00
appliance	update packages list before getting jre 7	2014-01-31 09:42:31 +01:00
bugs-wiki	fixing license headers in marvin	2012-07-04 18:45:08 -04:00
build	create a (mini-)branch instead of creating a commit to revert	2013-12-23 14:35:29 +01:00
checkstyle	Change checkstyle to run on every sub project, so it will also run when you build an individual module	2014-01-09 17:00:11 +01:00
cli	tools: Remove cloudmonkey, add info in INSTALL.md	2013-07-28 22:53:12 +05:30
devcloud	CLOUDSTACK-5413: Fixed bug CLOUDSTACK-5413	2013-12-09 19:45:22 +05:30
devcloud-kvm	Bump 4.3.0 to 4.4.0 in master	2013-11-21 16:01:15 +01:00
eclipse	forgot about rat	2013-10-29 14:35:45 +01:00
git	Summary: Add default newline after summary in prepare-commit-msg	2013-02-06 10:23:17 -07:00
marvin	Fix for CLOUDSTACK-5864	2014-01-15 11:45:58 +01:00
ngui	More license header fixes for tools/ngui	2013-07-30 10:06:10 -04:00
transifex	Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config	2014-01-17 11:15:09 +00:00
whisker	Adding httpclient ssl source files to legal documentation	2013-08-26 12:36:59 -04:00
pom.xml	Bump 4.3.0 to 4.4.0 in master	2013-11-21 16:01:15 +01:00