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/12/01 15:27:38 UTC
[6/6] usergrid git commit: Merge branch 'master' into USERGRID-872
Merge branch 'master' into USERGRID-872
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1dd4e68a
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1dd4e68a
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1dd4e68a
Branch: refs/heads/USERGRID-872
Commit: 1dd4e68a96c4f8c549ea74169849cdf2caa5af61
Parents: 9ccc33e 3c8a308
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Dec 1 09:27:10 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Dec 1 09:27:10 2015 -0500
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 41 +++++-----------
.../usergrid/persistence/EntityManager.java | 5 +-
.../persistence/model/entity/EntityMap.java | 50 ++++++++++++++++----
stack/loadtests/runLoadEntities.sh | 1 +
stack/loadtests/runLoadEntitiesUnlimited.sh | 5 +-
stack/loadtests/testConfig.sh | 1 +
6 files changed, 60 insertions(+), 43 deletions(-)
----------------------------------------------------------------------