Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(MODULES-1700) Fix broken backup #363

Merged
merged 2 commits into from
Aug 3, 2015

Conversation

jhoblitt
Copy link
Contributor

No description provided.

@jhoblitt
Copy link
Contributor Author

This is #359 rebased on the current master with an additional commit that explicitly sets the backup parameter on all file resources and further removes any usage of resource defaults. It would be great if someone who actively uses the static compiler could try this in a test environment.

/cc @j-vizcaino @bmjen @mhaskel

And be explicitly defensive about defaults leaking in from other parts
of the manifest.
@jhoblitt jhoblitt changed the title Fix broken backup (MODULES-1700) Fix broken backup Jul 30, 2015
@bmjen
Copy link
Contributor

bmjen commented Jul 30, 2015

@jhoblitt This PR should be into 1.2.x no?

@jhoblitt
Copy link
Contributor Author

@bmjen no - all changes go to master. The forge team will handle release branches.

@bmjen
Copy link
Contributor

bmjen commented Jul 31, 2015

@jhoblitt sorry, I haven't had a chance to review this yet. I thought this was a revert/fix for #359, which was merged into 1.2.x, thus 1.2.x would need to be patched/fixed before we did a mergeback to master.

@jhoblitt
Copy link
Contributor Author

@bmjen #359 was reverted from 1.2.x. Everything [else from 1.2.x] prior to the merge/revert of #359 has been merged into master.

@bmjen
Copy link
Contributor

bmjen commented Aug 3, 2015

@jhoblitt I will merge this PR to fix the duplicate fragment issue, however we are going to implement a different fix for MODULES-1700 that should work both usecases (regular and static compilation)

bmjen added a commit that referenced this pull request Aug 3, 2015
(MODULES-1700) Fix broken backup
@bmjen bmjen merged commit 370e38a into puppetlabs:master Aug 3, 2015
@LukasAud LukasAud added the bugfix label Jun 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants