Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6488b05f Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6488b05f Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6488b05f Branch: refs/heads/release-2.1.1 Commit: 6488b05fb09cce74872169ce497f7a4613be8f13 Parents: 2d2435f d069185 Author: Dave Johnson <snoopd...@apache.org> Authored: Wed Apr 20 11:03:13 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Wed Apr 20 11:03:13 2016 -0400 ---------------------------------------------------------------------- stack/pom.xml | 2 +- .../services/notifications/gcm/GCMAdapter.java | 12 +++----- .../gcm/NotificationsServiceIT.java | 32 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
