Merge commit 'refs/pull/488/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/583c1049 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/583c1049 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/583c1049 Branch: refs/heads/master Commit: 583c10492ef02613ea5e6ce0fefe0bba9b53189e Parents: 2e29636 68b079a Author: Michael Russo <[email protected]> Authored: Thu Feb 25 11:55:35 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Thu Feb 25 11:55:35 2016 -0800 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 27 +++++++++- .../applications/ApplicationResource.java | 27 ++++++---- .../rest/applications/ApplicationDeleteIT.java | 12 ++--- .../collection/CollectionsResourceIT.java | 56 ++++++++++++++++++++ 4 files changed, 105 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
