Merge branch 'master' 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/5b5fbf03 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/5b5fbf03 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/5b5fbf03 Branch: refs/heads/master Commit: 5b5fbf03e735191784e3e8c6af4cc644eb60963a Parents: d536b5b f19ae08 Author: Shawn Feldman <sfeld...@apache.org> Authored: Wed Oct 14 16:07:09 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Wed Oct 14 16:07:09 2015 -0600 ---------------------------------------------------------------------- .../org/apache/usergrid/persistence/queue/QueueFig.java | 12 ++++++++++-- .../persistence/queue/util/AmazonNotificationUtils.java | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) ----------------------------------------------------------------------