You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/02/15 20:47:50 UTC

[38/50] lucene-solr:master: Merge branch 'apache-https-master' into jira/solr-8593

Merge branch 'apache-https-master' into jira/solr-8593


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

Branch: refs/heads/master
Commit: a9bdfdec109abf410502b3804db4161abd33caf9
Parents: 934a92e bb5bf3f
Author: Kevin Risden <kr...@apache.org>
Authored: Sat Jan 28 12:20:51 2017 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Sat Jan 28 12:20:51 2017 -0500

----------------------------------------------------------------------
 solr/CHANGES.txt                                |  4 ++
 solr/bin/solr.cmd                               | 40 ++++++++++----------
 .../org/apache/solr/cloud/MockZkController.java | 36 ++++++++++++++++++
 .../schema/TestManagedSchemaThreadSafety.java   | 32 ++++++++++++++--
 4 files changed, 88 insertions(+), 24 deletions(-)
----------------------------------------------------------------------