Marcus Sorensen c541f15dcd Merge branch 'master' into resizevolume ... Conflicts: test/integration/smoke/test_volumes.py		2013-01-16 14:00:48 -07:00
..
acl/static-role-based	StaticRoleBased: commands.properties is actually cfg for this plugin	2013-01-14 19:01:26 -08:00
api/discovery	ApiDiscovery: Use UserContext getCallerUser, do a lazy eval to get account service	2013-01-15 16:11:51 -08:00
deployment-planners	Start removing the old ant build files	2012-12-07 15:58:56 +01:00
file-systems/netapp	Summary: Fixes for api_refactoring	2013-01-09 17:48:22 -07:00
host-allocators/random	Start removing the old ant build files	2012-12-07 15:58:56 +01:00
hypervisors	Merge branch 'master' into resizevolume	2013-01-16 14:00:48 -07:00
network-elements	Revert "Summary: partical check-in for L4-L7 network services in the shared"	2013-01-16 16:05:17 +05:30
storage-allocators/random	Start removing the old ant build files	2012-12-07 15:58:56 +01:00
user-authenticators	Summary: Fixes for api_refactoring	2013-01-09 17:48:22 -07:00
pom.xml	Summary: Fixes for api_refactoring	2013-01-09 17:48:22 -07:00