Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into jackson-exclusion
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d363242e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d363242e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d363242e Branch: refs/heads/jackson-exclusion Commit: d363242e56571db6fa09f8be5b6753e864fb72a4 Parents: 9fd657b c3a5bc4 Author: Shawn Feldman <[email protected]> Authored: Mon Nov 9 14:15:56 2015 -0700 Committer: Shawn Feldman <[email protected]> Committed: Mon Nov 9 14:15:56 2015 -0700 ---------------------------------------------------------------------- .../org/apache/usergrid/services/AbstractCollectionService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
