usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject usergrid git commit: Fixes merged
Date Thu, 24 Sep 2015 20:16:11 GMT
Repository: usergrid
Updated Branches:
  refs/heads/two-dot-o-dev eda816bb0 -> b0b171172


Fixes merged


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

Branch: refs/heads/two-dot-o-dev
Commit: b0b1711722d8b7c320fe689aa4ee9d8a7ba2f855
Parents: eda816b
Author: Todd Nine <tnine@apigee.com>
Authored: Thu Sep 24 14:16:09 2015 -0600
Committer: Todd Nine <tnine@apigee.com>
Committed: Thu Sep 24 14:16:09 2015 -0600

----------------------------------------------------------------------
 .../collection/users/ConnectionResourceTest.java        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/b0b17117/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
index 34cb56e..777b04e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
@@ -17,7 +17,14 @@
 package org.apache.usergrid.rest.applications.collection.users;
 
 
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.usergrid.rest.test.resource.AbstractRestIT;
 import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
 import org.apache.usergrid.rest.test.resource.model.ApiResponse;
@@ -25,8 +32,7 @@ import org.apache.usergrid.rest.test.resource.model.Collection;
 import org.apache.usergrid.rest.test.resource.model.Entity;
 import org.apache.usergrid.rest.test.resource.model.QueryParameters;
 
-import java.io.IOException;
-import java.util.Map;
+import com.sun.jersey.api.client.UniformInterfaceException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;


Mime
View raw message