Merge commit 'refs/pull/496/head' of github.com:apache/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ac3e63a0 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ac3e63a0 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ac3e63a0 Branch: refs/heads/release-2.1.1 Commit: ac3e63a016fd8d934140d4b5933de6eafe9f8294 Parents: e57e9ef 066a596 Author: Michael Russo <[email protected]> Authored: Tue Mar 29 12:48:26 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Tue Mar 29 12:48:26 2016 -0700 ---------------------------------------------------------------------- .../corepersistence/CpEntityManagerFactory.java | 34 ++++--- .../usergrid/corepersistence/CpSetup.java | 100 ++++++------------- .../persistence/EntityManagerFactory.java | 2 +- .../persistence/cassandra/CassandraService.java | 2 - .../usergrid/persistence/cassandra/Setup.java | 28 ++---- .../usergrid/persistence/CoreSchemaManager.java | 14 +-- .../usergrid/rest/system/DatabaseResource.java | 4 +- .../usergrid/cassandra/SchemaManager.java | 3 - .../usergrid/cassandra/FakeSchemaManager.java | 8 +- 9 files changed, 66 insertions(+), 129 deletions(-) ----------------------------------------------------------------------
