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 2016/10/26 13:50:24 UTC
[20/26] lucene-solr:jira/solr-8542-v2: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ecfbe51c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ecfbe51c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ecfbe51c
Branch: refs/heads/jira/solr-8542-v2
Commit: ecfbe51c941fbebd0007cf167b050daf821011d8
Parents: 6d9a99f b69c5d9
Author: Noble Paul <no...@apache.org>
Authored: Wed Oct 26 13:36:51 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Wed Oct 26 13:36:51 2016 +0530
----------------------------------------------------------------------
dev-tools/idea/solr/contrib/langid/langid.iml | 1 +
solr/CHANGES.txt | 13 ++
.../solr/handler/dataimport/DocBuilder.java | 2 +
.../handler/dataimport/TestDocBuilder2.java | 23 ++
.../org/apache/solr/core/CoreContainer.java | 32 +--
.../solr/handler/admin/SecurityConfHandler.java | 142 ++++++++----
.../handler/admin/SecurityConfHandlerLocal.java | 102 +++++++++
.../handler/admin/SecurityConfHandlerZk.java | 92 ++++++++
.../apache/solr/index/NoMergePolicyFactory.java | 34 +++
.../apache/solr/security/BasicAuthPlugin.java | 14 +-
.../security/Sha256AuthenticationProvider.java | 2 +-
.../conf/solrconfig-nomergepolicyfactory.xml | 32 +++
.../cloud/LeaderElectionContextKeyTest.java | 114 ++++++++++
.../apache/solr/core/TestMergePolicyConfig.java | 20 ++
.../SecurityConfHandlerLocalForTesting.java | 43 ++++
.../handler/admin/SecurityConfHandlerTest.java | 66 +++---
.../solr/security/BasicAuthIntegrationTest.java | 4 +-
.../solr/security/BasicAuthStandaloneTest.java | 220 +++++++++++++++++++
18 files changed, 861 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ecfbe51c/solr/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ecfbe51c/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
----------------------------------------------------------------------