You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2017/06/29 02:32:39 UTC
[1/2] lucene-solr:branch_6x: minor doc change for chroot in CDCR
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 8c7dd72c9 -> 021c40938
minor doc change for chroot in CDCR
(cherry picked from commit d0c86d0)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a1e9259c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a1e9259c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a1e9259c
Branch: refs/heads/branch_6x
Commit: a1e9259c595523e4277cff312d37ff8e861b9c13
Parents: 9d3415b
Author: Erick Erickson <er...@apache.org>
Authored: Wed Jun 28 19:31:37 2017 -0700
Committer: Erick Erickson <er...@apache.org>
Committed: Wed Jun 28 19:32:19 2017 -0700
----------------------------------------------------------------------
.../solr-ref-guide/src/cross-data-center-replication-cdcr.adoc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a1e9259c/solr/solr-ref-guide/src/cross-data-center-replication-cdcr.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/cross-data-center-replication-cdcr.adoc b/solr/solr-ref-guide/src/cross-data-center-replication-cdcr.adoc
index 3bd482b..c124083 100644
--- a/solr/solr-ref-guide/src/cross-data-center-replication-cdcr.adoc
+++ b/solr/solr-ref-guide/src/cross-data-center-replication-cdcr.adoc
@@ -181,7 +181,11 @@ Here is a sample of a source configuration file, a section in `solrconfig.xml`.
----
<requestHandler name="/cdcr" class="solr.CdcrRequestHandler">
<lst name="replica">
- <str name="zkHost">10.240.18.211:2181</str>
+ <str name="zkHost">10.240.18.211:2181,10.240.18.212:2181</str>
+ <!--
+ If you have chrooted your Solr information at the target you must include the chroot, for example:
+ <str name="zkHost">10.240.18.211:2181,10.240.18.212:2181/solr</str>
+ -->
<str name="source">collection1</str>
<str name="target">collection1</str>
</lst>
[2/2] lucene-solr:branch_6x: Merge remote-tracking branch
'origin/branch_6x' into branch_6x
Posted by er...@apache.org.
Merge remote-tracking branch 'origin/branch_6x' into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/021c4093
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/021c4093
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/021c4093
Branch: refs/heads/branch_6x
Commit: 021c4093863a0be22ba7963dab7a694371465a7a
Parents: a1e9259 8c7dd72
Author: Erick Erickson <er...@apache.org>
Authored: Wed Jun 28 19:32:37 2017 -0700
Committer: Erick Erickson <er...@apache.org>
Committed: Wed Jun 28 19:32:37 2017 -0700
----------------------------------------------------------------------
build.xml | 37 +-
solr/CHANGES.txt | 23 +-
solr/bin/solr | 13 +-
.../ltr/model/MultipleAdditiveTreesModel.java | 16 +-
.../org/apache/solr/schema/CurrencyField.java | 1001 +-----------------
.../apache/solr/schema/CurrencyFieldType.java | 831 +++++++++++++++
.../solr/schema/FileExchangeRateProvider.java | 252 +++++
.../schema/OpenExchangeRatesOrgProvider.java | 2 +-
.../apache/solr/search/ValueSourceParser.java | 8 +-
.../search/stats/ExactSharedStatsCache.java | 12 +-
.../solr/search/stats/ExactStatsCache.java | 19 +-
.../org/apache/solr/servlet/BaseSolrFilter.java | 3 +
.../apache/solr/servlet/BaseSolrServlet.java | 3 +
.../org/apache/solr/util/Java9InitHack.java | 78 ++
.../bad-schema-currency-ft-amount-suffix.xml | 34 +
.../conf/bad-schema-currency-ft-code-suffix.xml | 33 +
.../conf/bad-schema-currency-ft-oer-norates.xml | 2 +-
...ma-currencyfieldtype-bogus-amount-suffix.xml | 34 +
...hema-currencyfieldtype-bogus-code-suffix.xml | 35 +
...ma-currencyfieldtype-dynamic-multivalued.xml | 36 +
...a-currencyfieldtype-ft-bogus-code-in-xml.xml | 41 +
...-currencyfieldtype-ft-bogus-default-code.xml | 41 +
...-schema-currencyfieldtype-ft-multivalued.xml | 36 +
...-schema-currencyfieldtype-ft-oer-norates.xml | 40 +
...-currencyfieldtype-missing-amount-suffix.xml | 34 +
...ma-currencyfieldtype-missing-code-suffix.xml | 35 +
...bad-schema-currencyfieldtype-multivalued.xml | 36 +
...schema-currencyfieldtype-wrong-amount-ft.xml | 36 +
...d-schema-currencyfieldtype-wrong-code-ft.xml | 35 +
.../test-files/solr/collection1/conf/schema.xml | 16 +
.../solr/schema/AbstractCurrencyFieldTest.java | 426 --------
.../apache/solr/schema/BadIndexSchemaTest.java | 41 +-
.../schema/CurrencyFieldOpenExchangeTest.java | 27 -
.../solr/schema/CurrencyFieldTypeTest.java | 494 +++++++++
.../solr/schema/CurrencyFieldXmlFileTest.java | 42 -
.../OpenExchangeRatesOrgProviderTest.java | 2 +-
.../search/stats/TestDefaultStatsCache.java | 17 +-
.../example-DIH/solr/db/conf/managed-schema | 27 +-
.../example-DIH/solr/mail/conf/managed-schema | 27 +-
.../example-DIH/solr/solr/conf/currency.xml | 2 +-
.../example-DIH/solr/solr/conf/managed-schema | 27 +-
solr/example/files/conf/managed-schema | 4 +-
.../basic_configs/conf/managed-schema | 31 +-
.../conf/currency.xml | 2 +-
.../conf/managed-schema | 31 +-
.../conf/managed-schema | 27 +-
.../solr-ref-guide/src/charfilterfactories.adoc | 24 +-
solr/solr-ref-guide/src/collections-api.adoc | 2 +-
.../src/command-line-utilities.adoc | 2 +-
solr/solr-ref-guide/src/faceting.adoc | 6 +-
.../src/field-types-included-with-solr.adoc | 3 +-
.../solr-ref-guide/src/filter-descriptions.adoc | 32 +-
solr/solr-ref-guide/src/language-analysis.adoc | 4 +-
solr/solr-ref-guide/src/response-writers.adoc | 2 +-
.../src/rule-based-authorization-plugin.adoc | 25 +-
.../src/solr-control-script-reference.adoc | 4 +-
.../src/solr-jdbc-apache-zeppelin.adoc | 2 +-
.../solr-ref-guide/src/the-terms-component.adoc | 2 +-
.../src/updating-parts-of-documents.adoc | 2 +-
...store-data-with-the-data-import-handler.adoc | 4 +-
...king-with-currencies-and-exchange-rates.adoc | 34 +-
.../solr/client/solrj/io/stream/LetStream.java | 4 +-
.../solrj/io/stream/StreamExpressionTest.java | 2 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 6 +
.../web/js/angular/controllers/replication.js | 6 +-
65 files changed, 2583 insertions(+), 1632 deletions(-)
----------------------------------------------------------------------