diff options
author | varac <varacanero@zeromail.org> | 2017-01-13 12:41:58 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2017-01-13 12:41:58 +0100 |
commit | 066c08f8362d53f0f30897cb8710d11260c726ea (patch) | |
tree | a6369eecd88bb731fe413d0bbc8af73d74d1f447 /.sync.yml | |
parent | 71123634744b9fe2ec7d6a3e38e9789fd84801e3 (diff) | |
parent | b65dd1f45d10e10e45455358aeabb29167990e2c (diff) |
Merge remote-tracking branch 'origin/master' into leap_master
Diffstat (limited to '.sync.yml')
-rw-r--r-- | .sync.yml | 23 |
1 files changed, 16 insertions, 7 deletions
@@ -1,9 +1,18 @@ --- -.travis.yml: - script: "\"bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--color --format documentation'\"" -Rakefile: - unmanaged: true -Gemfile: - unmanaged: true +.gitignore: + paths: + - '!spec/fixtures/' + - 'spec/fixtures/manifests/site.pp' + - 'spec/fixtures/modules/*' + spec/spec_helper.rb: - unmanaged: true + allow_deprecations: true + +.travis.yml: + extras: + - rvm: 2.1.9 + env: PUPPET_GEM_VERSION="~> 4.6.0" + bundler_args: --without system_tests + - rvm: 2.1.9 + env: PUPPET_GEM_VERSION="~> 4.7.0" + bundler_args: --without system_tests |