You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2015/01/26 22:07:30 UTC
[3/6] incubator-usergrid git commit: Merge branch
'usergrid-312-appdelete' of github.com:snoopdave/incubator-usergrid into
apache_usergrid/two-dot-o-import
Merge branch 'usergrid-312-appdelete' of github.com:snoopdave/incubator-usergrid into apache_usergrid/two-dot-o-import
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6a11e1b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6a11e1b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6a11e1b4
Branch: refs/heads/two-dot-o-import
Commit: 6a11e1b4ee5e16a6a3c56010eea83b1c7007af5f
Parents: 4bf91a3 4384975
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Jan 21 16:09:59 2015 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Jan 21 16:09:59 2015 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 56 +++++++--
.../HybridEntityManagerFactory.java | 9 +-
.../persistence/EntityManagerFactory.java | 11 +-
.../cassandra/EntityManagerFactoryImpl.java | 11 +-
.../cassandra/EntityManagerFactoryImplIT.java | 71 +++++++-----
.../usergrid/persistence/index/EntityIndex.java | 2 +
.../index/impl/EsEntityIndexBatchImpl.java | 14 +--
.../index/impl/EsEntityIndexImpl.java | 115 ++++++++-----------
.../persistence/index/impl/EsIndexCache.java | 12 +-
.../rest/applications/ApplicationResource.java | 32 +++++-
.../applications/ApplicationDeleteTest.java | 54 +++++++++
11 files changed, 257 insertions(+), 130 deletions(-)
----------------------------------------------------------------------