Diffusion puppet a6bfef8f601b

Merge remote-tracking branch 'upstream/stable'
a6bfef8f601bUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/stable'

upstream/stable: (maint) Confine enc_provides_node_when_store_configs_enabled to debian (PUP-2943) Update acceptance tests (PUP-2943) Clean ignore-changes uninstall logic (PUP-2943) Uninstall/upgrade ignore changes spec (PUP-2943) Add PMT --ignore-changes

Details

Provenance

Josh Partlow <joshua.partlow@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU925ebf901c46: Merge branch 'maint/stable/confine-store-configs-to-debian' into stable
rPUa452559e0ed9: Merge pull request #2885 from highb/fix/master/pup…

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Partlow <joshua.partlow@puppetlabs.com> committed rPUa6bfef8f601b: Merge remote-tracking branch 'upstream/stable' (authored by Josh Partlow <joshua.partlow@puppetlabs.com>).Jul 23 2014, 3:08 AM

Merged Changes

925ebf901c46 Merge branch 'maint/stable/confine-store-configs-to-debian' into stable
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
ea7cb490a87b (maint) Confine enc_provides_node_when_store_configs_enabled to debian
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
15a028105f45 Merge pull request #2899 from highb/fix/stable/pup-2943_ignore_changes_flag
Author
Anderson Mills <anderson@puppetlabs.com>
Browse Repository
No Builds
No Audits
a3a970338df1 (PUP-2943) Update acceptance tests
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
1536fda817da (PUP-2943) Clean ignore-changes uninstall logic
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
d80ba4aa25a8 (PUP-2943) Uninstall/upgrade ignore changes spec
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
3835b7dfe463 (PUP-2943) Add PMT --ignore-changes
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (9)

Path

Size

acceptance/

tests/

modules/

upgrade/

with_local_changes.rb

store_configs/

enc_provides_node_when_storeconfigs_enabled.rb

lib/

puppet/

face/

module/

module_tool/

applications/

errors/

spec/

unit/

module_tool/

applications/

uninstaller_spec.rb

upgrader_spec.rb

rPUa6bfef8f601b

acceptance/tests/modules/upgrade/with_local_changes.rb

Loading...

acceptance/tests/store_configs/enc_provides_node_when_storeconfigs_enabled.rb

Loading...

lib/puppet/face/module/uninstall.rb

Loading...

lib/puppet/face/module/upgrade.rb

Loading...

lib/puppet/module_tool/applications/uninstaller.rb

Loading...

lib/puppet/module_tool/applications/upgrader.rb

Loading...

lib/puppet/module_tool/errors/shared.rb

Loading...

spec/unit/module_tool/applications/uninstaller_spec.rb

Loading...

spec/unit/module_tool/applications/upgrader_spec.rb

Loading...