Merge master to stable #371
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
puppet-agent carries the batch files for all executables with the new move to vanagon for windows projects, we will need an option to omit batch file creation during installation of hiera so there are not more than one set of batch files. So this commit adds a --no-batch-files option for cmake that omits those files.
…at_option (HI-515) Add --no-batch-files option
Hiera tests its hierarchy sources list to make sure they do not contain a known pattern that will break a file path. If a known bad patern is found the source is silently dropped. Adding this patch will cause Hiera to generate a warning as well as dropping the source. This new functionality will help users debug bad Hiera configuration.
report when we have skipped "bad definition in :hierarchy"
This commit updates the key that is used to sign hiera packages. We are in the process of introducing a new signing key to verify our packages. As a part of this effort, we need to actually switch over to this new key for our individual projects.
(maint) Sign packages with new signing key
Update the beaker gem version used in acceptance to beaker 3.1.0 to allow for MacOS Sierra (10.12) testing.
(HI-538) Update beaker version to 3.1.0
This reverts commit bf52672. All jenkins pipelines for hiera need to be updated to use ruby >= 2.2.5 before this will work
Revert "(HI-538) Update beaker version to 3.1.0"
Revert "Revert "(HI-538) Update beaker version to 3.1.0""
* puppet/stable: (maint) Upgrade to new signing key
Merge stable to master
This updates Hiera's version to 3.2.2 in preparation for the puppet-agent 1.8.0 release. We had originally updated the version from 3.2.1 to 3.3.0, but the small amount of changes made a Y release unnecessary.
(packaging) Bump version to 3.2.2
* master: (packaging) Bump version to 3.2.2 Revert "Revert "(HI-538) Update beaker version to 3.1.0"" Revert "(HI-538) Update beaker version to 3.1.0" (HI-538) Update beaker version to 3.1.0 (maint) Upgrade to new signing key (HI-530) report when we have skipped "bad definition in :hierarchy" (maint) Update version to 3.3.0 (HI-515) Add --no-batch-files option
|
👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merge is in anticipation of the puppet-agent 1.8.0 release, and includes the 3.2.2 tag, along with everything slated for that release.