Merge pull request #56 from puppetlabs/1.7.2-release

1.7.2 release mergeback

Author: Magisus

CHANGELOG.md

@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 No unreleased changes.
 
+## [1.7.2](https://github.com/puppetlabs/puppetlabs-cd4pe_jobs/tree/1.7.2)
+
+### Added
+- Added logging to indicate that when the image pull fails, the module will assume the image is present
+  locally and attempt to use that to run the job.
+
+### Fixed
+- The module's main task is now marked as private, since users are not expected to run it directly.
+
+
 ## [1.7.1](https://github.com/puppetlabs/puppetlabs-cd4pe_jobs/tree/1.7.1)
 
 ### Fixed

README.md

@@ -24,3 +24,11 @@ git tag -a 1.7.0 -m "1.7.0"
 git push --tags
 ```
 9. Make a PR from the release branch back to `master`. Once this is merged the release branch should be deleted.
+
+## Note on branch names
+
+The default branch of this repo has been kept as `master` because there are lots
+of control repo fixtures floating around that reference this master branch, as a
+way of making sure that we are testing with the most up-to-date version of this
+module. Until we update those places, we need to continue calling the default
+branch `master`.

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-cd4pe_jobs",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "author": "puppetlabs",
   "summary": "Contains Bolt task to facilitate running of CD4PE jobs.",
   "license": "proprietary",