Prachi Damle 4a1eaf45bd Merge branch 'master' into affinity_groups ... Conflicts: engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java setup/db/db/schema-410to420.sql		2013-04-10 11:34:30 -07:00
..
apidoc	Merge branch 'master' into affinity_groups	2013-04-10 11:34:30 -07:00
appliance	CLOUDSTACK-1867: Comment vmware-tools installation, use open-vm-tools	2013-04-10 23:14: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: Remove tabularize, fix display types, make code pep8 compliant	2013-04-05 23:06:44 +05:30
devcloud	QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package	2013-04-09 14:45:27 -07:00
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-10 11:34:30 -07:00
whisker	Removing waf legal docs	2013-04-05 16:44:08 +01:00
pom.xml	Fix broken build: apidocs had been commented out for some strange reason	2013-02-22 10:13:30 -08:00