lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [44/44] lucene-solr:jira/solr-9854: Merge branch 'master' into jira/solr-9854
Date Tue, 20 Dec 2016 10:48:49 GMT
Merge branch 'master' into jira/solr-9854


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

Branch: refs/heads/jira/solr-9854
Commit: fa87f6a000e99f29d6cbb9c0bad8355cc1f353e5
Parents: 3562ef7 8bbdb62
Author: Andrzej Bialecki <ab@apache.org>
Authored: Tue Dec 20 11:44:43 2016 +0100
Committer: Andrzej Bialecki <ab@apache.org>
Committed: Tue Dec 20 11:44:43 2016 +0100

----------------------------------------------------------------------
 .../dot.settings/org.eclipse.jdt.core.prefs     |    1 +
 .../search/TestDocValuesStatsCollector.java     |   29 +-
 lucene/tools/javadoc/ecj.javadocs.prefs         |    2 +-
 solr/CHANGES.txt                                |    7 +
 solr/contrib/ltr/README.md                      |   36 +-
 solr/contrib/ltr/example/solrconfig.xml         | 1711 ------------------
 .../org/apache/solr/ltr/CSVFeatureLogger.java   |   62 +
 .../java/org/apache/solr/ltr/FeatureLogger.java |  134 +-
 .../java/org/apache/solr/ltr/LTRRescorer.java   |    2 +-
 .../org/apache/solr/ltr/LTRScoringQuery.java    |    2 +-
 .../solr/ltr/SolrQueryRequestContextUtils.java  |    6 +-
 .../org/apache/solr/ltr/model/LinearModel.java  |   10 +
 .../ltr/model/MultipleAdditiveTreesModel.java   |    5 +
 .../LTRFeatureLoggerTransformerFactory.java     |  105 +-
 solr/contrib/ltr/src/java/overview.html         |    2 +-
 .../solr/collection1/conf/solrconfig-ltr.xml    |    5 +-
 .../collection1/conf/solrconfig-ltr_Th10_10.xml |    5 +-
 .../collection1/conf/solrconfig-multiseg.xml    |   12 +-
 .../apache/solr/ltr/FeatureLoggerTestUtils.java |   44 +
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java |   17 +-
 .../solr/ltr/TestSelectiveWeightCreation.java   |   11 +-
 .../solr/ltr/feature/TestExternalFeatures.java  |   12 +-
 .../ltr/feature/TestExternalValueFeatures.java  |    4 +-
 .../solr/ltr/feature/TestFeatureLogging.java    |   99 +-
 .../solr/ltr/feature/TestFieldValueFeature.java |   13 +-
 .../solr/ltr/feature/TestFilterSolrFeature.java |    6 +-
 .../ltr/feature/TestNoMatchSolrFeature.java     |    6 +-
 .../ltr/feature/TestOriginalScoreFeature.java   |    9 +-
 .../solr/SolrMorphlineZkAliasTest.java          |    7 -
 .../org/apache/solr/cloud/CreateAliasCmd.java   |   21 +-
 .../src/java/org/apache/solr/core/SolrCore.java |    4 +-
 .../solr/handler/admin/CollectionsHandler.java  |    2 +-
 .../security/AttributeOnlyServletContext.java   |  291 +++
 .../ConfigurableInternodeAuthHadoopPlugin.java  |   68 +
 .../security/DelegationTokenKerberosFilter.java |    6 +-
 .../solr/security/GenericHadoopAuthPlugin.java  |  266 +++
 .../apache/solr/security/HadoopAuthFilter.java  |  198 ++
 .../apache/solr/security/HadoopAuthPlugin.java  |  241 +++
 .../apache/solr/security/KerberosFilter.java    |    6 +-
 .../apache/solr/security/KerberosPlugin.java    |  314 +---
 ...tContinuesRecorderAuthenticationHandler.java |   71 +
 .../solr/security/hadoop_kerberos_config.json   |   16 +
 .../hadoop_simple_auth_with_delegation.json     |   29 +
 .../apache/solr/cloud/AliasIntegrationTest.java |   50 +-
 .../TestSolrCloudWithSecureImpersonation.java   |    8 +-
 .../solr/security/hadoop/ImpersonationUtil.java |   73 +
 .../hadoop/ImpersonatorCollectionsHandler.java  |   60 +
 .../hadoop/TestDelegationWithHadoopAuth.java    |  400 ++++
 .../hadoop/TestImpersonationWithHadoopAuth.java |  215 +++
 .../TestSolrCloudWithHadoopAuthPlugin.java      |  136 ++
 .../conf/solrconfig.xml                         |   54 +-
 .../impl/DelegationTokenHttpSolrClient.java     |   34 +-
 .../solrj/impl/HttpClientBuilderFactory.java    |   41 +
 .../solr/client/solrj/impl/HttpSolrClient.java  |   56 +-
 .../solrj/impl/Krb5HttpClientBuilder.java       |   10 +-
 .../solrj/impl/BasicHttpSolrClientTest.java     |   31 +
 .../solr/client/solrj/io/sql/JdbcTest.java      |    7 +-
 .../client/solrj/io/stream/JDBCStreamTest.java  |    9 +-
 .../solrj/io/stream/StreamExpressionTest.java   |    7 +-
 .../client/solrj/io/stream/StreamingTest.java   |   10 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java |   29 +-
 .../apache/solr/cloud/SolrCloudTestCase.java    |   30 +-
 62 files changed, 2781 insertions(+), 2376 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fa87f6a0/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index 34494b1,519cdfa..52112cd
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -173,6 -173,12 +173,11 @@@ New Feature
  * SOLR-9844: FieldCache information fetched via the mbeans handler or seen via the UI now
displays the total size used.
    The individual cache entries in the response are now formatted better as well. (Varun
Thacker)
  
 -<<<<<<< HEAD
+ * SOLR-9513: Generic authentication plugins (GenericHadoopAuthPlugin and ConfigurableInternodeAuthHadoopPlugin)
that delegate
+   all functionality to Hadoop authentication framework. (Hrishikesh Gadre via Ishan Chattopadhyaya)
+ 
+ * SOLR-9860: Enable configuring invariantParams via HttpSolrClient.Builder (Hrishikesh Gadre,
Ishan Chattopadhyaya)
+  
  * SOLR-4735: Improve metrics reporting. This uses the dropwizard metric library, adding
an internal API
    for registering and reporting metrics from Solr components. Several new metrics and an
improved JMX
    reporter have been added (Alan Woodward, Jeff Wartes, Christine Poerschke, Kelvin Wong,
shalin, ab)

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fa87f6a0/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------


Mime
View raw message