Merge pull request voxpupuli#239 from bastelfreak/tests

revert eff8dad2 - dont update bundler during travis runs
Rovanion · Jul 22, 2018 · ad74e23 · ad74e23
2 parents 79939c3 + 91a1d6c
commit ad74e23
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,8 @@ sudo: false
 dist: trusty
 language: ruby
 cache: bundler
-# related to https://github.com/rubygems/rubygems/issues/2123
 before_install:
   - 'rm -f Gemfile.lock'
-  - 'gem update --system'
-  - 'gem install bundler'
 script:
   - 'bundle exec rake $CHECK'
 matrix:

diff --git a/templates/prometheus.debian.erb b/templates/prometheus.debian.erb
@@ -139,7 +139,7 @@ case "$1" in
     #do_reload
     #log_end_msg $?
     #;;
-  restart|force-reload)
+  restart|reload|force-reload)
     #
     # If the "reload" option is implemented then remove the
     # 'force-reload' alias