You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/08/21 06:48:27 UTC

[11/11] lucene-solr:feature/autoscaling_72: Merge branch 'feature/autoscaling' into feature/autoscaling_72

Merge branch 'feature/autoscaling' into feature/autoscaling_72


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

Branch: refs/heads/feature/autoscaling_72
Commit: 863e48a850aecfded2c5e1a5c7e427b4eb5d056d
Parents: b21adad ac98e89
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Mon Aug 21 12:17:59 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Mon Aug 21 12:17:59 2017 +0530

----------------------------------------------------------------------
 dev-tools/scripts/smokeTestRelease.py           |   2 +-
 lucene/ivy-versions.properties                  |   3 +-
 .../org/apache/lucene/spatial3d/Geo3DUtil.java  |   4 +-
 .../lucene/spatial3d/geom/BasePlanetObject.java |   4 +-
 .../lucene/spatial3d/geom/GeoBaseAreaShape.java |   3 +
 .../geom/GeoBaseCompositeAreaShape.java         |   6 +-
 .../geom/GeoBaseCompositeMembershipShape.java   |   3 +-
 .../spatial3d/geom/GeoBaseCompositeShape.java   |  12 +-
 .../spatial3d/geom/GeoCompositeAreaShape.java   |  10 +-
 .../geom/GeoCompositeMembershipShape.java       |  10 +-
 .../spatial3d/geom/GeoCompositePolygon.java     |  10 +-
 .../spatial3d/geom/GeoDegeneratePoint.java      |   5 +
 .../spatial3d/geom/GeoPolygonFactory.java       |   8 +-
 .../apache/lucene/spatial3d/geom/GeoShape.java  |   2 +-
 .../lucene/spatial3d/geom/PlanetObject.java     |  29 ++
 .../apache/lucene/spatial3d/geom/XYZSolid.java  |   2 +-
 .../CompositeGeoPolygonRelationshipsTest.java   |   2 +-
 .../apache/lucene/spatial3d/geom/Geo3DUtil.java |   4 +-
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |   6 +-
 .../spatial3d/geom/RandomGeoShapeGenerator.java |   2 +-
 .../geom/SimpleGeoPolygonRelationshipsTest.java |   2 +-
 .../lucene/index/AssertingLeafReader.java       |   2 +
 solr/CHANGES.txt                                |  17 +-
 solr/core/ivy.xml                               |   1 +
 .../solr/handler/component/TermsComponent.java  | 108 ++++-
 .../org/apache/solr/search/PointMerger.java     | 454 +++++++++++++++++++
 .../org/apache/solr/servlet/BaseSolrFilter.java |   3 -
 .../apache/solr/servlet/BaseSolrServlet.java    |   3 -
 .../processor/UpdateRequestProcessorChain.java  |   5 +-
 .../org/apache/solr/util/Java9InitHack.java     |  78 ----
 .../solr/collection1/conf/schema12.xml          |   6 +-
 .../handler/component/TermsComponentTest.java   | 151 ++++--
 .../AtomicUpdateProcessorFactoryTest.java       |  53 +--
 solr/licenses/hadoop-annotations-2.7.2.jar.sha1 |   1 -
 solr/licenses/hadoop-annotations-2.7.4.jar.sha1 |   1 +
 solr/licenses/hadoop-auth-2.7.2.jar.sha1        |   1 -
 solr/licenses/hadoop-auth-2.7.4.jar.sha1        |   1 +
 .../licenses/hadoop-common-2.7.2-tests.jar.sha1 |   1 -
 solr/licenses/hadoop-common-2.7.2.jar.sha1      |   1 -
 .../licenses/hadoop-common-2.7.4-tests.jar.sha1 |   1 +
 solr/licenses/hadoop-common-2.7.4.jar.sha1      |   1 +
 solr/licenses/hadoop-hdfs-2.7.2-tests.jar.sha1  |   1 -
 solr/licenses/hadoop-hdfs-2.7.2.jar.sha1        |   1 -
 solr/licenses/hadoop-hdfs-2.7.4-tests.jar.sha1  |   1 +
 solr/licenses/hadoop-hdfs-2.7.4.jar.sha1        |   1 +
 solr/licenses/hadoop-minikdc-2.7.2.jar.sha1     |   1 -
 solr/licenses/hadoop-minikdc-2.7.4.jar.sha1     |   1 +
 solr/licenses/jetty-sslengine-6.1.26.jar.sha1   |   1 +
 solr/server/etc/jetty.xml                       |   8 +
 solr/solr-ref-guide/src/v2-api.adoc             |  42 +-
 .../solr/client/solrj/impl/HttpSolrClient.java  |   2 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   6 -
 .../apache/solr/util/BadHdfsThreadsFilter.java  |   2 +
 53 files changed, 857 insertions(+), 228 deletions(-)
----------------------------------------------------------------------