usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [3/8] git commit: Merge branch 'two-dot-o' into corepersistence-off
Date Wed, 16 Jul 2014 13:54:41 GMT
Merge branch 'two-dot-o' into corepersistence-off


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

Branch: refs/heads/two-dot-o
Commit: 0dacfa20ee424b9f5448716af5025d500be00748
Parents: 12aa3d9 d774d0e
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Fri May 30 11:42:02 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Fri May 30 11:42:02 2014 -0400

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        | 450 ++++++++++++++-----
 .../usergrid/persistence/EntityManager.java     |   4 -
 .../usergrid/persistence/PermissionsIT.java     |   2 +
 stack/core/src/test/resources/log4j.properties  |   4 +-
 .../core/consistency/AsyncProcessorImpl.java    |   7 +-
 stack/pom.xml                                   |   1 +
 6 files changed, 352 insertions(+), 116 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0dacfa20/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0dacfa20/stack/core/src/test/resources/log4j.properties
----------------------------------------------------------------------


Mime
View raw message