Kishan Kavala 9ea90c3359 Merge branch 'master' into regions ... Conflicts: client/tomcatconf/components.xml.in server/src/com/cloud/api/ApiResponseHelper.java		2013-02-01 11:38:16 +05:30
..
agent	bug CS-16036 ResourceManagerTest does not test what is says it tests	2012-08-16 12:11:41 -07:00
alert	Network-refactor: verify injection is correct. Verify that dhcp service providers and ip deployers get injected independently in addition to the list of network elements	2013-01-09 15:49:02 -08:00
api	removed MockAPI server	2013-01-28 17:50:38 +05:30
async	Apply API refactoring changes. Make changes to Regions API to work with new code	2013-01-25 18:41:59 +05:30
cluster	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
keystore	commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44	2012-12-17 17:44:39 -08:00
network	Merge branch 'ipv6'	2013-01-31 15:07:33 -08:00
projects	Move view based VO and Dao classes to cloud-server module to hide the	2012-12-14 10:47:58 -08:00
resource	CLOUDSTACK-355: fix count for listSwiftsCmd.	2013-01-22 17:14:44 -08:00
snapshot	Merging events framework branch into master. This commit will bring	2013-02-01 01:37:24 +05:30
storage/dao	removed MockAPI server	2013-01-28 17:50:38 +05:30
upgrade	Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2)	2012-08-13 16:50:06 -07:00
user	Merge branch 'master' into regions	2013-02-01 11:38:16 +05:30
utils/db	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
vm	Merge branch 'master' into regions	2013-02-01 11:38:16 +05:30
vpc	Merge branch 'master' into regions	2013-02-01 11:38:16 +05:30