Rohit Yadav 5119785cf7 Get latest changes, merge branch 'master' into api_refactoring ... Conflicts: api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java setup/db/db/schema-40to410.sql Signed-off-by: Rohit Yadav <bhaisaab@apache.org>		2013-01-04 22:21:20 -08:00
..
agent	bug CS-16036 ResourceManagerTest does not test what is says it tests	2012-08-16 12:11:41 -07:00
api	Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.	2013-01-02 17:38:58 -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	Get latest changes, merge branch 'master' into api_refactoring	2013-01-04 22:21:20 -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
snapshot	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
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	Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.	2013-01-02 17:38:58 -08:00
utils/db	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
vm	Move view based VO and Dao classes to cloud-server module to hide the	2012-12-14 10:47:58 -08:00
vpc	Get latest changes, merge branch 'master' into api_refactoring	2013-01-04 22:21:20 -08:00