Merge branch 'master' into 2.2.2

Conflicts: CHANGELOG.md
zuazo · Jul 29, 2015 · 43ce96c · 43ce96c
2 parents ba89e42 + b248aa1
commit 43ce96c
Show file tree

Hide file tree

Showing 4 changed files with 242 additions and 1,191 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 This file is used to list changes made in each version of `dovecot` cookbook.
 
-## v2.2.0 (2015-07-23)
+## v2.2.1 (2015-07-23)
 
 * Travis CI: Fix `test-kitchen` integration tests.
 

diff --git a/Gemfile b/Gemfile
@@ -33,7 +33,7 @@ group :integration do
 end
 
 group :integration_docker do
-  gem 'kitchen-docker', '~> 2.1'
+  gem 'kitchen-docker', '~> 2.1.0'
 end
 
 group :integration_vagrant do