Revision 1683615

Jump to revision:
Author:	mikemccand
Date:	Thu Jun 4 19:24:05 2015 UTC (8 years, 10 months ago)
Changed paths:	307 (showing only 100; show all)
Log Message:	LUCENE-6481: merge trunk

Changed paths

Path	Details
lucene/dev/branches/LUCENE-6481/	modified , props changed
lucene/dev/branches/LUCENE-6481/dev-tools/	modified , props changed
lucene/dev/branches/LUCENE-6481/dev-tools/idea/.idea/codeStyleSettings.xml (Copied from lucene/dev/trunk/dev-tools/idea/.idea/codeStyleSettings.xml, r1683613)	added
lucene/dev/branches/LUCENE-6481/dev-tools/maven/solr/core/src/test/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE-6481/dev-tools/scripts/checkJavaDocs.py	modified , text changed
lucene/dev/branches/LUCENE-6481/dev-tools/scripts/createPatch.py	modified , text changed
lucene/dev/branches/LUCENE-6481/dev-tools/scripts/smokeTestRelease.py	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/	modified , props changed
lucene/dev/branches/LUCENE-6481/lucene/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/LUCENE-6481/lucene/codecs/	modified , props changed
lucene/dev/branches/LUCENE-6481/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/common-build.xml	modified , text changed , props changed
lucene/dev/branches/LUCENE-6481/lucene/core/	modified , props changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50CompoundReader.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/ParallelCompositeReader.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/index/SleepingLockWrapper.java (Copied from lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SleepingLockWrapper.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanSimilarity.java	deleted
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/BaseDirectory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/Directory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/FSLockFactory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/FileSwitchDirectory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/FilterDirectory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/Lock.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/LockFactory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/LockObtainFailedException.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/LockValidatingDirectoryWrapper.java (Copied from lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/LockValidatingDirectoryWrapper.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/NoLockFactory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/java/org/apache/lucene/util/fst/Util.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java	deleted
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/index/TestSleepingLockWrapper.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSleepingLockWrapper.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/store/TestLock.java	deleted
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSLockFactory.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSLockFactory.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java (Copied from lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/facet/	modified , props changed
lucene/dev/branches/LUCENE-6481/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/highlighter/	modified , props changed
lucene/dev/branches/LUCENE-6481/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIterator.java (Copied from lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIterator.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestCustomSeparatorBreakIterator.java (Copied from lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestCustomSeparatorBreakIterator.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestWholeBreakIterator.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/sandbox/	modified , props changed
lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/java/org/apache/lucene/bkdtree/ (Copied from lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/bkdtree, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (Copied from lucene/dev/trunk/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/sandbox/src/test/org/apache/lucene/bkdtree/ (Copied from lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/bkdtree, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/spatial/	modified , props changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/Geo3dShape.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/Bounds.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoAreaFactory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBoxBase.java	deleted
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBBoxFactory.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseBBox.java (Copied from lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseBBox.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseExtendedShape.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseShape.java (Copied from lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoBaseShape.java, r1683613)	added
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoCircle.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoConvexPolygon.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateHorizontalLine.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateLatitudeZone.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateLongitudeSlice.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegeneratePoint.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoDegenerateVerticalLine.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoLatitudeZone.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoLongitudeSlice.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoNorthLatitudeZone.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoNorthRectangle.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPath.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPoint.java	modified , text changed
lucene/dev/branches/LUCENE-6481/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/geo3d/GeoPolygonFactory.java	modified , text changed
[...]