You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/10 01:20:23 UTC
[1/2] git commit: Fixed cleanup
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o f3a7a4cf6 -> 72ef74bc4
Fixed cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c8cc6e97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c8cc6e97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c8cc6e97
Branch: refs/heads/two-dot-o
Commit: c8cc6e972545ca1797018e429fe2fe0ae3b2ab94
Parents: a336b6b
Author: Todd Nine <to...@apache.org>
Authored: Thu Oct 9 16:12:49 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Thu Oct 9 16:12:49 2014 -0600
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/results/FilteringLoader.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c8cc6e97/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/FilteringLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/FilteringLoader.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/FilteringLoader.java
index 3db772b..8348832 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/FilteringLoader.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/FilteringLoader.java
@@ -224,6 +224,9 @@ public class FilteringLoader implements ResultsLoader {
}
+ //execute the cleanup
+ indexBatch.execute();
+
return resultsLoader.getResults(sortedResults.values());
}
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by to...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/72ef74bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/72ef74bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/72ef74bc
Branch: refs/heads/two-dot-o
Commit: 72ef74bc4805cbcc5031269dfa78e32e63569638
Parents: c8cc6e9 f3a7a4c
Author: Todd Nine <to...@apache.org>
Authored: Thu Oct 9 16:37:11 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Thu Oct 9 16:37:11 2014 -0600
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/results/EntityVerifier.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------