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 2020/01/08 16:37:39 UTC
[lucene-solr] 02/03: Merge branch 'master' into jira/solr-13579
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-13579
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 30cb7c7e44eec1f7217aedc0245d974e7e697abb
Merge: 87811fc a17c486
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Jan 8 13:46:50 2020 +0100
Merge branch 'master' into jira/solr-13579
solr/CHANGES.txt | 4 ----
solr/bin/solr | 4 ----
solr/bin/solr.cmd | 10 +++-------
solr/bin/solr.in.cmd | 12 ++++--------
solr/bin/solr.in.sh | 8 --------
solr/server/etc/jetty-http.xml | 2 +-
solr/server/etc/jetty-https.xml | 2 +-
solr/server/etc/jetty-https8.xml | 2 +-
.../src/getting-started-with-solrcloud.adoc | 5 -----
solr/solr-ref-guide/src/securing-solr.adoc | 16 ----------------
solr/solr-ref-guide/src/taking-solr-to-production.adoc | 4 ----
11 files changed, 10 insertions(+), 59 deletions(-)