You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/05/23 00:03:39 UTC
[17/27] lucene-solr:jira/solr-10233: Merge branch 'master' into
jira/solr-10233
Merge branch 'master' into jira/solr-10233
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/70bd593a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/70bd593a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/70bd593a
Branch: refs/heads/jira/solr-10233
Commit: 70bd593a422a066743b2f8443c0cdfb527c3e4e3
Parents: 8828c39 c71ce16
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Mon May 22 10:12:53 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Mon May 22 10:12:53 2017 -0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +
lucene/classification/build.xml | 2 +-
.../search/join/ToParentBlockJoinQuery.java | 2 +-
.../lucene/search/join/TestBlockJoin.java | 62 +-
.../lucene/misc/SweetSpotSimilarityTest.java | 3 +-
solr/CHANGES.txt | 12 +-
.../solr/response/VelocityResponseWriter.java | 1 -
.../org/apache/solr/handler/ExportWriter.java | 1 -
.../handler/FieldAnalysisRequestHandler.java | 11 +-
.../org/apache/solr/handler/SchemaHandler.java | 9 -
.../solr/handler/admin/LukeRequestHandler.java | 1 -
.../handler/component/HighlightComponent.java | 9 +-
.../apache/solr/highlight/SolrHighlighter.java | 5 +-
.../apache/solr/response/SchemaXmlWriter.java | 5 -
.../org/apache/solr/schema/IndexSchema.java | 31 +-
.../apache/solr/schema/ManagedIndexSchema.java | 1 -
.../solr/search/ComplexPhraseQParserPlugin.java | 3 -
.../org/apache/solr/search/DisMaxQParser.java | 5 +-
.../org/apache/solr/search/LuceneQParser.java | 3 -
.../org/apache/solr/search/QueryParsing.java | 13 +-
.../apache/solr/search/SimpleQParserPlugin.java | 6 +-
.../solr/search/SurroundQParserPlugin.java | 2 +-
.../apache/solr/search/XmlQParserPlugin.java | 2 +-
.../conf/bad-schema-defaultsearchfield.xml | 26 +
.../test/org/apache/solr/MinimalSchemaTest.java | 1 -
.../FieldAnalysisRequestHandlerTest.java | 8 +
.../solr/handler/admin/TestCollectionAPIs.java | 2 +-
.../apache/solr/schema/BadIndexSchemaTest.java | 4 +
.../apache/solr/util/SolrPluginUtilsTest.java | 3 +-
.../example-DIH/solr/tika/conf/managed-schema | 2 +-
solr/solr-ref-guide/build.xml | 1 +
solr/solr-ref-guide/meta-docs/jekyll.adoc | 16 +-
solr/solr-ref-guide/src/_config.yml.template | 2 +
solr/solr-ref-guide/src/_includes/toc.html | 22 +-
solr/solr-ref-guide/src/css/ref-guide.css | 44 +-
solr/solr-ref-guide/src/js/ref-guide-toc.js | 36 +
.../src/other-schema-elements.adoc | 7 -
.../src/putting-the-pieces-together.adoc | 2 -
solr/solr-ref-guide/src/solr-glossary.adoc | 4 +-
solr/solr-ref-guide/src/stream-decorators.adoc | 832 ++++++++
solr/solr-ref-guide/src/stream-evaluators.adoc | 445 +++++
solr/solr-ref-guide/src/stream-sources.adoc | 405 ++++
.../src/streaming-expressions.adoc | 1863 +-----------------
.../src/update-request-processors.adoc | 191 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 2 +
.../solr/client/solrj/io/stream/SolrStream.java | 13 +-
.../client/solrj/io/stream/TupleStream.java | 37 +-
.../response/schema/SchemaRepresentation.java | 10 -
.../solrj/response/schema/SchemaResponse.java | 5 -
solr/webapp/web/js/angular/app.js | 252 ---
.../web/js/angular/controllers/analysis.js | 10 -
.../web/js/angular/controllers/core-overview.js | 32 -
solr/webapp/web/js/angular/controllers/cores.js | 283 ---
.../webapp/web/js/angular/controllers/schema.js | 21 -
solr/webapp/web/partials/schema.html | 3 -
55 files changed, 2083 insertions(+), 2693 deletions(-)
----------------------------------------------------------------------