You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/12/06 01:24:05 UTC
svn commit: r1417712 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/test-files/solr/collection1/conf/solrconfig.xml solr/example/
solr/example/solr/collection1/conf/solrconfig.xml
Author: markrmiller
Date: Thu Dec 6 00:24:04 2012
New Revision: 1417712
URL: http://svn.apache.org/viewvc?rev=1417712&view=rev
Log:
SOLR-4062: The update log location in solrconfig.xml should default to ${solr.ulog.dir} rather than ${solr.data.dir:}
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1417712&r1=1417711&r2=1417712&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu Dec 6 00:24:04 2012
@@ -308,6 +308,9 @@ Other Changes
* SOLR-4074: Raise default ramBufferSizeMB to 100 from 32.
(yonik, Mark Miller)
+* SOLR-4062: The update log location in solrconfig.xml should default to
+ ${solr.ulog.dir} rather than ${solr.data.dir:} (Mark Miller)
+
================== 4.0.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1417712&r1=1417711&r2=1417712&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml Thu Dec 6 00:24:04 2012
@@ -90,7 +90,7 @@
-->
<updateLog enable="${enable.update.log:false}">
- <str name="dir">${solr.data.dir:}</str>
+ <str name="dir">${solr.ulog.dir:}</str>
</updateLog>
</updateHandler>
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml?rev=1417712&r1=1417711&r2=1417712&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml Thu Dec 6 00:24:04 2012
@@ -374,7 +374,7 @@
"dir" - the target directory for transaction logs, defaults to the
solr data directory. -->
<updateLog>
- <str name="dir">${solr.data.dir:}</str>
+ <str name="dir">${solr.ulog.dir:}</str>
</updateLog>