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
..
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	Fix some bugs and add java integration test for api rate limit plugin.	2013-01-17 15:13:51 -08:00
async	CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host.	2012-10-10 13:40:00 -07:00
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	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
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	fix CS-1080	2013-01-31 13:04:36 -08:00
utils/db	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
vm	Merge branch 'ipv6'	2013-01-31 15:07:33 -08:00
vpc	Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack	2013-02-01 08:45:53 +05:30