You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/11/11 00:21:55 UTC

[30/42] incubator-usergrid git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/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/b78ce8bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b78ce8bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b78ce8bb

Branch: refs/heads/es-type-updates
Commit: b78ce8bbb0b6cc58a529efdf3ea636bab9d0c48f
Parents: 1f912ef efc0ec3
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Nov 7 09:33:45 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Nov 7 09:33:45 2014 -0700

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        |  5 +-
 .../corepersistence/CpRelationManager.java      | 52 ++++++++------------
 2 files changed, 24 insertions(+), 33 deletions(-)
----------------------------------------------------------------------