You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/27 00:38:39 UTC
[23/24] incubator-usergrid git commit: fix compilation
fix compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fd5109cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fd5109cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fd5109cc
Branch: refs/heads/two-dot-o
Commit: fd5109cc62d52bd67d7ae5b988134a34f097bdd3
Parents: 41cd7c8
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Feb 26 16:24:53 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Feb 26 16:24:53 2015 -0700
----------------------------------------------------------------------
.../rest/applications/collection/CollectionsResourceIT.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fd5109cc/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
index f624b79..192fd84 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
@@ -187,10 +187,7 @@ public class CollectionsResourceIT extends AbstractRestIT {
Entity calendarlistOne = this.app().collection(collection).post(payload);
assertEquals(calendarlistOne.get("summaryOverview"), summaryOverview);
assertEquals(calendarlistOne.get("caltype"), calType);
-<<<<<<< HEAD
- String calendarlistOneUUID = calendarlistOne.getAsString("uuid");
-=======
->>>>>>> 567db37ca03daa621dfde0c29f803b9384da5e7e
+
this.refreshIndex();
//post a second entity