Min Chen 0d580ccb26 Fix NPE in adding host and also put back lost change in deployDataCenter ...

due to rebase with master.

2013-05-11 22:00:40 -07:00

..

api

Merge with latest code rebased from master

2013-05-11 21:05:54 -07:00

components-api

Removing ^M's from code.

2013-04-04 00:53:20 +05:30

compute

CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms

2013-02-20 16:42:56 +05:30

network

CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms

2013-02-20 16:42:56 +05:30

orchestration

CLOUDSTACK-2096 Deployment Planner - Deployment planner is not looking for hosts in other clusters when vm is being started.

2013-04-19 17:55:37 -07:00

planning/src/org/apache/cloudstack/platform/planning

Added engine

2012-11-05 09:14:14 -08:00

schema

Merged

2013-05-10 16:21:43 -07:00

service

CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms

2013-02-20 16:42:56 +05:30

storage

Fix NPE in adding host and also put back lost change in deployDataCenter

2013-05-11 22:00:40 -07:00

pom.xml

Merged

2013-05-10 16:21:43 -07:00