Wei Zhou cbe2560a78 CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage) ... (cherry picked from commit 4bb85cd7f9) Conflicts: server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java		2014-01-08 15:38:06 +01:00
..
api	listNics API: added optional networkId parameter allowing to list nics by network id for the specific vm	2014-01-06 17:09:14 -08:00
components-api	CLOUDSTACK-5812: pass podId information when request for secondary ip address in Basic zone guest network	2014-01-06 17:22:17 -08:00
network	Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code.	2013-11-21 07:56:47 -08:00
orchestration	CLOUDSTACK-5827: [Automation] Destroy VM failed, while deleting account	2014-01-08 18:38:59 +05:30
schema	CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)	2014-01-08 15:38:06 +01:00
service	Bump 4.3.0 to 4.4.0 in master	2013-11-21 16:01:15 +01:00
storage	CLOUDSTACK-5701: physical size is not getting updated in snapshot_store_ref table.	2014-01-06 11:36:43 +05:30
pom.xml	Bump 4.3.0 to 4.4.0 in master	2013-11-21 16:01:15 +01:00