You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2016/07/06 21:26:17 UTC
[4/4] lucene-solr:master: Merge remote-tracking branch
'refs/remotes/origin/master' (SOLR-9180)
Merge remote-tracking branch 'refs/remotes/origin/master' (SOLR-9180)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1125a8a8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1125a8a8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1125a8a8
Branch: refs/heads/master
Commit: 1125a8a8efd53f387d10da1658d005db03cf6ccc
Parents: ae316f1 380c5a6
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed Jul 6 14:25:40 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed Jul 6 14:25:40 2016 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 4 +
.../java/org/apache/solr/core/SolrConfig.java | 10 +-
.../handler/component/RealTimeGetComponent.java | 63 +++++++++-
.../java/org/apache/solr/update/PeerSync.java | 124 ++++++++++++++++++-
.../resources/EditableSolrConfigAttributes.json | 5 +-
.../solr/collection1/conf/solrconfig-tlog.xml | 8 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 2 +
7 files changed, 200 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1125a8a8/solr/CHANGES.txt
----------------------------------------------------------------------