Marcus Sorensen c541f15dcd Merge branch 'master' into resizevolume ... Conflicts: test/integration/smoke/test_volumes.py		2013-01-16 14:00:48 -07:00
..
conf	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src/com/cloud	Merge branch 'master' into resizevolume	2013-01-16 14:00:48 -07:00
test	Revert "Summary: partical check-in for L4-L7 network services in the	2013-01-16 16:43:37 +05:30
pom.xml	Summary: Fixes for api_refactoring	2013-01-09 17:48:22 -07:00