Merge remote-tracking branch 'github/pr/105' 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/2586e9fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2586e9fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2586e9fe Branch: refs/heads/two-dot-o Commit: 2586e9fe458b55ebe16b9e080c38a8809ba25f9b Parents: bd0a1e9 0857947 Author: Shawn Feldman <[email protected]> Authored: Mon Nov 24 09:08:35 2014 -0700 Committer: Shawn Feldman <[email protected]> Committed: Mon Nov 24 09:08:35 2014 -0700 ---------------------------------------------------------------------- .../org/apache/usergrid/CoreApplication.java | 17 +++- .../migration/EntityDataMigrationIT.java | 16 +-- .../migration/EntityTypeMappingMigrationIT.java | 17 ++++ .../migration/GraphShardVersionMigrationIT.java | 20 ++-- .../migration/MigrationTestRule.java | 101 +++++++++++++++++++ 5 files changed, 155 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
