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/07 18:03:10 UTC

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

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


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

Branch: refs/heads/two-dot-o
Commit: 2c8837ff8d255eabe0cbf2510a782eb5d3f425d8
Parents: 7851e34 43f1930
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Oct 7 09:55:10 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Oct 7 09:55:10 2014 -0600

----------------------------------------------------------------------
 .../CpEntityIndexDeleteListener.java            |  23 +-
 .../corepersistence/CpEntityManager.java        |  45 +++-
 .../corepersistence/CpEntityManagerFactory.java |   5 +-
 .../corepersistence/CpManagerCache.java         |  29 ++-
 .../usergrid/corepersistence/GuiceModule.java   |  11 +-
 .../usergrid/persistence/map/MapManager.java    |   1 -
 .../persistence/map/MapManagerFactory.java      |   2 +-
 .../persistence/map/impl/MapManagerImpl.java    |  24 ---
 .../persistence/map/impl/MapScopeImpl.java      |   1 -
 .../map/impl/MapSerializationImpl.java          |  48 +++--
 .../persistence/map/MapManagerTest.java         |  21 +-
 .../index/impl/EsEntityIndexImpl.java           | 208 ++++++++++---------
 12 files changed, 234 insertions(+), 184 deletions(-)
----------------------------------------------------------------------