Prachi Damle ca1a7948f1 Merge branch 'master' into affinity_groups ... Conflicts: api/src/org/apache/cloudstack/api/BaseCmd.java client/tomcatconf/applicationContext.xml.in client/tomcatconf/componentContext.xml.in server/src/com/cloud/api/ApiDBUtils.java server/src/com/cloud/server/ManagementServerImpl.java server/src/com/cloud/user/AccountManagerImpl.java setup/db/db/schema-410to420.sql		2013-04-05 13:49:20 -07:00
..
apidoc	Integration testcase and the config file needed, that runs with marvin.	2013-04-03 16:22:58 -07:00
appliance	appliance: While building systemvms fetch src tarball from new git repo	2013-03-26 11:26:50 +05:30
bugs-wiki	fixing license headers in marvin	2012-07-04 18:45:08 -04:00
build	docs: Build the installation guide instead of "all"	2012-10-22 12:08:11 +02:00
cli	cli: Make cloudmonkey use new url and dev ml	2013-03-26 11:25:26 +05:30
devcloud	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
devcloud-kvm	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
eclipse	Added a shell script to set the maven profiles in eclipse	2013-03-13 20:21:58 -07:00
git	Summary: Add default newline after summary in prepare-commit-msg	2013-02-06 10:23:17 -07:00
marvin	Merge branch 'master' into affinity_groups	2013-04-05 13:49:20 -07:00
waf	Patch from Gavin Lee: Change license to ASL2.0 in server and tools	2012-08-30 10:36:29 -04:00
whisker	Updating the java-ipv6 legal docs to reflect the newly added NOTICE and copyright statements for version 0.10	2013-02-20 14:50:36 -05:00
pom.xml	Fix broken build: apidocs had been commented out for some strange reason	2013-02-22 10:13:30 -08:00