You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/02/26 17:28:10 UTC

[46/50] [abbrv] incubator-usergrid git commit: Merge branch 'USERGRID-273' of https://github.com/apache/incubator-usergrid into USERGRID-273

Merge branch 'USERGRID-273' of https://github.com/apache/incubator-usergrid into USERGRID-273


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9435fa35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9435fa35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9435fa35

Branch: refs/heads/two-dot-o
Commit: 9435fa35ea207b46fade5249ea402ad6739d0a36
Parents: bedf5af 48a2be7
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Feb 26 09:48:47 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Feb 26 09:48:47 2015 -0500

----------------------------------------------------------------------
 .../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(-)
----------------------------------------------------------------------