Diffusion puppet d0d34a7fac31

Merge branch 'ticket/2.7.
d0d34a7fac31Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'ticket/2.7.x/13682_puppet_should_not_conflict_with_released_puppet-module_gem' into 2.7.x

ticket/2.7.x/13682_puppet_should_not_conflict_with_released_puppet-module_gem: (#13682) Fix acceptance test failures (#13682) Rename Puppet::Module::Tool to Puppet::ModuleTool (maint) Ensure every file has a trailing newlines

Reviewed-by: Daniel Pittman
Reviewed-by: Matthaus Litteken
Reviewed-by: Kelsey Hightower

Details

Provenance

Jeff McCune <jeff@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU42b20be81568: (#13682) Fix acceptance test failures
rPU0ee259f3c266: Merge branch '2.7rc' into 2.7.x

Branches

Unknown

Tags

Unknown

Event Timeline

Jeff McCune <jeff@puppetlabs.com> committed rPUd0d34a7fac31: Merge branch 'ticket/2.7. (authored by Jeff McCune <jeff@puppetlabs.com>).Apr 24 2012, 1:25 AM

Merged Changes

42b20be81568 (#13682) Fix acceptance test failures
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
dce3c32d6fd9 (#13682) Rename Puppet::Module::Tool to Puppet::ModuleTool
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
5117e12d24a8 (maint) Ensure every file has a trailing newlines
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (91)

Path

Size

acceptance/

tests/

modules/

backwards_compatibility

13682_do_not_monkey_patch_old_pmt.rb

upgrade/

in_a_secondary_directory.rb

introducing_new_dependencies.rb

not_upgradable.rb

that_was_installed_twice.rb

to_a_specific_version.rb

to_installed_version.rb

with_constraints_on_it.rb

with_constraints_on_its_dependencies.rb

with_local_changes.rb

with_scattered_dependencies.rb

with_update_available.rb

autotest/

images/

fail.png

pass.png

pending.png

conf/

osx/

preflight

lib/

puppet/

face/

module/

indirector/

facts/

module_tool/

applications/

contents_description.rb

errors/

type/

util/

instrumentation/

listeners/

network_device/

cisco/

transport/

spec/

fixtures/

releases/

jamtur01-apache/

metadata.json

unit/

parser/

lexer/

arithmetic_expression.pp

yaml/

report0.25.x.yaml

report2.6.x.yaml

integration/

network/

rest_authconfig_spec.rb

unit/

face/

module/

module_tool/

applications/

util/

instrumentation/

data_spec.rb

indirection_probe_spec.rb

instrumentable_spec.rb

listener_spec.rb

listeners/

log_spec.rb

performance_spec.rb

instrumentation_spec.rb

reference_spec.rb

tasks/

rake/

manpages.rake

test/

data/

snippets/

arithmetic_expression.pp

rPUd0d34a7fac31

View Options

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

View Options

acceptance/tests/modules/upgrade/in_a_secondary_directory.rb

View Options

acceptance/tests/modules/upgrade/introducing_new_dependencies.rb

View Options

acceptance/tests/modules/upgrade/not_upgradable.rb

View Options

acceptance/tests/modules/upgrade/that_was_installed_twice.rb

View Options

acceptance/tests/modules/upgrade/to_a_specific_version.rb

View Options

acceptance/tests/modules/upgrade/to_installed_version.rb

View Options

acceptance/tests/modules/upgrade/with_constraints_on_it.rb

View Options

acceptance/tests/modules/upgrade/with_constraints_on_its_dependencies.rb

View Options

acceptance/tests/modules/upgrade/with_local_changes.rb

View Options

acceptance/tests/modules/upgrade/with_scattered_dependencies.rb

View Options

acceptance/tests/modules/upgrade/with_update_available.rb

View Options

autotest/images/fail.png

View Options

autotest/images/pass.png

View Options

autotest/images/pending.png

View Options

conf/osx/preflight

View Options

lib/puppet/face/module/build.rb

View Options

lib/puppet/face/module/changes.rb

View Options

lib/puppet/face/module/generate.rb

View Options

lib/puppet/face/module/install.rb

View Options

lib/puppet/face/module/list.rb

View Options

lib/puppet/face/module/search.rb

View Options

lib/puppet/face/module/uninstall.rb

View Options

lib/puppet/face/module/upgrade.rb

View Options

lib/puppet/indirector/facts/network_device.rb

View Options

lib/puppet/module.rb

View Options

lib/puppet/module_tool.rb

View Options

lib/puppet/module_tool/applications.rb

View Options

lib/puppet/module_tool/applications/application.rb

View Options

lib/puppet/module_tool/applications/builder.rb

View Options

lib/puppet/module_tool/applications/checksummer.rb

View Options

lib/puppet/module_tool/applications/generator.rb

View Options

lib/puppet/module_tool/applications/installer.rb

View Options

lib/puppet/module_tool/applications/searcher.rb

View Options

lib/puppet/module_tool/applications/uninstaller.rb

View Options

lib/puppet/module_tool/applications/unpacker.rb

View Options

lib/puppet/module_tool/applications/upgrader.rb

View Options

lib/puppet/module_tool/checksums.rb

View Options

lib/puppet/module_tool/contents_description.rb

View Options

lib/puppet/module_tool/dependency.rb

View Options

lib/puppet/module_tool/errors.rb

View Options

lib/puppet/module_tool/errors/base.rb

View Options

lib/puppet/module_tool/errors/installer.rb

View Options

lib/puppet/module_tool/errors/shared.rb

View Options

lib/puppet/module_tool/errors/uninstaller.rb

View Options

lib/puppet/module_tool/errors/upgrader.rb

View Options

lib/puppet/module_tool/metadata.rb

View Options

lib/puppet/module_tool/modulefile.rb

View Options

lib/puppet/module_tool/shared_behaviors.rb

View Options

lib/puppet/module_tool/skeleton.rb

View Options

lib/puppet/type/vlan.rb

View Options

lib/puppet/util/instrumentation/indirection_probe.rb

View Options

lib/puppet/util/instrumentation/instrumentable.rb

View Options

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

View Options

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

View Options

lib/puppet/util/network_device/base.rb

View Options

lib/puppet/util/network_device/cisco.rb

View Options

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

View Options

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

View Options

lib/puppet/util/network_device/config.rb

View Options

lib/puppet/util/network_device/ipcalc.rb

View Options

lib/puppet/util/network_device/transport.rb

View Options

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

View Options

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

View Options

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

View Options

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

View Options

spec/fixtures/yaml/report0.25.x.yaml

View Options

spec/fixtures/yaml/report2.6.x.yaml

View Options

spec/integration/network/rest_authconfig_spec.rb

View Options

spec/unit/face/module/install_spec.rb

View Options

spec/unit/face/module/search_spec.rb

View Options

spec/unit/face/module/uninstall_spec.rb

View Options

spec/unit/module_spec.rb

View Options

spec/unit/module_tool/application_spec.rb

View Options

spec/unit/module_tool/applications/application_spec.rb

View Options

spec/unit/module_tool/applications/installer_spec.rb

View Options

spec/unit/module_tool/applications/uninstaller_spec.rb

View Options

spec/unit/module_tool/applications/upgrader_spec.rb

View Options

spec/unit/module_tool/metadata_spec.rb

View Options

spec/unit/module_tool_spec.rb

View Options

spec/unit/util/instrumentation/data_spec.rb

View Options

spec/unit/util/instrumentation/indirection_probe_spec.rb

View Options

spec/unit/util/instrumentation/instrumentable_spec.rb

View Options

spec/unit/util/instrumentation/listener_spec.rb

View Options

spec/unit/util/instrumentation/listeners/log_spec.rb

View Options

spec/unit/util/instrumentation/listeners/performance_spec.rb

View Options

spec/unit/util/instrumentation_spec.rb

View Options

spec/unit/util/reference_spec.rb

View Options

tasks/rake/manpages.rake

View Options

test/data/snippets/arithmetic_expression.pp

Merge branch 'ticket/2.7.d0d34a7fac31UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (91)

rPUd0d34a7fac31

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/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/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

spec/fixtures/yaml/report0.25.x.yaml

spec/fixtures/yaml/report2.6.x.yaml

spec/integration/network/rest_authconfig_spec.rb

spec/unit/face/module/install_spec.rb

spec/unit/face/module/search_spec.rb

spec/unit/face/module/uninstall_spec.rb

Merge branch 'ticket/2.7.
d0d34a7fac31Unpublished
Actions