You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/14 23:00:28 UTC
[04/23] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/30ba9ace
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/30ba9ace
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/30ba9ace
Branch: refs/heads/cloudformation-update
Commit: 30ba9ace6931d57e223a95740f52c15afb3c410c
Parents: 231b674 8930071
Author: amuramoto <am...@apigee.com>
Authored: Thu Oct 2 13:33:20 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Thu Oct 2 13:33:20 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 106 ++++++++++++-------
.../corepersistence/CpEntityManagerFactory.java | 2 -
.../corepersistence/CpEntityMapUtils.java | 2 +-
.../org/apache/usergrid/persistence/GeoIT.java | 2 +-
.../persistence/model/field/value/Location.java | 12 ++-
.../index/impl/EsEntityIndexBatchImpl.java | 2 +-
.../index/impl/EntityIndexMapUtils.java | 2 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 18 +++-
8 files changed, 95 insertions(+), 51 deletions(-)
----------------------------------------------------------------------