Alex Huang 3df5571d2e Resolved merge conflicts		2013-08-12 20:15:24 -07:00
..
api	Resolved merge conflicts	2013-08-12 20:15:24 -07:00
components-api	Switched over to use the new jobs framework	2013-08-02 11:07:55 -07:00
network	Updating pom.xml version numbers for release 4.3.0-SNAPSHOT	2013-08-01 10:35:00 -04:00
orchestration	Resolved merge conflicts	2013-08-12 20:15:24 -07:00
schema	Split up the volume manager into two. One part is for self-service. One part belongs in the engine. Removed old 2.1 upgrade code. In order to upgrade from 2.1, you must upgrade to 2.2. first. So therefore these files are no necessary in the newer versions of CloudStack	2013-08-12 19:05:22 -07:00
service	Fixed the referral to the deleted project	2013-08-08 15:02:40 -07:00
storage	Moved volume related code into cloud-engine-orchestration	2013-08-12 19:06:51 -07:00
pom.xml	Revert "Reverting the range of commits that broke the build"	2013-08-08 15:02:40 -07:00