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/29 21:51:43 UTC

lucene-solr:branch_7_0: SOLR-10920: _default configset warning should not appear when using -n with create_collection

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7_0 f477473f4 -> cba8b237b


SOLR-10920: _default configset warning should not appear when using -n with create_collection


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

Branch: refs/heads/branch_7_0
Commit: cba8b237b4827971071e9050ae8fc970c6af4e0b
Parents: f477473
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Sun Jul 30 03:20:14 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Sun Jul 30 03:21:27 2017 +0530

----------------------------------------------------------------------
 solr/bin/solr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cba8b237/solr/bin/solr
----------------------------------------------------------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index 8e7c8d8..b970a81 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -978,7 +978,7 @@ if [[ "$SCRIPT_CMD" == "create" || "$SCRIPT_CMD" == "create_core" || "$SCRIPT_CM
     exit 1
   fi
 
-  if [ "$CREATE_CONFDIR" == "_default" ]; then
+  if [[ "$CREATE_CONFDIR" == "_default" ]] && ([[ "$CREATE_CONFNAME" == "" ]] || [[ "$CREATE_CONFNAME" == "_default" ]]); then
     echo "WARNING: Using _default configset. Data driven schema functionality is enabled by default, which is"
     echo "         NOT RECOMMENDED for production use."
     echo