Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sunspot/sunspot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: taktsoft/sunspot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 10, 2012

  1. Fix issue with rake sunspot:solr:run failing with JRUBY 1.7.0.preview2

    The upcomming jruby 1.7 release changes the behavior of Kernel#exec
    which leads the rake task sunspot:solr:run to fail with message "Error:
    Unable to access jarfile start.jar".
    After replacing Kernel#exec with Kernel#system the rake task works
    again.
    leh committed Aug 10, 2012
    Copy the full SHA
    78717a3 View commit details

Commits on May 22, 2013

  1. Copy the full SHA
    31c2920 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 sunspot_solr/lib/sunspot/solr/server.rb
2 changes: 1 addition & 1 deletion sunspot_solr/lib/sunspot/solr/server.rb
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@ def run
command << "-Djava.util.logging.config.file=#{logging_config_path}" if logging_config_path
command << '-jar' << File.basename(solr_jar)
FileUtils.cd(File.dirname(solr_jar)) do
exec(*command)
system(*command)
end
end