You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/17 00:27:59 UTC
[2/3] incubator-usergrid git commit: Merge branch 'USERGRID-273' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/55e0f742
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/55e0f742
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/55e0f742
Branch: refs/heads/USERGRID-273
Commit: 55e0f74207898184e944373a3460feae1df3a967
Parents: ab08b8d 3c83bcb
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Feb 16 15:06:25 2015 -0800
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Feb 16 15:06:25 2015 -0800
----------------------------------------------------------------------
.../corepersistence/StaleIndexCleanupTest.java | 2 +
.../apache/usergrid/persistence/CounterIT.java | 13 ++--
.../persistence/EntityDictionaryIT.java | 24 ++-----
.../usergrid/persistence/EntityManagerIT.java | 70 +++++--------------
.../persistence/GeoQueryBooleanTest.java | 10 +--
.../cache/CachedEntityCollectionManager.java | 2 +-
.../EntityCollectionManagerFactoryImpl.java | 1 +
stack/pom.xml | 4 ++
.../rest/management/ImportResourceIT.java | 11 +--
stack/services/pom.xml | 4 +-
.../services/queues/ImportQueueListener.java | 5 +-
.../usergrid/services/queues/QueueListener.java | 10 +--
.../management/importer/ImportCollectionIT.java | 71 ++++++++++++--------
.../importer/ImportConnectionsTest.java | 28 ++++----
.../management/importer/ImportServiceIT.java | 14 ++--
15 files changed, 122 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/55e0f742/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java
----------------------------------------------------------------------