You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/09/03 02:57:06 UTC
[1/2] git commit: updated refs/heads/master to 47365ac
Repository: cloudstack
Updated Branches:
refs/heads/master f9450cc11 -> 47365ac4b
CLOUDSTACK-7471:Regular user is allowed to deleteNetwork/RestartNetwork
that does not belong to him.He is also able to deploy Vm for other
users.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5f7b4dbb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5f7b4dbb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5f7b4dbb
Branch: refs/heads/master
Commit: 5f7b4dbbb2eea9f64687c31daa55708010e36eef
Parents: f9450cc
Author: Min Chen <mi...@citrix.com>
Authored: Tue Sep 2 17:23:19 2014 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Sep 2 17:24:08 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/user/AccountManagerImpl.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f7b4dbb/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 98efc79..60836a5 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -537,8 +537,6 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
granted = true;
break;
}
- granted = true;
- break;
}
if (!granted) {
[2/2] git commit: updated refs/heads/master to 47365ac
Posted by mc...@apache.org.
Fix incorrectly written unit tests.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/47365ac4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/47365ac4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/47365ac4
Branch: refs/heads/master
Commit: 47365ac4ba8320d1da076e311bab9d2aacb547fb
Parents: 5f7b4db
Author: Min Chen <mi...@citrix.com>
Authored: Tue Sep 2 17:55:44 2014 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Sep 2 17:55:44 2014 -0700
----------------------------------------------------------------------
server/test/com/cloud/user/AccountManagerImplTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47365ac4/server/test/com/cloud/user/AccountManagerImplTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/user/AccountManagerImplTest.java b/server/test/com/cloud/user/AccountManagerImplTest.java
index 176cf1d..5fff331 100644
--- a/server/test/com/cloud/user/AccountManagerImplTest.java
+++ b/server/test/com/cloud/user/AccountManagerImplTest.java
@@ -253,8 +253,8 @@ public class AccountManagerImplTest {
Mockito.when(_accountDao.findById(42l)).thenReturn(account);
Mockito.when(
securityChecker.checkAccess(Mockito.any(Account.class),
- Mockito.any(AccessType.class), Mockito.anyString(),
- Mockito.any(ControlledEntity[].class)))
+ Mockito.any(ControlledEntity.class), Mockito.any(AccessType.class),
+ Mockito.anyString()))
.thenReturn(true);
Mockito.when(_accountDao.remove(42l)).thenReturn(true);
Mockito.when(_configMgr.releaseAccountSpecificVirtualRanges(42l))
@@ -279,8 +279,8 @@ public class AccountManagerImplTest {
Mockito.when(_accountDao.findById(42l)).thenReturn(account);
Mockito.when(
securityChecker.checkAccess(Mockito.any(Account.class),
- Mockito.any(AccessType.class), Mockito.anyString(),
- Mockito.any(ControlledEntity[].class)))
+ Mockito.any(ControlledEntity.class), Mockito.any(AccessType.class),
+ Mockito.anyString()))
.thenReturn(true);
Mockito.when(_accountDao.remove(42l)).thenReturn(true);
Mockito.when(_configMgr.releaseAccountSpecificVirtualRanges(42l))