af97b8ea3cf1a6e4752a2cd0c859092949fd27c1 - lucene

commit	af97b8ea3cf1a6e4752a2cd0c859092949fd27c1	[log] [tgz]
author	Michael McCandless <mikemccand@apache.org>	Mon Aug 22 22:54:26 2011 +0000
committer	Michael McCandless <mikemccand@apache.org>	Mon Aug 22 22:54:26 2011 +0000
tree	b7f2dfd0f79c01c3f0195c90b956c856f9515806
parent	f3028ad9d30cac84d5bfdbd55038afb01dc3e82d [diff]

LUCENE-2308: more merging/fixing

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/fieldtype_conflicted@1160484 13f79535-47bb-0310-9956-ffa450edef68

lucene/contrib/CHANGES.txt[diff]
lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java[diff]
lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelectorVisitor.java[diff]
lucene/contrib/misc/src/java/org/apache/lucene/document/LoadFirstFieldSelector.java[diff]
lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java[diff]
lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribFieldsReader.java[diff]
lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribIndexReader.java[diff]
lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java[diff]
lucene/src/java/org/apache/lucene/document/BinaryField.java[diff]
lucene/src/java/org/apache/lucene/document/CompressionTools.java[diff]
lucene/src/java/org/apache/lucene/document/Document.java[diff]
lucene/src/java/org/apache/lucene/document/Field.java[diff]
lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java[diff]
lucene/src/java/org/apache/lucene/document/StringField.java[diff]
lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java[diff]
lucene/src/java/org/apache/lucene/index/DocInverterPerField.java[diff]
lucene/src/java/org/apache/lucene/index/DocumentStoredFieldVisitor.java[diff]
lucene/src/java/org/apache/lucene/index/FieldsWriter.java[diff]
lucene/src/java/org/apache/lucene/index/IndexableField.java[diff]
lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java[diff]
lucene/src/java/org/apache/lucene/index/values/IntsImpl.java[diff]
lucene/src/java/org/apache/lucene/index/values/PerDocFieldValues.java[diff]
lucene/src/test-framework/org/apache/lucene/index/DocHelper.java[diff]
lucene/src/test-framework/org/apache/lucene/index/RandomIndexWriter.java[diff]
lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java[diff]
lucene/src/test/org/apache/lucene/document/TestDocument.java[diff]
lucene/src/test/org/apache/lucene/index/TestIndexReader.java[diff]
lucene/src/test/org/apache/lucene/index/TestIndexWriter.java[diff]
lucene/src/test/org/apache/lucene/index/TestIndexableField.java[diff]
lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java[diff]
lucene/src/test/org/apache/lucene/index/TestStressNRT.java[diff]
lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java[diff]
lucene/src/test/org/apache/lucene/search/TestDocBoost.java[diff]
lucene/src/test/org/apache/lucene/search/TestSort.java[diff]
modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java[diff]
solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java[diff]
solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java[diff]
solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java[diff]
solr/core/src/java/org/apache/solr/schema/BinaryField.java[diff]
solr/core/src/java/org/apache/solr/schema/LatLonType.java[diff]
solr/core/src/java/org/apache/solr/schema/PointType.java[diff]
solr/core/src/java/org/apache/solr/schema/TrieField.java[diff]
solr/core/src/java/org/apache/solr/update/DocumentBuilder.java[diff]
solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java[diff]
solr/core/src/test/org/apache/solr/search/TestSort.java[diff]
solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java[diff]

47 files changed

tree: b7f2dfd0f79c01c3f0195c90b956c856f9515806

dev-tools/
lucene/
modules/
solr/
.gitignore
.hgignore
build.xml
README.txt