Merge release branch 4.9 to master * 4.9: Emit a VOLUME_DELETE usage event when account deletion destroys an instance.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d360eded Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d360eded Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d360eded Branch: refs/heads/master Commit: d360ededed0f536ad7151379094b54a2b2d02faf Parents: ccd1734 72612f7 Author: Rajani Karuturi <[email protected]> Authored: Mon Oct 24 11:15:26 2016 +0530 Committer: Rajani Karuturi <[email protected]> Committed: Mon Oct 24 11:15:26 2016 +0530 ---------------------------------------------------------------------- .../src/com/cloud/user/AccountManagerImpl.java | 12 +- .../com/cloud/user/AccountManagerImplTest.java | 220 ++----------- ...AccountManagerImplVolumeDeleteEventTest.java | 209 +++++++++++++ .../cloud/user/AccountManagetImplTestBase.java | 242 +++++++++++++++ .../test/com/cloud/user/MockUsageEventDao.java | 307 +++++++++++++++++++ 5 files changed, 787 insertions(+), 203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d360eded/server/src/com/cloud/user/AccountManagerImpl.java ----------------------------------------------------------------------
