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/11 01:33:59 UTC

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

Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-739


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

Branch: refs/heads/USERGRID-739
Commit: ee0edaedce80a8cd9ebc889dbfbf44414f807b3d
Parents: bb865eb c93a0fc
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 10 17:33:08 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 10 17:33:08 2015 -0600

----------------------------------------------------------------------
 .../corepersistence/CpRelationManager.java      | 28 ++++---------------
 .../migration/AppInfoMigrationPlugin.java       | 14 +++++-----
 .../migration/AppInfoMigrationPluginTest.java   | 29 +++++++++++++++++---
 3 files changed, 38 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


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