summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jacob <adam@opscode.com>2010-02-26 15:43:49 -0800
committerAdam Jacob <adam@opscode.com>2010-02-26 15:43:49 -0800
commitd7fe6a060a3835e70d4a06d083d7e2da869af5f0 (patch)
treea94bf6ab117d9712b0660c49c6ef3e80eeb7d9a9
parentdbdf70214cc0bbaa0bb3fa3f3b771f6fc55619c8 (diff)
parent82224a8a233ea8ec1b3a33d1b3d2a92af8d3a38a (diff)
downloadchef-d7fe6a060a3835e70d4a06d083d7e2da869af5f0.tar.gz
Merge branch 'CHEF-984' of git://github.com/tfheen/chef into tfheen/CHEF-984
-rw-r--r--chef-solr/lib/chef/solr/application/solr.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/chef-solr/lib/chef/solr/application/solr.rb b/chef-solr/lib/chef/solr/application/solr.rb
index 64e0258c01..bb68fbec1b 100644
--- a/chef-solr/lib/chef/solr/application/solr.rb
+++ b/chef-solr/lib/chef/solr/application/solr.rb
@@ -150,7 +150,7 @@ class Chef
end
Dir.chdir(Chef::Config[:solr_jetty_path]) do
command = "java -Xmx#{Chef::Config[:solr_heap_size]} -Xms#{Chef::Config[:solr_heap_size]}"
- command << " -Dsolr.solr.data=#{Chef::Config[:solr_data_path]}"
+ command << " -Dsolr.data.dir=#{Chef::Config[:solr_data_path]}"
command << " -Dsolr.solr.home=#{Chef::Config[:solr_home_path]}"
command << " #{Chef::Config[:solr_java_opts]}" if Chef::Config[:solr_java_opts]
command << " -jar #{File.join(Chef::Config[:solr_jetty_path], 'start.jar')}"