Merge pull request #281 from puppetlabs/msync_MODULES-6339

(maint) modulesync 65530a4 Update Travis
2018-01-05 15:50:32 +00:00
parent 61c8794661 9c103a2219
commit c8ce18949b
3 changed files with 2 additions and 5 deletions
--- 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
--- 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:
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 Puppet Module - puppetlabs-java

-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.