You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2020/10/09 17:34:03 UTC

[lucene-solr] branch branch_8x updated: Ref Guide: fix leftover merge conflict markers that broke the ref guide build

This is an automated email from the ASF dual-hosted git repository.

ctargett pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new a26f869  Ref Guide: fix leftover merge conflict markers that broke the ref guide build
a26f869 is described below

commit a26f8697f37284b07a300afb8cfa3dcd58a99c04
Author: Cassandra Targett <ca...@lucidworks.com>
AuthorDate: Fri Oct 9 12:32:53 2020 -0500

    Ref Guide: fix leftover merge conflict markers that broke the ref guide build
---
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/solr/solr-ref-guide/src/solr-upgrade-notes.adoc b/solr/solr-ref-guide/src/solr-upgrade-notes.adoc
index 2a2393e..e328dda 100644
--- a/solr/solr-ref-guide/src/solr-upgrade-notes.adoc
+++ b/solr/solr-ref-guide/src/solr-upgrade-notes.adoc
@@ -118,15 +118,11 @@ If your cluster is running 8.6.0 and *not using an explicit autoscaling policy*,
 +
 Replace `localhost:8983` with your Solr endpoint.
 +
-```
+[source,text]
 curl -X POST -H 'Content-type:application/json'  -d '{set-cluster-policy : [], set-cluster-preferences : []}' http://localhost:8983/api/cluster/autoscaling
-```
 +
-<<<<<<< HEAD
 For more details on autoscaling policies, see the section <<solrcloud-autoscaling-overview.adoc#cluster-policy,Cluster Policy>>.
 +
-=======
->>>>>>> 7b1663e97ad... Ref Guide: update for 8.7 release notes; bring notes from 8.6.1 forward to keep branch_8x and master at least sort of in sync
 This information is only relevant for users upgrading from 8.6.0. If upgrading from an earlier version to 8.6.1+, this warning can be ignored.
 
 === Solr 8.6