etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api/src/com/cloud
History
Murali Reddy 0f9f428ad1 Merge branch 'master' into events-framework 
Conflicts:
	api/src/com/cloud/event/EventTypes.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	tools/whisker/LICENSE
	tools/whisker/descriptor-for-packaging.xml
 		2013-01-31 19:52:27 +05:30
..
agent/api CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
alert api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
api/commands Merge branch 'master' into events-framework 2013-01-17 23:56:37 +05:30
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
cluster api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
configuration api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
consoleproxy committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
dao EntityManager: Implement method to search by uuid including removed entities 2013-01-23 14:57:41 -08:00
dc api: Extend to infra. interface entities that are not associated with any account 2013-01-06 15:36:59 -08:00
deploy api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
domain api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
event Merge branch 'master' into events-framework 2013-01-31 19:52:27 +05:30
exception Merge branch 'master' into api_limit 2013-01-16 22:48:22 -08:00
host CloudStack CLOUDSTACK-774 2013-01-29 17:19:57 -08:00
hypervisor api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
network Merge branch 'master' into events-framework 2013-01-31 19:52:27 +05:30
offering reverting the earlier commit 432ea9c7d4 2013-01-16 15:10:27 +05:30
org api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
projects api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
resource CLOUDSTACK-355: fix count for listSwiftsCmd. 2013-01-22 17:14:44 -08:00
serializer api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
server CLOUDSTACK-355: create DB view for ZoneResponse to fix count for 2013-01-22 16:39:45 -08:00
storage - fix snapshot state transition bug 2013-01-31 19:37:52 +05:30
template api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
user ApiDiscovery: Use UserContext getCallerUser, do a lazy eval to get account service 2013-01-15 16:11:51 -08:00
uservm api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
vm CLOUDSTACK-297: Reset SSH key to access VM 2013-01-30 17:33:44 -08:00