Min Chen 93f14e7c65 Merge branch 'master' into vim51_win8 ...

Conflicts:
	client/tomcatconf/componentContext.xml.in
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
	vmware-base/test/com/cloud/vmware/TestVMWare.java

2013-02-27 17:47:10 -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-705 IP Address reservation for Isolated Guest Networks

2013-02-22 15:50:33 +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

Fix issues after another round of merge

2013-01-11 16:54:32 -08:00

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

Add some comments on some code source to give credit to vmware sample

2013-02-27 13:46:43 -08:00

vpc

CLOUDSTACK-1332: Add IPv6 DNS for Zone

2013-02-25 16:08:10 -08:00