You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/17 22:09:52 UTC
[1/2] lucene-solr:branch_5_5: SOLR-9131: Fix "start solr" text in
cluster.vm Velocity template (cherry picked from commit 59e6e3b)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 c8a460c7c -> 41c77152b
refs/heads/branch_5x 889c15872 -> 04da75076
SOLR-9131: Fix "start solr" text in cluster.vm Velocity template
(cherry picked from commit 59e6e3b)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/41c77152
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/41c77152
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/41c77152
Branch: refs/heads/branch_5_5
Commit: 41c77152b97425f6c6bd86b32ba635c045d37ed8
Parents: c8a460c
Author: Jan H�ydahl <ja...@apache.org>
Authored: Thu May 19 14:04:16 2016 +0200
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 18:09:22 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../sample_techproducts_configs/conf/velocity/cluster.vm | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/41c77152/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bc0bb48..68f6d3a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -85,6 +85,8 @@ Other Changes
* SOLR-8967: In SolrCloud mode, under the 'Core Selector' dropdown in the UI the Replication tab won't be displayed
anymore. The Replication tab is only beneficial to users running Solr in master-slave mode. (Varun Thacker)
+* SOLR-9131: Fix "start solr" text in cluster.vm Velocity template (janhoy)
+
======================= 5.5.1 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/41c77152/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
index bfe2f3b..09885f3 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
@@ -9,7 +9,7 @@
## Div tag has placeholder text by default
<div id="clusters">
- Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see clustered search results.
+ Run Solr with option -Dsolr.clustering.enabled=true to see clustered search results.
</div>
## Replace the div content *if* Carrot^2 is available
[2/2] lucene-solr:branch_5x: SOLR-9131: Fix "start solr" text in
cluster.vm Velocity template (cherry picked from commit 59e6e3b)
Posted by sa...@apache.org.
SOLR-9131: Fix "start solr" text in cluster.vm Velocity template
(cherry picked from commit 59e6e3b)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/04da7507
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/04da7507
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/04da7507
Branch: refs/heads/branch_5x
Commit: 04da75076bfb7afbb9b781e4b6f8e64060afadc7
Parents: 889c158
Author: Jan H�ydahl <ja...@apache.org>
Authored: Thu May 19 14:04:16 2016 +0200
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 18:09:45 2016 -0400
----------------------------------------------------------------------
.../sample_techproducts_configs/conf/velocity/cluster.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04da7507/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
index bfe2f3b..09885f3 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
@@ -9,7 +9,7 @@
## Div tag has placeholder text by default
<div id="clusters">
- Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see clustered search results.
+ Run Solr with option -Dsolr.clustering.enabled=true to see clustered search results.
</div>
## Replace the div content *if* Carrot^2 is available