Merge remote-tracking branch 'upstream/master'

sunspot · Jan 2, 2018 · 8a174cf · 8a174cf
2 parents 7ed1f21 + c4cc039
commit 8a174cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -927,7 +927,7 @@ search = Post.search do
  end
 end
 
-search.stats(:average_rating).facet(:featured).rows do |row|
+search.stats(:average_rating).facet(:featured).rows.each do |row|
  puts "Minimum average rating for featured=#{row.value}: #{row.min}"
 end
 ```

diff --git a/sunspot_solr/solr/solr/configsets/sunspot/conf/solrconfig.xml b/sunspot_solr/solr/solr/configsets/sunspot/conf/solrconfig.xml
@@ -541,13 +541,13 @@
  <!-- change field to textSpell and use copyField in schema.xml
  to spellcheck multiple fields -->
  <str name="field">textSpell</str>
- <str name="buildOnCommit">true</str>
+ <str name="buildOnOptimize">true</str>
  </lst>
 
  <lst name="spellchecker">
  <str name="name">example</str>
  <str name="field">title_text</str>
- <str name="buildOnCommit">true</str>
+ <str name="buildOnOptimize">true</str>
  <str name="classname">solr.DirectSolrSpellChecker</str>
  <!-- the spellcheck distance measure used, the default is the internal levenshtein -->
  <str name="distanceMeasure">internal</str>