You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2016/04/14 01:22:03 UTC
[47/50] lucene-solr:jira/SOLR-8908: 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/e4dcf423
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e4dcf423
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e4dcf423
Branch: refs/heads/jira/SOLR-8908
Commit: e4dcf423e33b0bc139bfad9e2490bf8b33997d30
Parents: 6e5ec3b fc19c99
Author: Karl Wright <Da...@gmail.com>
Authored: Wed Apr 13 16:15:53 2016 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Wed Apr 13 16:15:53 2016 -0400
----------------------------------------------------------------------
.../lucene/classification/classification.iml | 2 +
lucene/CHANGES.txt | 9 +-
.../xml/builders/BooleanQueryBuilder.java | 3 +-
.../builders/DisjunctionMaxQueryBuilder.java | 3 +-
.../xml/builders/FuzzyLikeThisQueryBuilder.java | 3 +-
.../org/apache/lucene/document/LatLonGrid.java | 10 +-
.../document/LatLonPointDistanceQuery.java | 79 ++----
.../apache/lucene/document/TestLatLonGrid.java | 53 +++-
.../prefix/IntersectsPrefixTreeQuery.java | 13 +-
.../java/org/apache/lucene/geo/GeoTestUtil.java | 85 +++++++
solr/CHANGES.txt | 10 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 18 +-
.../apache/solr/cloud/TestStressLiveNodes.java | 252 +++++++++++++++++++
.../solr/cloud/overseer/ZkStateReaderTest.java | 4 +-
.../solr/search/AnalyticsMergeStrategyTest.java | 5 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 65 ++++-
.../solrj/request/CollectionAdminRequest.java | 61 +++++
.../apache/solr/common/cloud/ZkStateReader.java | 85 ++++---
.../impl/ConcurrentUpdateSolrClientTest.java | 78 +++++-
19 files changed, 711 insertions(+), 127 deletions(-)
----------------------------------------------------------------------