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:48 UTC
[36/50] [abbrv] incubator-usergrid git commit: Merge branch 'pr/290'
into two-dot-o-dev
Merge branch 'pr/290' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ba7ec569
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ba7ec569
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ba7ec569
Branch: refs/heads/USERGRID-703
Commit: ba7ec569d52fabe2ae370091b2f5b1939e04de90
Parents: 00d05b2 ed91d50
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Jun 22 19:20:22 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Jun 22 19:20:22 2015 -0600
----------------------------------------------------------------------
portal/css/main.min.css | 2 +-
.../main/resources/usergrid-default.properties | 56 +-------
.../asyncevents/AmazonAsyncEventService.java | 120 ++++++++--------
.../asyncevents/model/AsyncEvent.java | 22 ++-
.../asyncevents/model/EdgeDeleteEvent.java | 12 +-
.../asyncevents/model/EdgeIndexEvent.java | 2 +
.../asyncevents/model/EntityDeleteEvent.java | 2 +
.../asyncevents/model/EntityIndexEvent.java | 7 +-
.../corepersistence/index/CoreIndexFig.java | 2 +-
.../queue/impl/SNSQueueManagerImpl.java | 138 +++++++++++++------
.../queue/impl/SQSQueueManagerImpl.java | 2 +-
.../queue/util/AmazonNotificationUtils.java | 85 +++++-------
12 files changed, 230 insertions(+), 220 deletions(-)
----------------------------------------------------------------------