Revision 1638204

Jump to revision:
Author:	mikemccand
Date:	Tue Nov 11 16:21:15 2014 UTC (9 years, 5 months ago)
Changed paths:	81
Log Message:	LUCENE-6005: merge trunk

Changed paths

Path	Details
lucene/dev/branches/lucene6005/	modified , props changed
lucene/dev/branches/lucene6005/dev-tools/	modified , props changed
lucene/dev/branches/lucene6005/dev-tools/scripts/smokeTestRelease.py	modified , text changed
lucene/dev/branches/lucene6005/lucene/	modified , props changed
lucene/dev/branches/lucene6005/lucene/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene6005/lucene/codecs/	modified , props changed
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/	modified , props changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50CompoundReader.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/BaseDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/Directory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/FSLockFactory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/FileSwitchDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/FilterDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/LockFactory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/NoLockFactory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/AttributeImpl.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/CommandLineUtil.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestCrash.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestDoc.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/misc/	modified , props changed
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/store/RAFDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/store/WindowsDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/	modified , props changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/store/MockLockFactoryWrapper.java	deleted
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java	modified , text changed
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java	modified , text changed
lucene/dev/branches/lucene6005/solr/	modified , props changed
lucene/dev/branches/lucene6005/solr/CHANGES.txt	modified , text changed , props changed
lucene/dev/branches/lucene6005/solr/bin/	modified , props changed
lucene/dev/branches/lucene6005/solr/bin/solr	modified , text changed
lucene/dev/branches/lucene6005/solr/bin/solr.in.sh	modified , text changed
lucene/dev/branches/lucene6005/solr/common-build.xml	modified , text changed , props changed
lucene/dev/branches/lucene6005/solr/contrib/	modified , props changed
lucene/dev/branches/lucene6005/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/	modified , props changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/cloud/ZkController.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/RAMDirectoryFactory.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/StandardDirectoryFactory.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/handler/SnapPuller.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/handler/SnapShooter.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java	modified , text changed
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java	modified , text changed
lucene/dev/branches/lucene6005/solr/server/	modified , props changed
lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml	modified , text changed
lucene/dev/branches/lucene6005/solr/test-framework/	modified , props changed
lucene/dev/branches/lucene6005/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java	modified , text changed