Skip to content

Commit ddaffbb

Browse files
committed
Merge branch 'master' into 3.2.1
Conflicts: metadata.rb
2 parents 213f676 + 9bfc4d7 commit ddaffbb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Dovecot Cookbook
77
[![Cookbook Version](https://img.shields.io/cookbook/v/dovecot.svg?style=flat)](https://supermarket.chef.io/cookbooks/dovecot)
88
[![Dependency Status](http://img.shields.io/gemnasium/zuazo/dovecot-cookbook.svg?style=flat)](https://gemnasium.com/zuazo/dovecot-cookbook)
99
[![Code Climate](http://img.shields.io/codeclimate/github/zuazo/dovecot-cookbook.svg?style=flat)](https://codeclimate.com/github/zuazo/dovecot-cookbook)
10-
[![Build Status](http://img.shields.io/travis/zuazo/dovecot-cookbook/3.2.0.svg?style=flat)](https://travis-ci.org/zuazo/dovecot-cookbook)
10+
[![Build Status](http://img.shields.io/travis/zuazo/dovecot-cookbook.svg?style=flat)](https://travis-ci.org/zuazo/dovecot-cookbook)
1111
[![Inline docs](http://inch-ci.org/github/zuazo/dovecot-cookbook.svg?branch=master&style=flat)](http://inch-ci.org/github/zuazo/dovecot-cookbook)
1212

1313
[Chef](https://www.chef.io/) cookbook to install and configure [Dovecot](http://www.dovecot.org/), open source IMAP and POP3 email server.

test/unit/recipes/service_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
end
9191
end
9292

93-
context 'on Ubuntu 13.10' do
93+
context 'on Ubuntu 14.04' do
9494
let(:chef_runner) do
95-
ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '13.10')
95+
ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '14.04')
9696
end
9797

9898
it 'uses the upstart provider' do

0 commit comments

Comments
 (0)