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 23:12:57 UTC

[8/8] 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/c97ad1e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c97ad1e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c97ad1e7

Branch: refs/heads/two-dot-o
Commit: c97ad1e761b3c6e98dc982140ec67ce2608ab472
Parents: b749a7a deaa46c
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Oct 2 15:08:40 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Oct 2 15:08:40 2014 -0600

----------------------------------------------------------------------
 .../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/SystemResource.java    | 120 +++++++++++++++++++
 .../apache/usergrid/rest/PartialUpdateTest.java |  18 ++-
 7 files changed, 145 insertions(+), 13 deletions(-)
----------------------------------------------------------------------