Merge 2.7.x into master.
7e38e34a34adUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge 2.7.x into master.

This manually fixes up a pile of Puppet Module Tool conflicts by hand, related
to overlapping changes with nothing but textual translation. The rest of the
merge was smooth and simple.

Merge 2.7.x into master.7e38e34a34adUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (101)

rPU7e38e34a34ad

CHANGELOG

acceptance/tests/modules/backwards_compatibility/13682_do_not_monkey_patch_old_pmt.rb

acceptance/tests/modules/upgrade/in_a_secondary_directory.rb

acceptance/tests/modules/upgrade/introducing_new_dependencies.rb

acceptance/tests/modules/upgrade/not_upgradable.rb

acceptance/tests/modules/upgrade/that_was_installed_twice.rb

acceptance/tests/modules/upgrade/to_a_specific_version.rb

acceptance/tests/modules/upgrade/to_installed_version.rb

acceptance/tests/modules/upgrade/with_constraints_on_it.rb

acceptance/tests/modules/upgrade/with_constraints_on_its_dependencies.rb

acceptance/tests/modules/upgrade/with_local_changes.rb

acceptance/tests/modules/upgrade/with_scattered_dependencies.rb

acceptance/tests/modules/upgrade/with_update_available.rb

autotest/images/fail.png

autotest/images/pass.png

autotest/images/pending.png

conf/osx/preflight

lib/puppet.rb

lib/puppet/face/module/build.rb

lib/puppet/face/module/changes.rb

lib/puppet/face/module/generate.rb

lib/puppet/face/module/install.rb

lib/puppet/face/module/list.rb

lib/puppet/face/module/search.rb

lib/puppet/face/module/uninstall.rb

lib/puppet/face/module/upgrade.rb

lib/puppet/indirector/facts/network_device.rb

lib/puppet/module.rb

lib/puppet/module_tool.rb

lib/puppet/module_tool/applications.rb

lib/puppet/module_tool/applications/application.rb

lib/puppet/module_tool/applications/builder.rb

lib/puppet/module_tool/applications/checksummer.rb

lib/puppet/module_tool/applications/generator.rb

lib/puppet/module_tool/applications/installer.rb

lib/puppet/module_tool/applications/searcher.rb

lib/puppet/module_tool/applications/uninstaller.rb

lib/puppet/module_tool/applications/unpacker.rb

lib/puppet/module_tool/applications/upgrader.rb

lib/puppet/module_tool/checksums.rb

lib/puppet/module_tool/contents_description.rb

lib/puppet/module_tool/dependency.rb

lib/puppet/module_tool/errors.rb

lib/puppet/module_tool/errors/base.rb

lib/puppet/module_tool/errors/installer.rb

lib/puppet/module_tool/errors/shared.rb

lib/puppet/module_tool/errors/uninstaller.rb

lib/puppet/module_tool/errors/upgrader.rb

lib/puppet/module_tool/metadata.rb

lib/puppet/module_tool/modulefile.rb

lib/puppet/module_tool/shared_behaviors.rb

lib/puppet/module_tool/skeleton.rb

lib/puppet/parser/scope.rb

lib/puppet/provider/exec.rb

lib/puppet/provider/exec/shell.rb

lib/puppet/provider/service/upstart.rb

lib/puppet/type/vlan.rb

lib/puppet/util/instrumentation/indirection_probe.rb

lib/puppet/util/instrumentation/instrumentable.rb

lib/puppet/util/instrumentation/listeners/log.rb

lib/puppet/util/instrumentation/listeners/performance.rb

lib/puppet/util/network_device/base.rb

lib/puppet/util/network_device/cisco.rb

lib/puppet/util/network_device/cisco/facts.rb

lib/puppet/util/network_device/cisco/interface.rb

lib/puppet/util/network_device/config.rb

lib/puppet/util/network_device/ipcalc.rb

lib/puppet/util/network_device/transport.rb

lib/puppet/util/network_device/transport/base.rb

lib/puppet/util/network_device/transport/ssh.rb

spec/fixtures/releases/jamtur01-apache/metadata.json

spec/fixtures/unit/parser/lexer/arithmetic_expression.pp

Merge 2.7.x into master.
7e38e34a34adUnpublished
Actions