Wei Zhou cbe2560a78 CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage) ...

(cherry picked from commit 4bb85cd7f921d66eabe72d00dcde817affd48732)

Conflicts:

	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java

2014-01-08 15:38:06 +01:00

..

conf

Summary: Updated sudoers approved commands for cloud user

2013-10-23 13:42:16 -07:00

resources

CLOUDSTACK-4941:

2013-12-18 16:27:20 -08:00

scripts

License header updates for the server folder.

2012-08-03 09:41:27 -04:00

src

CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)

2014-01-08 15:38:06 +01:00

test

CLOUDSTACK-5810: addSecondaryIp to vm's nic - derive the ip owner from the vm instance account, not from the caller

2014-01-06 17:09:14 -08:00

pom.xml

Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies

2013-12-20 17:21:34 -08:00