cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject git commit: updated refs/heads/master to e4fe7b3
Date Tue, 17 Mar 2015 05:04:11 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master b6eace03e -> e4fe7b3bb


Fixed build failure due to commit 843f6b16914159ea6241c6c1a0a04e9d0fefaed4

(cherry picked from commit 31cdb57e6b5de031d3a3f27c61fe55cf7dfb2d26)


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

Branch: refs/heads/master
Commit: e4fe7b3bbc3dc785c7c476f59578e0540ecc4045
Parents: b6eace0
Author: Rajani Karuturi <rajanikaruturi@gmail.com>
Authored: Tue Mar 17 10:08:32 2015 +0530
Committer: Rajani Karuturi <rajanikaruturi@gmail.com>
Committed: Tue Mar 17 10:34:00 2015 +0530

----------------------------------------------------------------------
 server/test/com/cloud/network/lb/UpdateLoadBalancerTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e4fe7b3b/server/test/com/cloud/network/lb/UpdateLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/lb/UpdateLoadBalancerTest.java b/server/test/com/cloud/network/lb/UpdateLoadBalancerTest.java
index f3a938c..0b67eb7 100644
--- a/server/test/com/cloud/network/lb/UpdateLoadBalancerTest.java
+++ b/server/test/com/cloud/network/lb/UpdateLoadBalancerTest.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.when;
 import java.util.ArrayList;
 import java.util.UUID;
 
+import com.cloud.user.User;
 import org.apache.cloudstack.api.command.user.loadbalancer.UpdateLoadBalancerRuleCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.junit.After;
@@ -84,7 +85,7 @@ public class UpdateLoadBalancerTest {
         updateLbRuleCmd = new UpdateLoadBalancerRuleCmd();
 
         AccountVO account = new AccountVO(accountName, domainId, "networkDomain", Account.ACCOUNT_TYPE_NORMAL,
"uuid");
-        UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email",
"timezone", UUID.randomUUID().toString());
+        UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email",
"timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
         CallContext.register(user, account);
     }
 


Mime
View raw message