Skip to content

Commit

Permalink
Merge pull request #404 from HelenCampbell/releaseprep1.3.2
Browse files Browse the repository at this point in the history
1.3.2 Release Prep
  • Loading branch information
bmjen authored Jan 17, 2018
2 parents 74c7b9f + 8ddd5d2 commit 0adbe18
Show file tree
Hide file tree
Showing 4 changed files with 286 additions and 135 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,31 @@ All changes to this repo will be documented in this file.
See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) for a high-level summary.


## [v1.3.2](https://github.com/puppetlabs/pdk/tree/v1.3.2) (2018-01-16)
[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.3.1...v1.3.2)

**Closed issues:**

- "pdk convert" and "pdk new module" fails on OSX Sierra [\#396](https://github.com/puppetlabs/pdk/issues/396)
- Update shipped ruby [\#395](https://github.com/puppetlabs/pdk/issues/395)

**Merged pull requests:**

- \(maint\) Default PDK::TEMPLATE\_REF to PDK::VERSION [\#405](https://github.com/puppetlabs/pdk/pull/405) ([rodjek](https://github.com/rodjek))
- \(PDK-552\) Soften PDK::CLI::Util.ensure\_in\_module! error messages [\#401](https://github.com/puppetlabs/pdk/pull/401) ([rodjek](https://github.com/rodjek))
- \(PDK-739\) Fall back to default template if necessary [\#400](https://github.com/puppetlabs/pdk/pull/400) ([rodjek](https://github.com/rodjek))

## [v1.3.1](https://github.com/puppetlabs/pdk/tree/v1.3.1) (2017-12-20)
[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.3.0...v1.3.1)

**Fixed bugs:**

- \(PDK-736\) Improve handling of old template-url and template-ref [\#397](https://github.com/puppetlabs/pdk/pull/397) ([scotje](https://github.com/scotje))

**Merged pull requests:**

- Release Prep for 1.3.1 Hotfix [\#398](https://github.com/puppetlabs/pdk/pull/398) ([HelenCampbell](https://github.com/HelenCampbell))

## [v1.3.0](https://github.com/puppetlabs/pdk/tree/v1.3.0) (2017-12-15)
[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.2.1...v1.3.0)

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Environment Variable | Usage
1. Bump the version in `lib/pdk/version.rb`.
1. In a clean checkout of master, run `bundle exec rake changelog`.
1. Edit PR titles and tags, until `bundle exec rake changelog` output makes sense.
1. Run `bundle exec rake gettext:pot` to update the translations.
1. Commit and PR the changes.
1. When the PR is merged, get a clean checkout of the merged commit, and run `bundle exec rake release[upstream]` (where "upstream" is your local name of the puppetlabs remote)
1. Profit!
Expand Down
2 changes: 1 addition & 1 deletion lib/pdk/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module PDK
VERSION = '1.3.1'.freeze
VERSION = '1.3.2'.freeze
TEMPLATE_REF = VERSION
end
Loading

0 comments on commit 0adbe18

Please sign in to comment.