Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
* 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: Give CoreSchemaManager in tests the ability to force check if keyspaces are created while normal runtime classes can rely on the driver's cached metadata. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/dd46ebe8 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/dd46ebe8 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/dd46ebe8 Branch: refs/heads/master Commit: dd46ebe8fbacec0d51928b7f19e89c6b8c705b97 Parents: 20c425b 2578e93 Author: Dave Johnson <[email protected]> Authored: Sat Nov 19 17:43:21 2016 -0500 Committer: Dave Johnson <[email protected]> Committed: Sat Nov 19 17:43:21 2016 -0500 ---------------------------------------------------------------------- .../corepersistence/CpEntityManagerFactory.java | 4 +- .../usergrid/corepersistence/CpSetup.java | 9 ++-- .../usergrid/persistence/cassandra/Setup.java | 3 +- .../usergrid/persistence/CoreSchemaManager.java | 4 +- .../core/datastax/DataStaxCluster.java | 4 +- .../core/datastax/impl/DataStaxClusterImpl.java | 47 +++++++++++--------- .../core/migration/schema/MigrationManager.java | 3 +- .../migration/schema/MigrationManagerImpl.java | 6 +-- .../core/guice/MigrationManagerRule.java | 4 +- .../data/MigrationInfoSerializationTest.java | 2 +- .../graph/GraphManagerShardConsistencyIT.java | 2 +- .../apache/usergrid/persistence/qakka/App.java | 4 +- .../persistence/qakka/AbstractTest.java | 2 +- .../usergrid/rest/system/MigrateResource.java | 2 +- .../org/apache/usergrid/tools/ToolBase.java | 2 +- 15 files changed, 52 insertions(+), 46 deletions(-) ----------------------------------------------------------------------
