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/7fdca3d2 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/7fdca3d2 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/7fdca3d2 Branch: refs/heads/usergrid-1268-akka-211 Commit: 7fdca3d2481fd0e4c1758229eec4f62d6fa238b4 Parents: cd363f4 cdb92aa Author: Dave Johnson <snoopd...@apache.org> Authored: Mon May 16 09:32:00 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Mon May 16 09:32:00 2016 -0400 ---------------------------------------------------------------------- .../collection/mvcc/stage/write/WriteUniqueVerify.java | 13 +++++++++---- .../usergrid/security/shiro/utils/LocalShiroCache.java | 2 +- .../notifications/ApplicationQueueManagerCache.java | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
