Skip to content

Commit

Permalink
Merge pull request #1220 from mwaggett/maint/main/release
Browse files Browse the repository at this point in the history
(maint) Prep for 3.12.0 #minor release
  • Loading branch information
justinstoller authored Sep 16, 2021
2 parents dccc379 + 8ee8629 commit f582999
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ CHANGELOG
Unreleased
----------

3.12.0
------

- (RK-308) Provide a `forge.allow_puppetfile_override` setting that, when true, causes a `forge` declaration in the Puppetfile to override `forge.baseurl`. [#1214](https://github.com/puppetlabs/r10k/pull/1214)
- (CODEMGMT-1415) Provide a `--incremental` flag to only sync those modules in a Puppetfile whose definitions have changed since last sync, or those whose versions could change. [#1200](https://github.com/puppetlabs/r10k/pull/1200)
- (CODEMGMT-1415) Provide an `--incremental` flag to only sync those modules in a Puppetfile whose definitions have changed since last sync, or those whose versions could change. [#1200](https://github.com/puppetlabs/r10k/pull/1200)
- (CODEMGMT-1454) Ensure missing repo caches are re-synced [#1210](https://github.com/puppetlabs/r10k/pull/1210)
- (PF-2437) Allow token authentication to be used with the Forge. [#1192](https://github.com/puppetlabs/r10k/pull/1192)
- Only run the module postrun command for environments in which the module was modified. [#1215](https://github.com/puppetlabs/r10k/issues/1215)
Expand Down
2 changes: 1 addition & 1 deletion lib/r10k/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ module R10K
# When updating to a new major (X) or minor (Y) version, include `#major` or
# `#minor` (respectively) in your commit message to trigger the appropriate
# release. Otherwise, a new patch (Z) version will be released.
VERSION = '3.11.0'
VERSION = '3.12.0'
end

0 comments on commit f582999

Please sign in to comment.