Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/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/cd363f49 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cd363f49 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/cd363f49 Branch: refs/heads/release-2.1.1 Commit: cd363f493db14dac2c22967a3eafabba7eac2d97 Parents: c7c7c8c 3a96239 Author: Dave Johnson <snoopd...@apache.org> Authored: Mon May 9 14:59:03 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Mon May 9 14:59:03 2016 -0400 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 5 ++ .../corepersistence/CpEntityManagerFactory.java | 6 +- .../usergrid/services/ServiceManager.java | 61 +++++++++++++++++--- 3 files changed, 61 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
