svn commit: r1389666 - in /lucene/dev/branches/lucene_solr_4_0: ./ dev-tools/ lucene/ lucene/analysis/ lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/ lucene/benchmark/ lucene/codecs/ lucene/core/ lucene/core/src/test/org/ap...

[ho...@apache.org]

Author: hossman
Date: Tue Sep 25 00:48:03 2012
New Revision: 1389666

URL: http://svn.apache.org/viewvc?rev=1389666&view=rev
Log:
SOLR-3880: delete debug info, merge r1389614 from 4x

Modified:
    lucene/dev/branches/lucene_solr_4_0/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/dev-tools/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/BUILD.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/CHANGES.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/JRE_VERSION_MIGRATION.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/LICENSE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/MIGRATE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/README.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/analysis/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/backwards/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/benchmark/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/codecs/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/common-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/demo/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/facet/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/grouping/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/highlighter/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/ivy-settings.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/join/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/licenses/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/memory/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/misc/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/module-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/queries/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/queryparser/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/sandbox/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/site/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/spatial/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/suggest/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/test-framework/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/lucene/tools/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/LICENSE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/README.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/cloud-dev/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/common-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/contrib/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/dev-tools/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/example/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/example/solr/collection1/conf/velocity/product-doc.vm
    lucene/dev/branches/lucene_solr_4_0/solr/licenses/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpclient-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpclient-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpcore-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpcore-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpmime-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpmime-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/scripts/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/site/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/solrj/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/test-framework/   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/testlogging.properties   (props changed)
    lucene/dev/branches/lucene_solr_4_0/solr/webapp/   (props changed)

Modified: lucene/dev/branches/lucene_solr_4_0/solr/example/solr/collection1/conf/velocity/product-doc.vm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/example/solr/collection1/conf/velocity/product-doc.vm?rev=1389666&r1=1389665&r2=1389666&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/example/solr/collection1/conf/velocity/product-doc.vm (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/example/solr/collection1/conf/velocity/product-doc.vm Tue Sep 25 00:48:03 2012
@@ -6,7 +6,6 @@
 <div>Price: #field('price_c')</div>
 <div>Features: #field('features')</div>
 <div>In Stock: #field('inStock')</div>
-<div>jEOE: #field('cat')</div>
 <div class="mlt">
   #set($mlt = $mltResults.get($docId))
   #set($mltOn = $params.getBool('mlt'))