Merge commit 'refs/pull/554/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/bc11bc4a Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/bc11bc4a Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/bc11bc4a Branch: refs/heads/asf-site Commit: bc11bc4a11543d1160347fe226732078793332cd Parents: 8d4e597 dd13f0b Author: Michael Russo <[email protected]> Authored: Fri Aug 5 14:09:41 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Fri Aug 5 14:09:41 2016 -0700 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 33 ++++++++++++++++++-- .../corepersistence/CpEntityManagerFactory.java | 9 ++++-- .../usergrid/persistence/PersistenceModule.java | 12 ++++--- .../applications/events/EventsResource.java | 6 ++-- .../applications/events/EventsResourceIT.java | 32 +++++++++---------- 5 files changed, 59 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
