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 2015/04/21 03:09:50 UTC
[2/3] incubator-usergrid git commit: Merge branch 'two-dot-o-dev'
into tempbranch
Merge branch 'two-dot-o-dev' into tempbranch
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1c207d76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1c207d76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1c207d76
Branch: refs/heads/two-dot-o-dev
Commit: 1c207d76e29980b217613231195e58905da5af38
Parents: 5945574 4cc2e0b
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Apr 20 18:28:01 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Apr 20 18:28:01 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpRelationManager.java | 7 +++++--
.../main/resources/usergrid-core-context.xml | 20 +-------------------
.../usergrid/persistence/EntityManagerIT.java | 8 ++------
.../usergrid/persistence/index/IndexFig.java | 15 +++++++++++++++
.../impl/EsApplicationEntityIndexImpl.java | 4 +++-
.../index/impl/EsIndexBufferConsumerImpl.java | 2 +-
6 files changed, 27 insertions(+), 29 deletions(-)
----------------------------------------------------------------------