You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/13 20:04:26 UTC

[2/2] git commit: updated refs/heads/master to 7c9a8c1

Merge pull request #1234 from shapeblue/master-9153

CLOUDSTACK-9153: When negative credits are added to an account theWhen negative credits are added to an account the balance credits can become negative for that account. This will fix will lock the account if quota is enforced.

* pr/1234:
  CLOUDSTACK-9153: When negative credits are added to an account the balance credits can become negative for that account. This will fix will lock the account if quota is enforced.

Signed-off-by: Remi Bergsma <gi...@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c9a8c17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c9a8c17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c9a8c17

Branch: refs/heads/master
Commit: 7c9a8c1740c4dee52c235e65ea1dce1cca87b00b
Parents: 9862b2c 5025011
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Dec 13 20:03:58 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Dec 13 20:03:59 2015 +0100

----------------------------------------------------------------------
 .../api/response/QuotaResponseBuilder.java      |  2 -
 .../api/response/QuotaResponseBuilderImpl.java  | 58 +++++++++++++-------
 .../apache/cloudstack/quota/QuotaService.java   |  4 ++
 .../cloudstack/quota/QuotaServiceImpl.java      | 32 +++++++++--
 .../response/QuotaResponseBuilderImplTest.java  | 18 +++---
 5 files changed, 79 insertions(+), 35 deletions(-)
----------------------------------------------------------------------