You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/06/02 10:56:34 UTC
[11/38] lucene-solr:jira/solr-8668: SOLR-10757: Merge remote-tracking
branch 'refs/remotes/origin/master'
SOLR-10757: Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
solr/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7a5261a2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7a5261a2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7a5261a2
Branch: refs/heads/jira/solr-8668
Commit: 7a5261a2228b52d6b29d1d6c147ce08f43e917cb
Parents: ee33f38 55e37cd
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed May 31 09:52:25 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed May 31 09:52:25 2017 -0700
----------------------------------------------------------------------
.../spatial3d/geom/GeoPolygonFactory.java | 63 +++++++++++++++
.../lucene/spatial3d/geom/GeoPolygonTest.java | 63 +++++++++++++++
solr/CHANGES.txt | 3 +
.../apache/solr/cloud/CreateCollectionCmd.java | 4 +-
.../org/apache/solr/cloud/TestPullReplica.java | 20 ++++-
.../org/apache/solr/cloud/TestTlogReplica.java | 20 ++++-
solr/solr-ref-guide/src/codec-factory.adoc | 24 +++++-
.../src/near-real-time-searching.adoc | 14 +++-
.../src/solr-control-script-reference.adoc | 11 ++-
.../solrj/io/stream/TimeSeriesStream.java | 38 ++++++++-
.../solrj/io/stream/StreamExpressionTest.java | 81 ++++++++++++++++++++
11 files changed, 321 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7a5261a2/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index d78f991,f57cac5..1192d36
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -198,8 -198,9 +198,11 @@@ Other Change
* SOLR-10755: delete/refactor many solrj deprecations (hossman)
+ * SOLR-10752: replicationFactor (nrtReplicas) default is 0 if tlogReplicas is specified when creating a collection
+ (Tomás Fernández Löbbe)
+
+* SOLR-10757: delete/refactor/cleanup CollectionAdminRequest deprecations (hossman)
+
================== 6.7.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.