Merge commit 'refs/pull/503/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/99e6d406 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/99e6d406 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/99e6d406 Branch: refs/heads/master Commit: 99e6d406cd0d60c95cf4e9e69c292b39ca3def21 Parents: 491aa08 fbced58 Author: Michael Russo <mru...@apigee.com> Authored: Fri Apr 15 00:47:36 2016 +0200 Committer: Michael Russo <mru...@apigee.com> Committed: Fri Apr 15 00:47:36 2016 +0200 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 86 ++++++++++++++------ .../collection/CollectionsResourceIT.java | 56 +++++++++++-- 2 files changed, 112 insertions(+), 30 deletions(-) ----------------------------------------------------------------------