diff options
| -rw-r--r-- | .expeditor/config.yml | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 20 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lib/mixlib/authentication/version.rb | 2 |
4 files changed, 19 insertions, 7 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 1adc4e6..245d978 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -17,7 +17,7 @@ github: # for building. release_branch: - master: - version_constraint: 1.* + version_constraint: 2.* promote: action: diff --git a/CHANGELOG.md b/CHANGELOG.md index a417ec6..740a23b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,29 @@ # mixlib-authentication Changelog -<!-- latest_release --> +<!-- latest_release unreleased --> +## Unreleased + +#### Merged Pull Requests +- bump version to 2.1.0 [#38](https://github.com/chef/mixlib-authentication/pull/38) ([thommay](https://github.com/thommay)) <!-- latest_release --> -<!-- release_rollup --> +<!-- release_rollup since=2.1.0 --> +### Changes since 2.1.0 release <!-- release_rollup --> <!-- latest_stable_release --> +## [v2.1.0](https://github.com/chef/mixlib-authentication/tree/v2.1.0) (2018-05-31) + +#### Merged Pull Requests +- Support signing with ssh-agent (round two) [#36](https://github.com/chef/mixlib-authentication/pull/36) ([coderanger](https://github.com/coderanger)) +- Forgot to put sign_version in the opts which would make it nil when p… [#37](https://github.com/chef/mixlib-authentication/pull/37) ([coderanger](https://github.com/coderanger)) +- bump version to 2.1.0 [#38](https://github.com/chef/mixlib-authentication/pull/38) ([thommay](https://github.com/thommay)) +<!-- latest_stable_release --> + ## [v2.0.0](https://github.com/chef/mixlib-authentication/tree/v2.0.0) (2018-04-12) #### Merged Pull Requests - Move mixlib-auth debugging to trace level [#32](https://github.com/chef/mixlib-authentication/pull/32) ([thommay](https://github.com/thommay)) -<!-- latest_stable_release --> ## 1.4.2 (2017-08-17) @@ -27,4 +39,4 @@ ## 1.4.0 (2015-01-19) -- Add Chef signing protocol version 1.3 +- Add Chef signing protocol version 1.3
\ No newline at end of file @@ -1 +1 @@ -2.0.0 +2.1.0 diff --git a/lib/mixlib/authentication/version.rb b/lib/mixlib/authentication/version.rb index e631d07..52c860c 100644 --- a/lib/mixlib/authentication/version.rb +++ b/lib/mixlib/authentication/version.rb @@ -15,6 +15,6 @@ module Mixlib module Authentication - VERSION = "2.0.0" + VERSION = "2.1.0" end end |