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/07/23 17:26:14 UTC
[2/3] incubator-usergrid git commit: Merge branch 'two-dot-o-dev'
into USERGRID-771
Merge branch 'two-dot-o-dev' into USERGRID-771
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9c36d229
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9c36d229
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9c36d229
Branch: refs/heads/two-dot-o-dev
Commit: 9c36d229a19bff2fb868344b82c5fcb573ea619d
Parents: 6d45d87 d22e619
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jul 22 13:59:32 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jul 22 13:59:32 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 122 ++++++++++---------
.../corepersistence/CpEntityManagerFactory.java | 6 +-
.../index/ApplicationIndexLocationStrategy.java | 2 +-
.../index/ReplicatedIndexLocationStrategy.java | 2 +-
.../usergrid/persistence/EntityManager.java | 5 +
.../index/impl/EsEntityIndexImpl.java | 2 +
6 files changed, 75 insertions(+), 64 deletions(-)
----------------------------------------------------------------------