You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/07/20 11:26:30 UTC
lucene-solr:master: SOLR-11128: Escape script usage strings
containing quotes
Repository: lucene-solr
Updated Branches:
refs/heads/master db1ad2544 -> e5722c3f9
SOLR-11128: Escape script usage strings containing quotes
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e5722c3f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e5722c3f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e5722c3f
Branch: refs/heads/master
Commit: e5722c3f96f72abd34d3808fa4f7c29722fc50be
Parents: db1ad25
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Thu Jul 20 16:56:09 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Thu Jul 20 16:56:09 2017 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +-
solr/bin/solr | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e5722c3f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d7f195a..0c02585 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -301,7 +301,7 @@ New Features
multivalued fields, a new JSON request language, and more. DocValues are now required for any field used in the analytics
expression whereas previously docValues was not required. Please see SOLR-10123 for details. (Houston Putman)
-* SOLR-10282: bin/solr support for enabling Kerberos authentication (Ishan Chattopadhyaya)
+* SOLR-10282: bin/solr support for enabling Kerberos authentication (Ishan Chattopadhyaya, Jason Gerlowski)
Bug Fixes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e5722c3f/solr/bin/solr
----------------------------------------------------------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index 3d28340..8e7c8d8 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -555,7 +555,7 @@ function print_usage() {
echo ""
echo "Usage: solr auth enable [-type basicAuth] -credentials user:pass [-blockUnknown <true|false>] [-updateIncludeFileOnly <true|false>]"
echo " solr auth enable [-type basicAuth] -prompt <true|false> [-blockUnknown <true|false>] [-updateIncludeFileOnly <true|false>]"
- echo " solr auth enable -type kerberos -config "<kerberos configs>" [-updateIncludeFileOnly <true|false>]"
+ echo " solr auth enable -type kerberos -config \"<kerberos configs>\" [-updateIncludeFileOnly <true|false>]"
echo " solr auth disable [-updateIncludeFileOnly <true|false>]"
echo ""
echo " -type <type> The authentication mechanism (basicAuth or kerberos) to enable. Defaults to 'basicAuth'."
@@ -563,7 +563,7 @@ function print_usage() {
echo " -credentials <user:pass> The username and password of the initial user. Applicable for basicAuth only."
echo " Note: only one of -prompt or -credentials must be provided"
echo ""
- echo " -config "<configs>" Configuration parameters (Solr startup parameters). Required and applicable only for Kerberos"
+ echo " -config \"<configs>\" Configuration parameters (Solr startup parameters). Required and applicable only for Kerberos"
echo ""
echo " -prompt <true|false> Prompts the user to provide the credentials. Applicable for basicAuth only."
echo " Note: only one of -prompt or -credentials must be provided"