You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2016/04/13 05:36:16 UTC
[1/2] usergrid git commit: Forcing buffer to only emit batches that
contain items.
Repository: usergrid
Updated Branches:
refs/heads/release-2.1.1 7c24d43b5 -> 17e9b36e5
Forcing buffer to only emit batches that contain items.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/19892a9d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/19892a9d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/19892a9d
Branch: refs/heads/release-2.1.1
Commit: 19892a9df867733737b5d06f8f853a5529acffaf
Parents: 6b9e5ef
Author: George Reyes <gr...@apache.org>
Authored: Tue Apr 12 20:35:48 2016 -0700
Committer: George Reyes <gr...@apache.org>
Committed: Tue Apr 12 20:35:48 2016 -0700
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/index/IndexServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/19892a9d/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
index f3f48cc..ad997c8 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java
@@ -131,7 +131,7 @@ public class IndexServiceImpl implements IndexService {
//try to send a whole batch if we can
final Observable<IndexOperationMessage> batches = sourceEdgesToIndex
- .buffer(250, TimeUnit.MILLISECONDS, indexFig.getIndexBatchSize() )
+ .buffer(indexFig.getIndexBatchSize() )
//map into batches based on our buffer size
.flatMap( buffer -> Observable.from( buffer )
[2/2] usergrid git commit: Merge branch 'release-2.1.1' of
https://git-wip-us.apache.org/repos/asf/usergrid into release-2.1.1
Posted by gr...@apache.org.
Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid into release-2.1.1
# By Michael Russo
# Via Michael Russo
* 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid:
Fix NoSuchElementException when no devices are found for the targeted push notification.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/17e9b36e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/17e9b36e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/17e9b36e
Branch: refs/heads/release-2.1.1
Commit: 17e9b36e55c4094715e87935d122fac5d76389a7
Parents: 19892a9 7c24d43
Author: George Reyes <gr...@apache.org>
Authored: Tue Apr 12 20:35:57 2016 -0700
Committer: George Reyes <gr...@apache.org>
Committed: Tue Apr 12 20:35:57 2016 -0700
----------------------------------------------------------------------
.../services/notifications/impl/ApplicationQueueManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------