You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/30 04:39:57 UTC

[31/45] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into pushy_4-0

Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into pushy_4-0


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

Branch: refs/heads/key-row-sharding
Commit: 78e34b2bfba8e699a4525426f0888b82f5f8b597
Parents: 25e36e6 a100c07
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 29 10:29:06 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 29 10:29:06 2014 -0600

----------------------------------------------------------------------
 .../main/resources/usergrid-default.properties  |   3 +
 .../corepersistence/CpEntityManager.java        |  73 +-
 .../corepersistence/CpEntityManagerFactory.java |  53 +-
 .../corepersistence/CpManagerCache.java         | 117 ++-
 .../corepersistence/CpRelationManager.java      | 944 +++++++++++--------
 .../persistence/index/query/EntityResults.java  |   6 +-
 stack/loadtests/src/main/scripts/gatling-mvn.sh |  28 +
 7 files changed, 767 insertions(+), 457 deletions(-)
----------------------------------------------------------------------