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 2017/05/10 21:42:34 UTC
[13/50] [abbrv] lucene-solr:jira/solr-10290: Merge branch 'master'
into jira/solr-10290
Merge branch 'master' into jira/solr-10290
Conflicts:
lucene/ivy-versions.properties
solr/CHANGES.txt
solr/core/src/java/org/apache/solr/handler/admin/CollectionHandlerApi.java
solr/licenses/android-json-LICENSE-ASL.txt
solr/licenses/asciidoctor-ant-LICENSE-ASL.txt
solr/solr-ref-guide/src/fonts/Noto_Sans/LICENSE.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/babe763e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/babe763e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/babe763e
Branch: refs/heads/jira/solr-10290
Commit: babe763e9d0f9561622171a45ab78607955c5dab
Parents: 5a4d757 69783f6
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed May 10 13:26:09 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed May 10 13:26:09 2017 -0700
----------------------------------------------------------------------
lucene/ivy-versions.properties | 5 +
solr/CHANGES.txt | 7 +
.../src/java/org/apache/solr/api/ApiBag.java | 2 +-
.../cloud/OverseerCollectionMessageHandler.java | 5 +-
.../java/org/apache/solr/cloud/RestoreCmd.java | 62 +++-
.../apache/solr/handler/SolrConfigHandler.java | 4 +-
.../handler/admin/BaseHandlerApiSupport.java | 50 +--
.../handler/admin/CollectionHandlerApi.java | 294 +++------------
.../solr/handler/admin/CollectionsHandler.java | 12 +-
.../handler/admin/ConfigSetsHandlerApi.java | 63 +---
.../solr/handler/admin/CoreAdminHandlerApi.java | 126 ++-----
.../solr/handler/admin/SecurityConfHandler.java | 4 +-
.../handler/admin/SecurityConfHandlerLocal.java | 2 +-
.../handler/admin/SecurityConfHandlerZk.java | 2 +-
.../apache/solr/request/SolrQueryRequest.java | 2 +-
.../solr/request/SolrQueryRequestBase.java | 2 +-
.../org/apache/solr/schema/SchemaManager.java | 2 +-
.../security/AutorizationEditOperation.java | 2 +-
.../apache/solr/security/BasicAuthPlugin.java | 2 +-
.../solr/security/ConfigEditablePlugin.java | 4 +-
.../security/RuleBasedAuthorizationPlugin.java | 2 +-
.../security/Sha256AuthenticationProvider.java | 2 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 2 +-
.../org/apache/solr/servlet/ResponseUtils.java | 2 +-
.../apache/solr/servlet/SolrRequestParsers.java | 2 +-
.../org/apache/solr/util/CommandOperation.java | 328 -----------------
.../AbstractCloudBackupRestoreTestCase.java | 27 ++
.../core/snapshots/TestSolrCloudSnapshots.java | 5 +
.../handler/admin/SecurityConfHandlerTest.java | 2 +-
.../solr/handler/admin/TestApiFramework.java | 2 +-
.../solr/handler/admin/TestCollectionAPIs.java | 2 +-
.../solr/metrics/SolrMetricTestUtils.java | 4 +-
.../apache/solr/schema/TestSchemaManager.java | 2 +-
.../TestRuleBasedAuthorizationPlugin.java | 4 +-
.../TestSha256AuthenticationProvider.java | 2 +-
.../solrj/request/CollectionAdminRequest.java | 32 +-
.../solrj/request/CollectionApiMapping.java | 369 +++++++++++++++++++
.../client/solrj/request/CoreApiMapping.java | 117 ++++++
.../common/params/CollectionAdminParams.java | 10 +
.../solr/common/util/CommandOperation.java | 318 ++++++++++++++++
40 files changed, 1093 insertions(+), 793 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/babe763e/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --cc lucene/ivy-versions.properties
index 3a1efbb,2ef7ad8..8fade54
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@@ -279,3 -270,4 +279,8 @@@ ua.net.nlp.morfologik-ukrainian-search.
/ua.net.nlp/morfologik-ukrainian-search = ${ua.net.nlp.morfologik-ukrainian-search.version}
/xerces/xercesImpl = 2.9.1
+
++ua.net.nlp.morfologik-ukrainian-search.version = 3.7.5
++/ua.net.nlp/morfologik-ukrainian-search = ${ua.net.nlp.morfologik-ukrainian-search.version}
++
++/xerces/xercesImpl = 2.9.1