You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/06/29 19:40:31 UTC

[19/50] [abbrv] incubator-usergrid git commit: Merge remote-tracking branch 'upstream/two-dot-o-dev' into USERGRID-720

Merge remote-tracking branch 'upstream/two-dot-o-dev' into USERGRID-720


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5eb332c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5eb332c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5eb332c8

Branch: refs/heads/USERGRID-703
Commit: 5eb332c87de4898a2e71d39d51fd112d6a7c355b
Parents: 851fa4a b51b668
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jun 17 15:49:49 2015 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jun 17 15:49:49 2015 -0700

----------------------------------------------------------------------
 .../asyncevents/AmazonAsyncEventService.java        |  2 +-
 .../org/apache/usergrid/rest/IndexResource.java     | 16 ++++++++++++----
 .../services/notifications/QueueListener.java       |  2 +-
 .../usergrid/services/queues/QueueListener.java     |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------