You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/02/18 16:53:36 UTC
[88/89] usergrid git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/usergrid
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/93b864fe
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/93b864fe
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/93b864fe
Branch: refs/heads/asf-site
Commit: 93b864fe0752b5030ce0fd14469782794e765a1c
Parents: 7eae313 d4c7a3c
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Feb 18 10:50:45 2016 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Feb 18 10:50:45 2016 -0500
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 27 +++++++++++++++
.../usergrid/persistence/EntityManager.java | 2 ++
.../services/AbstractCollectionService.java | 36 +++-----------------
.../usergrid/services/CollectionServiceIT.java | 16 +++++++++
tests/integration/test/main.js | 6 ++--
tests/integration/test/teardown.js | 16 ++++-----
6 files changed, 60 insertions(+), 43 deletions(-)
----------------------------------------------------------------------