usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [48/50] [abbrv] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' into USERGRID-771
Date Fri, 24 Jul 2015 15:22:16 GMT
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/USERGRID-869
Commit: 9c36d229a19bff2fb868344b82c5fcb573ea619d
Parents: 6d45d87 d22e619
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Jul 22 13:59:32 2015 -0600
Committer: Shawn Feldman <sfeldman@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(-)
----------------------------------------------------------------------



Mime
View raw message