You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/03/07 12:50:52 UTC
[12/12] lucene-solr:jira/solr-9858: Merge branch 'master' into
jira/solr-9858
Merge branch 'master' into jira/solr-9858
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8a6e6ec3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8a6e6ec3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8a6e6ec3
Branch: refs/heads/jira/solr-9858
Commit: 8a6e6ec36879b9fca84d11de492fafd7b76fe2b6
Parents: ec66ac9 acb185b
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Mar 7 13:47:10 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Mar 7 13:47:10 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 29 ++--
solr/bin/install_solr_service.sh | 2 +-
.../ExtractingRequestHandlerTest.java | 4 +-
.../src/java/org/apache/solr/core/SolrCore.java | 3 +
.../org/apache/solr/handler/sql/SolrRules.java | 14 ++
.../apache/solr/handler/sql/SolrTableScan.java | 4 +
.../solr/security/PKIAuthenticationPlugin.java | 2 +-
.../solr/update/DirectUpdateHandler2.java | 128 ++++++++++++------
.../org/apache/solr/handler/TestSQLHandler.java | 8 ++
.../solr/metrics/SolrMetricManagerTest.java | 4 +-
.../security/TestPKIAuthenticationPlugin.java | 131 +++++++------------
.../solr/update/DirectUpdateHandlerTest.java | 108 ++++++++++++---
.../solr/client/solrj/io/sql/JdbcTest.java | 19 +++
solr/webapp/web/css/angular/collections.css | 17 +++
.../web/js/angular/controllers/collections.js | 14 ++
solr/webapp/web/js/angular/services.js | 1 +
solr/webapp/web/partials/collections.html | 18 ++-
17 files changed, 350 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8a6e6ec3/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8a6e6ec3/solr/core/src/test/org/apache/solr/metrics/SolrMetricManagerTest.java
----------------------------------------------------------------------