Merge branch 'hotfix/CID-1256277'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05b2ec4f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05b2ec4f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05b2ec4f Branch: refs/heads/master Commit: 05b2ec4f55991136d4ecff7e18cbb93ffbb5b236 Parents: 701199f 5906670 Author: Daan Hoogland <[email protected]> Authored: Mon Dec 8 12:40:08 2014 +0100 Committer: Daan Hoogland <[email protected]> Committed: Mon Dec 8 12:40:08 2014 +0100 ---------------------------------------------------------------------- server/src/com/cloud/user/AccountManagerImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
