Murali Reddy 96c24930ae Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java		2013-02-01 08:45:53 +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	Merging events framework branch into master. This commit will bring	2013-02-01 01:37:24 +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	Merge branch 'ipv6'	2013-01-31 15:07:33 -08:00
network-elements	Merging events framework branch into master. This commit will bring	2013-02-01 01:37:24 +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	Merging events framework branch into master. This commit will bring	2013-02-01 01:37:24 +05:30