You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/05 00:47:37 UTC
[4/4] incubator-usergrid git commit: Merge remote-tracking branch
'origin/USERGRID-685' into two-dot-o-dev
Merge remote-tracking branch 'origin/USERGRID-685' 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/05f8172c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/05f8172c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/05f8172c
Branch: refs/heads/two-dot-o-dev
Commit: 05f8172c836a23a524ae36667bbd8e240a2490db
Parents: e69dd20 c582d27
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Jun 4 16:43:35 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Jun 4 16:43:35 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 38 ++++++-
.../corepersistence/CpRelationManager.java | 18 +--
.../usergrid/corepersistence/CpWalker.java | 4 +-
.../asyncevents/EventBuilderImpl.java | 4 +-
.../corepersistence/util/CpNamingUtils.java | 52 ++++++++-
.../usergrid/persistence/AbstractEntity.java | 11 ++
.../usergrid/persistence/EntityManager.java | 19 ++++
.../apache/usergrid/persistence/EntityRef.java | 5 +
.../persistence/MultiQueryIterator.java | 10 ++
.../persistence/SimpleCollectionRef.java | 8 ++
.../usergrid/persistence/SimpleEntityRef.java | 7 ++
.../usergrid/persistence/SimpleRoleRef.java | 8 ++
.../cassandra/ConnectionRefImpl.java | 8 ++
.../apache/usergrid/utils/EdgeTestUtils.java | 4 +-
.../impl/stage/NodeDeleteListenerImpl.java | 113 ++++++++-----------
.../usergrid/services/AbstractService.java | 16 ++-
16 files changed, 225 insertions(+), 100 deletions(-)
----------------------------------------------------------------------