Merge commit 'refs/pull/418/head' of github.com:apache/usergrid into 2.1-release
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/40dfa064 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/40dfa064 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/40dfa064 Branch: refs/heads/USERGRID-909 Commit: 40dfa0647709881170ea0874036d0ea84875148f Parents: 3d12057 9b589d3 Author: Michael Russo <[email protected]> Authored: Fri Oct 30 12:33:48 2015 -0700 Committer: Michael Russo <[email protected]> Committed: Fri Oct 30 12:33:48 2015 -0700 ---------------------------------------------------------------------- .../rest/system/ConnectionResource.java | 48 +- stack/scripts/create_test_data.py | 222 ++++++ stack/scripts/migrate_entity_data.py | 18 +- stack/scripts/multitenant_migrate.py | 702 +++++++++++++++++++ 4 files changed, 965 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
