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 2014/08/29 15:34:36 UTC

[2/2] git commit: Merge branch 'two-dot-o' of https://github.com/apache/incubator-usergrid into two-dot-o

Merge branch 'two-dot-o' of https://github.com/apache/incubator-usergrid into two-dot-o


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

Branch: refs/heads/two-dot-o
Commit: ef707147cb6d0561fe62208f2e9cc1dbaf57ff5f
Parents: c6de849 8b2c1b7
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Aug 29 09:33:18 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Aug 29 09:33:18 2014 -0400

----------------------------------------------------------------------
 stack/core/pom.xml                              | 51 +++++++++++---------
 .../corepersistence/CpEntityManager.java        | 47 +++++++++---------
 .../corepersistence/CpRelationManager.java      | 10 ++--
 .../java/org/apache/usergrid/mq/Message.java    | 10 ++--
 .../apache/usergrid/persistence/EntityRef.java  |  3 ++
 .../apache/usergrid/persistence/PathQuery.java  |  8 +--
 .../usergrid/persistence/SimpleEntityRef.java   | 36 ++++++++------
 .../org/apache/usergrid/utils/UUIDUtils.java    | 11 +++++
 .../usergrid/persistence/PathQueryIT.java       |  4 +-
 .../persistence/core/util/ValidationUtils.java  |  2 +-
 .../usergrid/persistence/index/query/Query.java |  4 +-
 11 files changed, 106 insertions(+), 80 deletions(-)
----------------------------------------------------------------------