Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/723ee3ab Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/723ee3ab Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/723ee3ab Branch: refs/heads/USERGRID-933 Commit: 723ee3ab115fb4785b5a8556e564460034cb0a4f Parents: 6f0bf9e 2faa805 Author: Shawn Feldman <sfeld...@apache.org> Authored: Mon Sep 14 16:40:13 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Mon Sep 14 16:40:13 2015 -0600 ---------------------------------------------------------------------- .../creating-and-managing-notifications.md | 2 ++ portal/bower.json | 2 +- portal/js/libs/usergrid.sdk.js | 8 +++++--- portal/package.json | 2 +- .../apache/usergrid/persistence/entities/Notification.java | 7 +++---- .../usergrid/services/notifications/gcm/GCMAdapter.java | 2 +- .../services/notifications/apns/NotificationsServiceIT.java | 2 +- .../services/notifications/gcm/NotificationsServiceIT.java | 2 +- 8 files changed, 15 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
