Alex Huang 10d9c019a9 All merge conflicts resolved		2013-01-18 12:14:57 -08:00
..
agent	Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn	2013-01-17 11:19:56 -07:00
alert	api: Entities will extend InternalIdentity and Identity	2012-12-26 19:11:15 -08:00
async	api: Entities will extend InternalIdentity and Identity	2012-12-26 19:11:15 -08:00
capacity	api: Entities will extend InternalIdentity and Identity	2012-12-26 19:11:15 -08:00
certificate	Enforce InternalIdentity interface on all VO classes that impls long getId()	2012-12-26 15:09:44 -08:00
configuration	api: Entities will extend InternalIdentity and Identity	2012-12-26 19:11:15 -08:00
consoleproxy	License header updates for the core folder from Chip Childers	2012-07-02 09:54:47 -04:00
event	Merge branch 'api_refactoring' into javelin	2013-01-08 12:36:04 -08:00
exception	License header updates for the core folder from Chip Childers	2012-07-02 09:54:47 -04:00
host	api: Entities will extend InternalIdentity and Identity	2012-12-26 19:11:15 -08:00
hypervisor	api: Entities will extend InternalIdentity and Identity	2012-12-26 19:11:15 -08:00
info	License header updates for the core folder from Chip Childers	2012-07-02 09:54:47 -04:00
network	CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version	2013-01-18 16:49:52 +05:30
resource	License header updates for the core folder from Chip Childers	2012-07-02 09:54:47 -04:00
serializer	License header updates for the core folder from Chip Childers	2012-07-02 09:54:47 -04:00
storage	Get rid of PlugService annotation, replace it with Spring standard injection in command classes	2013-01-16 18:44:44 -08:00
user	api: Entities will extend InternalIdentity and Identity	2012-12-26 19:11:15 -08:00
vm	Remove unused fields in VMInstanceVO.java	2013-01-15 18:28:51 -08:00