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/18 21:56:16 UTC

[16/50] incubator-usergrid git commit: Merge branch 'USERGRID-466' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-466

Merge branch 'USERGRID-466' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-466


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

Branch: refs/heads/USERGRID-460
Commit: 001f3f85d7b943b1ddb58f8191e97e16f92f330c
Parents: 67fa78e 6263594
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Mar 11 11:45:29 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Mar 11 11:45:29 2015 -0600

----------------------------------------------------------------------
 stack/core/pom.xml                              | 10 ----
 .../batch/service/JobSchedulerService.java      |  5 --
 .../corepersistence/CpEntityManager.java        |  3 -
 .../corepersistence/CpEntityManagerFactory.java |  4 --
 .../corepersistence/CpRelationManager.java      | 14 -----
 .../persistence/EntityManagerFactory.java       |  2 -
 .../cassandra/EntityManagerFactoryImpl.java     |  3 -
 .../cassandra/EntityManagerImpl.java            | 23 +-------
 .../cassandra/RelationManagerImpl.java          | 58 +++-----------------
 .../cassandra/index/ConnectedIndexScanner.java  |  2 -
 .../cassandra/index/IndexBucketScanner.java     |  2 -
 stack/pom.xml                                   | 43 ---------------
 stack/rest/pom.xml                              |  4 --
 .../org/apache/usergrid/rest/RootResource.java  |  6 --
 stack/test-utils/pom.xml                        |  5 --
 15 files changed, 10 insertions(+), 174 deletions(-)
----------------------------------------------------------------------