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/9673169d Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/9673169d Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/9673169d Branch: refs/heads/master Commit: 9673169dc7c28167ccf391496afd7faeaaffd321 Parents: b6f8e71 2b22c61 Author: Shawn Feldman <sfeld...@apache.org> Authored: Fri Oct 16 15:08:18 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Fri Oct 16 15:08:18 2015 -0600 ---------------------------------------------------------------------- .../usergrid/corepersistence/index/IndexProcessorFig.java | 7 +++---- .../java/org/apache/usergrid/persistence/queue/QueueFig.java | 6 +++--- .../usergrid/persistence/queue/impl/SNSQueueManagerImpl.java | 2 +- .../persistence/queue/util/AmazonNotificationUtils.java | 4 +++- 4 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/9673169d/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java ----------------------------------------------------------------------
