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 130A717E1D for ; Wed, 11 Mar 2015 17:45:35 +0000 (UTC) Received: (qmail 73808 invoked by uid 500); 11 Mar 2015 17:45:34 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 73751 invoked by uid 500); 11 Mar 2015 17:45:34 -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 73718 invoked by uid 99); 11 Mar 2015 17:45:34 -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; Wed, 11 Mar 2015 17:45:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95137E1884; Wed, 11 Mar 2015 17:45:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: toddnine@apache.org To: commits@usergrid.apache.org Date: Wed, 11 Mar 2015 17:45:37 -0000 Message-Id: In-Reply-To: <9d5a320e5439468cb49feaa698a8a9e2@git.apache.org> References: <9d5a320e5439468cb49feaa698a8a9e2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] incubator-usergrid git commit: Fixes issue with Guice transitive dependency Fixes issue with Guice transitive dependency Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/67fa78ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/67fa78ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/67fa78ef Branch: refs/heads/USERGRID-466 Commit: 67fa78efd6df6bd365972c7ed40a1d16dd8caac6 Parents: e70391f Author: Todd Nine Authored: Wed Mar 11 11:45:15 2015 -0600 Committer: Todd Nine Committed: Wed Mar 11 11:45:15 2015 -0600 ---------------------------------------------------------------------- .../java/org/apache/usergrid/corepersistence/CoreModule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/67fa78ef/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java index 82beb8d..3230faa 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java @@ -77,8 +77,8 @@ public class CoreModule extends AbstractModule { bind(BufferQueue.class).to( BufferQueueSQSImpl.class ); } } ); - install(new MapModule()); -// install(new QueueModule()); TODO, re-enable when index module doesn't depend on queue +// install(new MapModule()); TODO, re-enable when index module doesn't depend on queue +// install(new QueueModule()); bind(ManagerCache.class).to( CpManagerCache.class );