Merge branch 'master' into style

bmarini · Apr 15, 2014 · 7da18a8 · 7da18a8
2 parents 32995e0 + 2e49f29
commit 7da18a8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,6 @@ rvm:
   - 2.1.1
 env:
   - CHEF_VERSION=10.32.2
-  - CHEF_VERSION=11.12.0
+  - CHEF_VERSION=11.12.2
 before_script:
   - chef-client --version