lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thelabd...@apache.org
Subject lucene-solr:branch_6x: SOLR-9007: remove mention of managed_schema_configs
Date Mon, 18 Apr 2016 17:56:27 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 90debd8d2 -> 57270a5fb


SOLR-9007: remove mention of managed_schema_configs


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

Branch: refs/heads/branch_6x
Commit: 57270a5fb509551ac99cb2a2f77fa5237e1565a9
Parents: 90debd8
Author: Timothy Potter <thelabdude@gmail.com>
Authored: Mon Apr 18 11:32:04 2016 -0600
Committer: Timothy Potter <thelabdude@gmail.com>
Committed: Mon Apr 18 11:49:42 2016 -0600

----------------------------------------------------------------------
 solr/CHANGES.txt                                     | 3 +++
 solr/core/src/java/org/apache/solr/util/SolrCLI.java | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/57270a5f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 925e62e..662db95 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -610,6 +610,9 @@ Bug Fixes
 * SOLR-8908: Fix to OnReconnect listener registration to allow listeners to deregister, such
   as when a core is reloaded or deleted to avoid a memory leak. (Timothy Potter)
 
+* SOLR-9007: Remove mention of the managed_schema_configs as valid config directory when
creating
+  the collection for the SolrCloud example. (Timothy Potter)
+
 ======================= 5.5.0 =======================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/57270a5f/solr/core/src/java/org/apache/solr/util/SolrCLI.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
index 75a39b2..185e162 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2638,14 +2638,13 @@ public class SolrCLI {
             "How many replicas per shard would you like to create? [2] ", "a replication
factor", 2, 1, 4);
 
         echo("Please choose a configuration for the "+collectionName+" collection, available
options are:");
-        cloudConfig =
-            prompt(readInput, "basic_configs, data_driven_schema_configs, sample_techproducts_configs,
or managed_schema_configs ["+cloudConfig+"] ", cloudConfig);
+        String validConfigs = "basic_configs, data_driven_schema_configs, or sample_techproducts_configs
["+cloudConfig+"] ";
+        cloudConfig = prompt(readInput, validConfigs, cloudConfig);
 
         // validate the cloudConfig name
         while (!isValidConfig(configsetsDir, cloudConfig)) {
           echo(cloudConfig+" is not a valid configuration directory! Please choose a configuration
for the "+collectionName+" collection, available options are:");
-          cloudConfig =
-              prompt(readInput, "basic_configs, data_driven_schema_configs, sample_techproducts_configs,
or managed_schema_configs ["+cloudConfig+"] ", cloudConfig);
+          cloudConfig = prompt(readInput, validConfigs, cloudConfig);
         }
       } else {
         // must verify if default collection exists


Mime
View raw message