You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by ab...@apache.org on 2018/04/16 17:20:47 UTC

[07/46] lucene-solr:jira/solr-11833: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr


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

Branch: refs/heads/jira/solr-11833
Commit: 017f59bae5b6ee883d5284285713d26c09629de5
Parents: 0b1e8ef 11d54b0
Author: Karl Wright <Da...@gmail.com>
Authored: Thu Apr 12 06:39:56 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Thu Apr 12 06:39:56 2018 -0400

----------------------------------------------------------------------
 solr/CHANGES.txt                                |   7 +
 .../org/apache/solr/cloud/ElectionContext.java  |   3 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |   2 +-
 .../component/HttpShardHandlerFactory.java      | 165 +++++++++++++------
 .../solr/response/GraphMLResponseWriter.java    |  14 +-
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java   |  19 ++-
 .../component/TestHttpShardHandlerFactory.java  | 119 +++++++++++++
 .../src/distributed-requests.adoc               |  40 +++++
 .../shards-and-indexing-data-in-solrcloud.adoc  |   4 +
 .../apache/solr/common/params/CommonParams.java |   1 +
 .../apache/solr/common/params/ShardParams.java  |  12 ++
 .../client/solrj/impl/CloudSolrClientTest.java  | 143 ++++++++++++++--
 12 files changed, 449 insertions(+), 80 deletions(-)
----------------------------------------------------------------------