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/04/06 22:40:38 UTC
[2/2] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2464c628
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2464c628
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2464c628
Branch: refs/heads/two-dot-o-dev
Commit: 2464c628f7224b11780a2e54c1825bf87560a564
Parents: 05dbe26 f5d77b1
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Apr 6 16:40:08 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Apr 6 16:40:08 2015 -0400
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 2 +-
.../corepersistence/CpEntityManagerFactory.java | 121 +++++++++++--------
.../cassandra/EntityManagerFactoryImplIT.java | 31 +++--
.../persistence/query/IteratingQueryIT.java | 10 +-
4 files changed, 100 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2464c628/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------