Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-933
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/5ead5fdc Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5ead5fdc Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5ead5fdc Branch: refs/heads/USERGRID-933 Commit: 5ead5fdca6cc33b6cc5dc8a1f839a66dcd0246af Parents: bd0f10b 0b243c4 Author: Mike Dunker <mdun...@apache.org> Authored: Thu Sep 24 15:04:56 2015 -0700 Committer: Mike Dunker <mdun...@apache.org> Committed: Thu Sep 24 15:04:56 2015 -0700 ---------------------------------------------------------------------- stack/scripts/migrate_entity_data.py | 66 ++++++++++++++----- .../management/AppInfoMigrationPlugin.java | 69 +++++++++----------- 2 files changed, 79 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
