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

..

acl/static-role-based

StaticRoleBased: commands.properties is actually cfg for this plugin

2013-01-14 19:01:26 -08:00

api

Increase sleep time to allow token expire to account for windows

2013-01-29 11:19:09 -08:00

deployment-planners

Start removing the old ant build files

2012-12-07 15:58:56 +01:00

event-bus/rabbitmq

publish state change events on Network and VirtualMachine resource state

2013-01-28 17:02:21 +05:30

file-systems/netapp

Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException

2013-01-16 22:36:34 -08:00

host-allocators/random

Start removing the old ant build files

2012-12-07 15:58:56 +01:00

hypervisors

CLOUDSTACK-299: Egress firewall rules feature for guest network on VR

2013-01-31 11:20:47 +05:30

network-elements

Merge branch 'master' into events-framework

2013-01-31 19:52:27 +05:30

storage-allocators/random

Start removing the old ant build files

2012-12-07 15:58:56 +01:00

user-authenticators

Merge branch 'master' into test-merge-api

2012-12-23 13:54:46 -08:00

pom.xml

Merge branch 'master' into events-framework

2013-01-31 19:52:27 +05:30