/[Apache-SVN]
ViewVC logotype

Revision 1131275


Jump to revision: Previous Next
Author: simonw
Date: Fri Jun 3 22:40:42 2011 UTC (13 years, 5 months ago)
Changed paths: 63
Log Message:
fixed several merge problems

Changed paths

Path Details
Directorylucene/dev/branches/docvalues/ modified , props changed
Directorylucene/dev/branches/docvalues/dev-tools/idea/lucene/contrib/ modified , props changed
Directorylucene/dev/branches/docvalues/dev-tools/scripts/poll-mirrors.pl modified , text changed
Directorylucene/dev/branches/docvalues/lucene/ modified , props changed
Directorylucene/dev/branches/docvalues/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java modified , props changed
Directorylucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java modified , props changed
Directorylucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/TermsHashPerField.java modified , text changed
Directorylucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/AllGroupsCollector.java deleted
Directorylucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java modified , text changed
Directorylucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/FirstPassGroupingCollector.java deleted
Directorylucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/SecondPassGroupingCollector.java deleted
Directorylucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/TermFirstPassGroupingCollector.java modified , text changed
Directorylucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/TermSecondPassGroupingCollector.java modified , text changed
Directorylucene/dev/branches/docvalues/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java deleted
Directorylucene/dev/branches/docvalues/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java
(Copied from lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java, r1131267)
added
Directorylucene/dev/branches/docvalues/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/ modified , props changed
Directorylucene/dev/branches/docvalues/solr/CHANGES.txt modified , text changed , props changed
Directorylucene/dev/branches/docvalues/solr/LICENSE.txt modified , props changed
Directorylucene/dev/branches/docvalues/solr/NOTICE.txt modified , props changed
Directorylucene/dev/branches/docvalues/solr/README.txt modified , props changed
Directorylucene/dev/branches/docvalues/solr/build.xml modified , props changed
Directorylucene/dev/branches/docvalues/solr/client/ modified , props changed
Directorylucene/dev/branches/docvalues/solr/common-build.xml modified , props changed
Directorylucene/dev/branches/docvalues/solr/contrib/ modified , props changed
Directorylucene/dev/branches/docvalues/solr/example/ modified , props changed
Directorylucene/dev/branches/docvalues/solr/example/solr/conf/admin-extra.menu-bottom.html
(Copied from lucene/dev/trunk/solr/example/solr/conf/admin-extra.menu-bottom.html, r1131267)
added
Directorylucene/dev/branches/docvalues/solr/example/solr/conf/admin-extra.menu-top.html
(Copied from lucene/dev/trunk/solr/example/solr/conf/admin-extra.menu-top.html, r1131267)
added
Directorylucene/dev/branches/docvalues/solr/lib/ modified , props changed
Directorylucene/dev/branches/docvalues/solr/site/ modified , props changed
Directorylucene/dev/branches/docvalues/solr/src/ modified , props changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/schema/BoolField.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/FunctionQParser.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/MutableValueBool.java
(Copied from lucene/dev/trunk/solr/src/java/org/apache/solr/search/MutableValueBool.java, r1131267)
added
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/ValueSourceParser.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/BoolDocValues.java
(Copied from lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolDocValues.java, r1131267)
added
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/BoolFunction.java
(Copied from lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/BoolFunction.java, r1131267)
added
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/ConstNumberSource.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/ConstValueSource.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/DefFunction.java
(Copied from lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/DefFunction.java, r1131267)
added
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/DocValues.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/IfFunction.java
(Copied from lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/IfFunction.java, r1131267)
added
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/LongDocValues.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java
(Copied from lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiBoolFunction.java, r1131267)
added
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/MultiFunction.java
(Copied from lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/MultiFunction.java, r1131267)
added
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java
(Copied from lucene/dev/trunk/solr/src/java/org/apache/solr/search/function/SimpleBoolFunction.java, r1131267)
added
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/StrDocValues.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/TestQueryTypes.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/webapp/web/css/screen.css modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/webapp/web/index.jsp modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/webapp/web/js/script.js modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/webapp/web/tpl/analysis.html modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/webapp/web/tpl/cores.html modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/webapp/web/tpl/dashboard.html modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/webapp/web/tpl/schema-browser.html modified , text changed
Directorylucene/dev/branches/docvalues/solr/src/webapp/web/tpl/schema-browser_field.html deleted
Directorylucene/dev/branches/docvalues/solr/src/webapp/web/tpl/schema-browser_index.html deleted
Directorylucene/dev/branches/docvalues/solr/testlogging.properties modified , props changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26