Merge branch 'master' into 3.2.1

Conflicts: metadata.rb
zuazo · Mar 10, 2017 · ddaffbb · ddaffbb
2 parents 213f676 + 9bfc4d7
commit ddaffbb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Dovecot Cookbook
 [![Cookbook Version](https://img.shields.io/cookbook/v/dovecot.svg?style=flat)](https://supermarket.chef.io/cookbooks/dovecot)
 [![Dependency Status](http://img.shields.io/gemnasium/zuazo/dovecot-cookbook.svg?style=flat)](https://gemnasium.com/zuazo/dovecot-cookbook)
 [![Code Climate](http://img.shields.io/codeclimate/github/zuazo/dovecot-cookbook.svg?style=flat)](https://codeclimate.com/github/zuazo/dovecot-cookbook)
-[![Build Status](http://img.shields.io/travis/zuazo/dovecot-cookbook/3.2.0.svg?style=flat)](https://travis-ci.org/zuazo/dovecot-cookbook)
+[![Build Status](http://img.shields.io/travis/zuazo/dovecot-cookbook.svg?style=flat)](https://travis-ci.org/zuazo/dovecot-cookbook)
 [![Inline docs](http://inch-ci.org/github/zuazo/dovecot-cookbook.svg?branch=master&style=flat)](http://inch-ci.org/github/zuazo/dovecot-cookbook)
 
 [Chef](https://www.chef.io/) cookbook to install and configure [Dovecot](http://www.dovecot.org/), open source IMAP and POP3 email server.

diff --git a/test/unit/recipes/service_spec.rb b/test/unit/recipes/service_spec.rb
@@ -90,9 +90,9 @@
       end
     end
 
-    context 'on Ubuntu 13.10' do
+    context 'on Ubuntu 14.04' do
       let(:chef_runner) do
-        ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '13.10')
+        ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '14.04')
       end
 
       it 'uses the upstart provider' do