etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/core/src/com/cloud
History
Kishan Kavala 9ea90c3359 Merge branch 'master' into regions 
Conflicts:
	client/tomcatconf/components.xml.in
	server/src/com/cloud/api/ApiResponseHelper.java
 		2013-02-01 11:38:16 +05:30
..
agent Merge branch 'ipv6' 2013-01-31 15:07:33 -08: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 api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -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 Merging events framework branch into master. This commit will bring 2013-02-01 01:37:24 +05:30
user Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:41:59 +05:30
vm api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00