Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9D02910941 for ; Tue, 3 Mar 2015 20:00:48 +0000 (UTC) Received: (qmail 46114 invoked by uid 500); 3 Mar 2015 20:00:42 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 46066 invoked by uid 500); 3 Mar 2015 20:00:42 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 45315 invoked by uid 99); 3 Mar 2015 20:00:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 20:00:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3AD9DE03B9; Tue, 3 Mar 2015 20:00:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: grey@apache.org To: commits@usergrid.apache.org Date: Tue, 03 Mar 2015 20:01:10 -0000 Message-Id: <2bc0eba18de7411ebd7cf305a92edfa3@git.apache.org> In-Reply-To: <31613d817b9b4e14abf7adb913ddece6@git.apache.org> References: <31613d817b9b4e14abf7adb913ddece6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/37] 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/USERGRID-422 Commit: fd5109cc62d52bd67d7ae5b988134a34f097bdd3 Parents: 41cd7c8 Author: Shawn Feldman Authored: Thu Feb 26 16:24:53 2015 -0700 Committer: Shawn Feldman 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