You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/03/03 21:01:05 UTC

[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 <sf...@apache.org>
Authored: Wed Feb 25 18:38:50 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
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
----------------------------------------------------------------------