Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into remove-inmemory-event-service
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f6409ce3 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f6409ce3 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f6409ce3 Branch: refs/heads/master Commit: f6409ce353e9b9be2adad8c47e3a6800f94402ae Parents: e17dab4 9cbe283 Author: Shawn Feldman <[email protected]> Authored: Tue Oct 13 10:14:11 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Tue Oct 13 10:14:11 2015 -0600 ---------------------------------------------------------------------- .../asyncevents/AmazonAsyncEventService.java | 13 +++++++---- .../asyncevents/EventBuilderImpl.java | 3 ++- .../core/rx/ExceptionBehaviorTest.java | 24 ++++++++++++++++++++ .../index/impl/EsIndexProducerImpl.java | 11 ++++++--- .../persistence/queue/QueueMessage.java | 10 ++++++++ .../queue/impl/SNSQueueManagerImpl.java | 2 ++ .../queue/impl/SQSQueueManagerImpl.java | 1 + 7 files changed, 56 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/f6409ce3/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/f6409ce3/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/EventBuilderImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/f6409ce3/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java ----------------------------------------------------------------------
