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 2015/11/18 17:27:42 UTC
[21/50] usergrid git commit: Merge branch 'refs/heads/2.1-release'
Merge branch 'refs/heads/2.1-release'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c3c2818e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c3c2818e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c3c2818e
Branch: refs/heads/USERGRID-872
Commit: c3c2818e27cb4ebe19257e7539923eef709efd85
Parents: 14dd48d d4d3ed3
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Nov 12 16:28:04 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Nov 12 16:28:04 2015 -0700
----------------------------------------------------------------------
.../corepersistence/migration/DeDupConnectionDataMigration.java | 2 +-
.../persistence/collection/impl/EntityCollectionManagerImpl.java | 3 +--
.../persistence/collection/mvcc/stage/write/WriteCommit.java | 1 -
.../persistence/collection/mvcc/stage/write/WriteStart.java | 2 --
.../serialization/impl/shard/impl/NodeShardAllocationImpl.java | 1 -
.../impl/shard/impl/ShardedEdgeSerializationImpl.java | 3 +--
.../usergrid/persistence/graph/impl/NodeDeleteListenerTest.java | 1 -
.../index/migration/EsIndexMappingMigrationPlugin.java | 2 +-
8 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------