You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/02 19:46:24 UTC

[6/6] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into map

Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into map


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/587cb5a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/587cb5a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/587cb5a7

Branch: refs/heads/map
Commit: 587cb5a73d636988008b9f4600404ff67b451c4c
Parents: 9a8bed5 cff6e1c
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Oct 2 11:45:51 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Oct 2 11:45:51 2014 -0600

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        | 106 ++++++++++++-------
 .../corepersistence/CpEntityManagerFactory.java |   2 -
 2 files changed, 70 insertions(+), 38 deletions(-)
----------------------------------------------------------------------