lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tflo...@apache.org
Subject [12/50] [abbrv] lucene-solr:jira/solr-10233: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Date Fri, 19 May 2017 00:13:33 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/896270d1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/896270d1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/896270d1

Branch: refs/heads/jira/solr-10233
Commit: 896270d1321296f5851cd39671328619225eb5a6
Parents: c934093 5235903
Author: Cao Manh Dat <datcm@apache.org>
Authored: Thu May 18 11:24:58 2017 +0700
Committer: Cao Manh Dat <datcm@apache.org>
Committed: Thu May 18 11:24:58 2017 +0700

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   6 +-
 .../org/apache/lucene/codecs/CodecUtil.java     |   6 +
 .../org/apache/lucene/codecs/TestCodecUtil.java |  13 +
 solr/CHANGES.txt                                |  30 +-
 solr/bin/install_solr_service.sh                |   8 +-
 solr/bin/solr                                   | 198 +++++++++--
 solr/bin/solr.cmd                               | 106 ++++--
 solr/bin/solr.in.cmd                            |   3 +
 solr/bin/solr.in.sh                             |   3 +
 .../org/apache/solr/cloud/RecoveryStrategy.java |   5 +-
 .../org/apache/solr/handler/SchemaHandler.java  |  10 -
 .../org/apache/solr/handler/StreamHandler.java  |   7 +
 .../apache/solr/response/SchemaXmlWriter.java   |   4 -
 .../org/apache/solr/schema/IndexSchema.java     |  26 +-
 .../apache/solr/schema/ManagedIndexSchema.java  |   2 -
 .../solr/search/ComplexPhraseQParserPlugin.java |   2 +-
 .../org/apache/solr/search/DisMaxQParser.java   |   5 +-
 .../solr/search/ExtendedDismaxQParser.java      |   3 +-
 .../org/apache/solr/search/LuceneQParser.java   |   4 +-
 .../org/apache/solr/search/QueryParsing.java    |  27 +-
 .../apache/solr/search/SimpleQParserPlugin.java |   2 +-
 .../apache/solr/servlet/SolrDispatchFilter.java |   2 +
 .../solr/update/DefaultSolrCoreState.java       |   4 +-
 .../src/java/org/apache/solr/util/SolrCLI.java  | 330 +++++++++++--------
 .../util/configuration/SSLConfigurations.java   |  78 +++++
 .../configuration/SSLConfigurationsFactory.java |  49 +++
 .../solr/util/configuration/package-info.java   |  23 ++
 .../src/resources/apispec/core.SchemaRead.json  |   3 +-
 .../conf/bad-schema-default-operator.xml        |  26 ++
 ...tSolrQueryParserDefaultOperatorResource.java |  29 --
 .../schema/TestSolrQueryParserResource.java     |  30 --
 .../apache/solr/schema/BadIndexSchemaTest.java  |   6 +-
 .../solr/schema/TestUseDocValuesAsStored.java   |   2 +-
 .../configuration/SSLConfigurationsTest.java    | 121 +++++++
 solr/server/etc/jetty-ssl.xml                   |   4 +-
 solr/solr-ref-guide/src/404.md                  |   6 -
 solr/solr-ref-guide/src/_config.yml.template    |  12 -
 solr/solr-ref-guide/src/_includes/archive.html  |  15 -
 solr/solr-ref-guide/src/_includes/feedback.html |  16 -
 solr/solr-ref-guide/src/_includes/footer.html   |   2 +-
 solr/solr-ref-guide/src/_includes/image.html    |   1 -
 .../src/_includes/inline_image.html             |   1 -
 solr/solr-ref-guide/src/_includes/links.html    |  44 ---
 solr/solr-ref-guide/src/_includes/topnav.html   |   3 -
 solr/solr-ref-guide/src/_layouts/post.html      |  41 ---
 solr/solr-ref-guide/src/css/ref-guide.css       |   2 +-
 solr/solr-ref-guide/src/draft-background.png    | Bin 5391 -> 0 bytes
 .../src/images/draft-background.png             | Bin 0 -> 5391 bytes
 .../src/images/solr-sunOnly-small.png           | Bin 0 -> 7528 bytes
 .../src/other-schema-elements.adoc              |   8 +-
 .../src/pdf/themes/refguide-theme.yml           |   2 +-
 solr/solr-ref-guide/src/schema-api.adoc         |  58 ----
 solr/solr-ref-guide/src/solr-sunOnly-small.png  | Bin 7528 -> 0 bytes
 .../src/the-dismax-query-parser.adoc            |   2 +-
 .../client/solrj/io/stream/CopyOfEvaluator.java |  84 +++++
 .../solrj/io/stream/DistanceEvaluator.java      |  77 +++++
 .../stream/EmpiricalDistributionEvaluator.java  | 129 ++++++++
 .../client/solrj/io/stream/LengthEvaluator.java |  60 ++++
 .../solrj/io/stream/PercentileEvaluator.java    |  68 ++++
 .../client/solrj/io/stream/RankEvaluator.java   |  75 +++++
 .../client/solrj/io/stream/ScaleEvaluator.java  |  78 +++++
 .../solrj/request/schema/SchemaRequest.java     |  19 --
 .../response/schema/SchemaRepresentation.java   |  10 -
 .../solrj/response/schema/SchemaResponse.java   |  28 --
 .../solrj/io/stream/StreamExpressionTest.java   | 330 +++++++++++++++++++
 .../solr/client/solrj/request/SchemaTest.java   |  10 -
 66 files changed, 1741 insertions(+), 617 deletions(-)
----------------------------------------------------------------------



Mime
View raw message