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/20 19:21:44 UTC
[38/38] git commit: Merge fcb6c9ac79b9d0fcf62c74ad92728d7b72ab1fef
into 5d5ee39466ec83bcfce1170537672f4e5ba6e96a
Merge fcb6c9ac79b9d0fcf62c74ad92728d7b72ab1fef into 5d5ee39466ec83bcfce1170537672f4e5ba6e96a
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/13460d05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/13460d05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/13460d05
Branch: refs/pull/77/merge
Commit: 13460d0535a2ad224d545c4b146731e6e2791401
Parents: 5d5ee39 fcb6c9a
Author: GERey <gr...@apigee.com>
Authored: Thu Mar 20 18:11:41 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Thu Mar 20 18:11:41 2014 +0000
----------------------------------------------------------------------
.../MvccEntitySerializationStrategyImpl.java | 76 +++++++++++++-------
...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 | 30 ++++----
.../index/impl/CorePerformanceIT.java | 18 +++--
stack/pom.xml | 43 +++++++++++
10 files changed, 292 insertions(+), 70 deletions(-)
----------------------------------------------------------------------