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 2014/09/27 16:57:02 UTC
[1/2] git commit: Fixes USERGRID-233 which turns out to be a merge
problem.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 0dc230d3d -> a200f45db
Fixes USERGRID-233 which turns out to be a merge problem.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/43b85a61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/43b85a61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/43b85a61
Branch: refs/heads/two-dot-o
Commit: 43b85a618ddef4ca605cb06153f92a55aa34d567
Parents: 4cba3b8
Author: Dave Johnson <dm...@apigee.com>
Authored: Sat Sep 27 10:55:42 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Sat Sep 27 10:55:42 2014 -0400
----------------------------------------------------------------------
portal/js/global/ug-service.js | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/43b85a61/portal/js/global/ug-service.js
----------------------------------------------------------------------
diff --git a/portal/js/global/ug-service.js b/portal/js/global/ug-service.js
index f3cba06..db2bfe9 100644
--- a/portal/js/global/ug-service.js
+++ b/portal/js/global/ug-service.js
@@ -550,13 +550,8 @@ AppServices.Services.factory('ug', function(configuration, $rootScope, utility,
self.notificationCollection = notifications;
});
},
-<<<<<<< HEAD
- getNotificationReceipts: function (uuid) {
- this.getCollection('receipts', 'receipts','created desc','notificationUUID='+uuid);
-=======
getNotificationReceipts: function(uuid) {
this.getCollection('receipts', 'notifications/' + uuid + '/receipts');
->>>>>>> d972699... fix create collections
var self = this;
$rootScope.$on('receipts-received', function(event, receipts) {
self.receiptsCollection = receipts;
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a200f45d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a200f45d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a200f45d
Branch: refs/heads/two-dot-o
Commit: a200f45db15fd45be7bf2ef49b3bba12d5b051c3
Parents: 43b85a6 0dc230d
Author: Dave Johnson <dm...@apigee.com>
Authored: Sat Sep 27 10:56:15 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Sat Sep 27 10:56:15 2014 -0400
----------------------------------------------------------------------
.../notifications/ApplicationQueueManager.java | 38 +++++++++++---------
.../notifications/NotificationsService.java | 7 ++--
.../notifications/NotificationsTaskManager.java | 33 -----------------
.../services/notifications/QueueListener.java | 20 +++++------
.../services/notifications/QueueManager.java | 4 ---
.../notifications/SingleQueueTaskManager.java | 10 +++---
.../services/notifications/TaskTracker.java | 4 +--
.../apns/NotificationsServiceIT.java | 4 ++-
.../gcm/NotificationsServiceIT.java | 4 ++-
9 files changed, 47 insertions(+), 77 deletions(-)
----------------------------------------------------------------------