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 2014/08/22 21:57:47 UTC
[5/5] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-notifications-queue
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-notifications-queue
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5e30645d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5e30645d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5e30645d
Branch: refs/heads/two-dot-o-notifications-queue
Commit: 5e30645d816372b4b492e8a97b9cd75abe9ae9ac
Parents: 8a40594 839ac29
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Aug 22 13:57:19 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Aug 22 13:57:19 2014 -0600
----------------------------------------------------------------------
.../main/dist/init_instance/init_rest_server.sh | 6 +-
stack/awscluster/ugcluster-cf.json | 10 +-
.../corepersistence/CpEntityManager.java | 63 ++---------
.../corepersistence/CpRelationManager.java | 108 ++++++++++++++++---
.../usergrid/services/ServiceInvocationIT.java | 49 ++++-----
5 files changed, 134 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5e30645d/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------