lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctarg...@apache.org
Subject [4/4] lucene-solr:branch_7x: SOLR-11032: forgot to save merge conflict resolution...grrrrr
Date Thu, 26 Oct 2017 20:31:05 GMT
SOLR-11032: forgot to save merge conflict resolution...grrrrr


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

Branch: refs/heads/branch_7x
Commit: ca084ed40d0c53505a32a783df7adcf193564990
Parents: 405cb5e
Author: Cassandra Targett <ctargett@apache.org>
Authored: Thu Oct 26 15:27:49 2017 -0500
Committer: Cassandra Targett <ctargett@apache.org>
Committed: Thu Oct 26 15:30:50 2017 -0500

----------------------------------------------------------------------
 solr/solr-ref-guide/src/using-solrj.adoc | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ca084ed4/solr/solr-ref-guide/src/using-solrj.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/using-solrj.adoc b/solr/solr-ref-guide/src/using-solrj.adoc
index 5eea5b7..f3abaab 100644
--- a/solr/solr-ref-guide/src/using-solrj.adoc
+++ b/solr/solr-ref-guide/src/using-solrj.adoc
@@ -77,12 +77,7 @@ If you are worried about the SolrJ libraries expanding the size of your
client a
 
 For all its flexibility, SolrJ is built around a few simple interfaces.
 
-<<<<<<< ours
-. A URL with a path pointing to a specific core or collection (e.g., `http://hostname:8983/solr/core1`).
 When a core or collection is specified in the base URL, subsequent requests made with that
client are not required to re-specify the affected collection.  However, the client is limited
to sending requests to  that core/collection, and can not send requests to any others.
-. A URL with a generic path pointing to the root Solr path (e.g., `http://hostname:8983/solr`).
 When no core or collection is specified in the base URL, requests can be made to any core/collection,
but the affected core/collection must be specified on all requests.
-=======
 All requests to Solr are sent by a {solr-javadocs}/solr-solrj/org/apache/solr/client/solrj/SolrClient.html[`SolrClient`].
 SolrClient's are the main workhorses at the core of SolrJ.  They handle the work of connecting
to and communicating with Solr, and are where most of the user configuration happens.
->>>>>>> theirs
 
 Requests are sent in the form of {solr-javadocs}/solr-solrj/org/apache/solr/client/solrj/SolrRequest.html[`SolrRequests`],
and are returned as {solr-javadocs}/solr-solrj/org/apache/solr/client/solrj/SolrResponse.html[`SolrResponses`].
 


Mime
View raw message