You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/05/04 14:29:03 UTC
[2/2] git commit: updated refs/heads/master to ccb4fe0
Merge pull request #1350 from shapeblue/master-quotalock
Quota: consolidated lockable account check to a method. Added unit tests to check lockablity of various accounts.
Currently normal user and domain admin accounts are eligible for locking.
* pr/1350:
Quota: consolidated lockable account check to a method. Added unit tests to check lockablity of various accounts
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ccb4fe0e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ccb4fe0e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ccb4fe0e
Branch: refs/heads/master
Commit: ccb4fe0e70acee5b1d8b1707272d017244648bb8
Parents: c9319e2 04ca7e5
Author: Will Stevens <wi...@gmail.com>
Authored: Wed May 4 10:27:51 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Wed May 4 10:27:52 2016 -0400
----------------------------------------------------------------------
.../cloudstack/quota/QuotaAlertManagerImpl.java | 8 +++--
.../apache/cloudstack/quota/QuotaManager.java | 3 ++
.../cloudstack/quota/QuotaManagerImpl.java | 5 +++
.../quota/dao/QuotaBalanceDaoImpl.java | 2 +-
.../cloudstack/quota/QuotaManagerImplTest.java | 38 ++++++++++++++++++++
.../cloudstack/api/command/QuotaCreditsCmd.java | 4 +--
.../api/response/QuotaResponseBuilder.java | 2 +-
.../api/response/QuotaResponseBuilderImpl.java | 18 +++++-----
.../cloudstack/quota/QuotaServiceImpl.java | 6 ++--
.../api/command/QuotaCreditsCmdTest.java | 4 +--
.../response/QuotaResponseBuilderImplTest.java | 2 +-
11 files changed, 69 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ccb4fe0e/framework/quota/src/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ccb4fe0e/framework/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ccb4fe0e/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
----------------------------------------------------------------------