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 3B29A10938 for ; Tue, 3 Mar 2015 20:00:42 +0000 (UTC) Received: (qmail 45785 invoked by uid 500); 3 Mar 2015 20:00:42 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 45731 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 45132 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 2DBD1E1080; 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:05 -0000 Message-Id: <949eaf4f00ff4e2cb6440d344bcc8a93@git.apache.org> In-Reply-To: <31613d817b9b4e14abf7adb913ddece6@git.apache.org> References: <31613d817b9b4e14abf7adb913ddece6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [26/37] incubator-usergrid git commit: Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273-indexbuffer Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273-indexbuffer Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/06212945 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/06212945 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/06212945 Branch: refs/heads/USERGRID-422 Commit: 06212945e6de3e4a21a46b673df9d373165fcfc3 Parents: 090902a 48a2be7 Author: Shawn Feldman Authored: Wed Feb 25 18:38:50 2015 -0700 Committer: Shawn Feldman Committed: Wed Feb 25 18:38:50 2015 -0700 ---------------------------------------------------------------------- .../usergrid/corepersistence/CpSetup.java | 54 +++++---------- .../usergrid/corepersistence/GuiceFactory.java | 25 +++---- .../persistence/cassandra/CassandraService.java | 71 +++++++++----------- .../cassandra/EntityManagerFactoryImpl.java | 20 +++--- .../persistence/cassandra/SetupImpl.java | 60 ++++++----------- .../main/resources/usergrid-core-context.xml | 5 +- .../usergrid/persistence/CoreSchemaManager.java | 4 +- .../cassandra/EntityManagerFactoryImplIT.java | 6 -- .../core/astyanax/AstyanaxKeyspaceProvider.java | 2 +- .../persistence/core/astyanax/CassandraFig.java | 10 +-- .../tokens/cassandra/TokenServiceImpl.java | 14 ++-- 11 files changed, 109 insertions(+), 162 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/06212945/stack/core/src/main/resources/usergrid-core-context.xml ----------------------------------------------------------------------