Skip to content

Commit

Permalink
Merge branch 'master' into simplify_server_db_in_jruby
Browse files Browse the repository at this point in the history
  • Loading branch information
cheerfulstoic committed Dec 24, 2015
2 parents 7352ba4 + c9e5f87 commit 5dfc730
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
script:
- "bundle exec rubocop"
- "export JRUBY_OPTS='-X+O -J-Djruby.launch.inproc=false -J-Xmx1024m -J-XX:MaxPermSize=2048m' && bundle exec travis_retry rake neo4j:install[$NEO4J_VERSION] neo4j:disable_auth neo4j:start --trace && rspec --tag $RSPEC_TAGS"
- "export JRUBY_OPTS='-X+O -J-Djruby.launch.inproc=false -J-Xmx1024m -J-XX:MaxPermSize=2048m' && travis_retry bundle exec rake neo4j:install[$NEO4J_VERSION] neo4j:disable_auth neo4j:start --trace && rspec --tag $RSPEC_TAGS"
language: ruby
rvm:
- 2.2.3
Expand Down

0 comments on commit 5dfc730

Please sign in to comment.