(maint) modulesync 65530a4 Update Travis

Related: puppetlabs/modulesync_configs#177
martin-schlossarek · Jan 3, 2018 · 4f6b5b2 · 4f6b5b2
1 parent 26dc6ff
commit 4f6b5b2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-#This file is generated by ModuleSync, do not edit.Z
+# This file is generated by ModuleSync, do not edit.
 *.iml
 .*.sw[op]
 .DS_Store

diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,6 @@ sudo: false
 language: ruby
 cache: bundler
 script: "bundle exec rake release_checks"
-#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
-before_install:
-  - gem update bundler
 matrix:
   fast_finish: true
   include:

diff --git a/Gemfile b/Gemfile
@@ -60,7 +60,6 @@ group :system_tests do
   gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
   gem "puppet-blacksmith", '~> 3.4',                                             :require => false
-  gem "beaker-task_helper"
 end
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

diff --git a/NOTICE b/NOTICE
@@ -1,6 +1,6 @@
 Puppet Module - puppetlabs-mysql
 
-Copyright 2017 Puppet, Inc.
+Copyright 2018 Puppet, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.