Min Chen 613a061977 Merge branch 'master' into vim51_win8 ... Conflicts: plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java		2013-03-04 17:32:52 -08:00
..
agent	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
alert	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
api	CLOUDSTACK-1253: Remove @author tag.	2013-02-15 10:42:06 -08:00
async	Sync master to javelin one more time	2013-02-01 11:37:33 -08:00
capacity	Correcting the license header problem that was introduced with commit	2013-02-22 11:06:47 -05:00
keystore	commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44	2012-12-17 17:44:39 -08:00
network	CLOUDSTACK-24: mipn feature for isolated and vpc networks	2013-03-04 11:02:09 +05:30
projects	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
resource	CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more	2013-02-26 23:16:17 -08:00
resourcelimit	rat: Fix license for ResourceLimitManagerImplTest.java	2013-02-13 14:32:33 +05:30
snapshot	Sync master to javelin one more time	2013-02-01 11:37:33 -08:00
storage/dao	removed MockAPI server	2013-01-28 17:50:38 +05:30
upgrade	ignore the tests looking for db	2013-03-01 12:04:06 +05:30
user	CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes and RegionsAPIUtil.	2013-02-26 14:21:21 +05:30
vm	Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes"	2013-03-04 23:32:52 +05:30
vpc	CLOUDSTACK-24: mipn feature for isolated and vpc networks	2013-03-04 11:02:09 +05:30