Merge commit 'refs/pull/518/head' of github.com:apache/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/e6cf6ed4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e6cf6ed4 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e6cf6ed4 Branch: refs/heads/usergrid-1268-akka-211 Commit: e6cf6ed4f3bd8b542fc72c3bc1d558898bad88a4 Parents: a1cb1f5 1d0e73b Author: Michael Russo <[email protected]> Authored: Fri Jun 3 07:46:06 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Fri Jun 3 07:46:06 2016 -0700 ---------------------------------------------------------------------- .../usergrid/rest/security/SecuredResourceFilterFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
