svn commit: r1034961 [2/2] - in /lucene/dev/branches/docvalues: ./ lucene/ lucene/contrib/ lucene/contrib/highlighter/src/test/ lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/ lucene/src/java/org/apache/lucene/analysis/ lucen...

[si...@apache.org]

Propchange: lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 14 09:18:18 2010
@@ -1,5 +1,5 @@
 /lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:949730,961612,979161,980654,982195,987811,988512,1025544,1026614,1034080
 /lucene/dev/branches/preflexfixes/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:967125-979432
-/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:1021634-1034284
+/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:1021634-1034959
 /lucene/solr/branches/newtrunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:924462
 /lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-925091

Propchange: lucene/dev/branches/docvalues/solr/testlogging.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 14 09:18:18 2010
@@ -1,6 +1,6 @@
 /lucene/dev/branches/branch_3x/solr/testlogging.properties:949730,961612,979161,980654,982195,987811,988512
 /lucene/dev/branches/preflexfixes/solr/testlogging.properties:967125-979432
-/lucene/dev/trunk/solr/testlogging.properties:1021634-1034284
+/lucene/dev/trunk/solr/testlogging.properties:1021634-1034959
 /lucene/java/branches/lucene_2_4/solr/testlogging.properties:748824
 /lucene/java/branches/lucene_2_9/solr/testlogging.properties:817269-818600,825998,829134,829881,831036,896850,909334
 /lucene/java/branches/lucene_2_9_back_compat_tests/solr/testlogging.properties:818601-821336