usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [2/4] git commit: Merge branch 'two-dot-o' of https://github.com/apache/incubator-usergrid into two-dot-o
Date Tue, 22 Jul 2014 17:10:13 GMT
Merge branch 'two-dot-o' of https://github.com/apache/incubator-usergrid into two-dot-o


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

Branch: refs/heads/two-dot-o
Commit: 2546eeabd867a8dd2cb57110ff5f9e8618745e14
Parents: e330641 4da636b
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Fri Jul 18 12:54:15 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Fri Jul 18 12:54:15 2014 -0400

----------------------------------------------------------------------
 .../dist/init_instance/install_oraclejdk.sh     |   6 +-
 .../main/resources/usergrid-default.properties  |   3 +
 .../batch/service/SchedulerServiceImpl.java     |   6 +-
 .../corepersistence/CpEntityManagerFactory.java |  10 +-
 .../HybridEntityManagerFactory.java             | 141 +++++++++++++++++++
 .../usergrid/corepersistence/HybridSetup.java   |  72 ++++++++++
 .../usergrid/persistence/AbstractEntity.java    |   2 +-
 .../persistence/EntityManagerFactory.java       |   3 +
 .../cassandra/EntityManagerFactoryImpl.java     |   5 +-
 .../cassandra/EntityManagerImpl.java            |  58 ++++----
 .../cassandra/RelationManagerImpl.java          |   3 +-
 .../persistence/cassandra/SetupImpl.java        |   7 +-
 .../ir/result/ConnectionIndexSliceParser.java   |   2 +-
 .../main/resources/usergrid-core-context.xml    |  24 +---
 .../usergrid/persistence/CollectionIT.java      |   3 +-
 .../usergrid/persistence/EntityManagerIT.java   |   3 +-
 .../org/apache/usergrid/persistence/GeoIT.java  |  14 +-
 .../usergrid/persistence/PathQueryIT.java       |   4 +-
 .../query/MultiOrderByConnectionIT.java         |   2 +-
 .../SingleOrderByIntersectionCollectionIT.java  |   2 +-
 .../SingleOrderByIntersectionConnectionIT.java  |   2 +-
 .../test/resources/usergrid-test-context.xml    |  64 ++++-----
 .../resources/usergrid-rest-deploy-context.xml  |   2 -
 .../test/resources/usergrid-test-context.xml    |  17 +--
 .../test/resources/usergrid-test-context.xml    |   8 +-
 25 files changed, 325 insertions(+), 138 deletions(-)
----------------------------------------------------------------------



Mime
View raw message