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

..

src

Merge branch 'master' into events-framework

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

test

Summary: adding resizeVolume api call

2013-01-16 17:43:35 -07:00

pom.xml

Unit test additions (and some minor command class changes to support testing)

2012-11-20 12:21:54 -05:00