Merge commit 'refs/pull/507/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/c5b06dba Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c5b06dba Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c5b06dba Branch: refs/heads/release-2.1.1 Commit: c5b06dba4a7b6fafebe613d7d8e4be89cd68755d Parents: 9553d44 f76aeaf Author: Michael Russo <[email protected]> Authored: Wed Apr 20 16:16:17 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Wed Apr 20 16:16:17 2016 -0700 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 4 +- .../events/ApplicationRequestCounterIT.java | 48 ++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/c5b06dba/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java ----------------------------------------------------------------------
