Merge commit 'refs/pull/528/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/8976b414 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8976b414 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8976b414 Branch: refs/heads/master Commit: 8976b414a7e62fa22f9e894eaf50edfe60c4dd76 Parents: 317714b 4b8e546 Author: Michael Russo <[email protected]> Authored: Fri Jun 3 07:42:30 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Fri Jun 3 07:42:30 2016 -0700 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 3 +- .../corepersistence/CpEntityManagerFactory.java | 243 ++++++++++++++----- .../apache/usergrid/locking/LockManager.java | 5 + .../cassandra/AstyanaxLockManagerImpl.java | 30 ++- .../locking/noop/NoOpLockManagerImpl.java | 5 + .../exception/CollectionRuntimeException.java | 11 + .../core/astyanax/CassandraCluster.java | 24 +- .../persistence/core/astyanax/CassandraFig.java | 18 +- .../usergrid/services/ServiceManager.java | 8 + .../services/ServiceManagerFactory.java | 12 + 10 files changed, 285 insertions(+), 74 deletions(-) ----------------------------------------------------------------------
