Skip to content

Commit

Permalink
Merge 0a494a4 into 03527b8
Browse files Browse the repository at this point in the history
  • Loading branch information
arlimus committed Dec 12, 2014
2 parents 03527b8 + 0a494a4 commit 0af073f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .kitchen.yml
Expand Up @@ -22,22 +22,22 @@ platforms:
driver_config:
box: opscode-centos-6.5
box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
# - name: oracle-6.4
# driver_config:
# box: oracle-6.4
# box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel64-64.box
- name: oracle-6.4
driver_config:
box: oracle-6.4
box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel64-64.box
- name: oracle-6.5
driver_config:
box: oracle-6.5
box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel65-64.box
- name: debian-6
driver_config:
box: debian-6
box_url: https://googledrive.com/host/0B83ZToJ3fGtDeE9KWm1sWndZdGs/debian-6.0.10-amd64_virtualbox.box
box_url: https://s3.eu-central-1.amazonaws.com/ffuenf-vagrantboxes/debian/debian-6.0.10-amd64_virtualbox.box
- name: debian-7
driver_config:
box: debian-7
box_url: https://googledrive.com/host/0B83ZToJ3fGtDVC1DeVVzc3lkc0U/debian-7.6.0-amd64_virtualbox.box
box_url: https://s3.eu-central-1.amazonaws.com/ffuenf-vagrantboxes/debian/debian-7.7.0-amd64_virtualbox.box
suites:
- name: default
run_list:
Expand Down
15 changes: 9 additions & 6 deletions .rubocop.yml
@@ -1,11 +1,10 @@
---
AllCops:
Exclude:
- vendor/**/*
- metadata.rb
- '**/Puppetfile'
- Puppetfile
- test/**/*

- vendor/**/*
- test/**/*
- metadata.rb
- Berksfile
Documentation:
Enabled: false
AlignParameters:
Expand All @@ -16,6 +15,8 @@ HashSyntax:
Enabled: true
LineLength:
Enabled: false
EmptyLinesAroundBlockBody:
Enabled: false
MethodLength:
Max: 40
NumericLiterals:
Expand All @@ -24,3 +25,5 @@ Metrics/CyclomaticComplexity:
Max: 10
Metrics/PerceivedComplexity:
Max: 10
Metrics/AbcSize:
Max: 29

0 comments on commit 0af073f

Please sign in to comment.