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 2014/03/21 20:21:28 UTC

[41/44] git commit: Merge fe2bb3bb1a69f13e847f833cb3f3170bd70f83d6 into 9d6ed417e3773e711ae2adb0bb38fcf99b72413f

Merge fe2bb3bb1a69f13e847f833cb3f3170bd70f83d6 into 9d6ed417e3773e711ae2adb0bb38fcf99b72413f


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

Branch: refs/pull/77/merge
Commit: 0490156f568f029254d3560869f287884a2d1ed3
Parents: 9d6ed41 fe2bb3b
Author: GERey <gr...@apigee.com>
Authored: Fri Mar 21 19:11:12 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Fri Mar 21 19:11:12 2014 +0000

----------------------------------------------------------------------
 .../MvccEntitySerializationStrategyImpl.java    | 63 ++++++++++--------
 ...MvccEntitySerializationStrategyImplTest.java | 67 ++++++++++++++++++++
 stack/corepersistence/model/pom.xml             | 33 ++++++++++
 .../persistence/model/entity/Entity.java        |  8 ++-
 .../model/field/value/EntityObject.java         | 30 +++++++++
 .../persistence/model/field/value/Location.java | 11 +++-
 .../index/impl/EsEntityCollectionIndex.java     | 46 ++++++++------
 .../org/apache/usergrid/utils/JsonUtils.java    | 26 ++------
 .../index/impl/CorePerformanceIT.java           | 18 ++++--
 stack/pom.xml                                   | 43 +++++++++++++
 10 files changed, 268 insertions(+), 77 deletions(-)
----------------------------------------------------------------------