Diffusion puppet aa19f5cf75c6

Merge branch '2.7.x'
aa19f5cf75c6Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

2.7.x: (#9167) Do not send email when nothing changes [#13686] Fix directoryservices ShadowHashData code Fixup tests to work on CentOS 5 fix bug in Util#symbolizehash! (#13567) Fix create_resources name parameter bug (#13636) Update Module Face copyright date (#13737) Swap build_tree and format_tree method names (#9167) Do not send email when nothing changes Add Module Tool Make core changes needed for the puppet module tool (#13367) Patch SemVer to permit ranges including pre-release components. Monkey patch FileUtils.mv in Ruby 1.8.5 (#1076) Show warning if an empty group is specified Maint: Remove unused mock objects in user spec Maint: Use real objects in user spec Maint: Add a real provider class to user spec Maint: Remove unused variable in user spec

Conflicts:
lib/puppet/util/monkey_patches.rb
spec/unit/type/resources_spec.rb
spec/unit/type/user_spec.rb

Details

Provenance

Patrick Carlisle <patrick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU5ab3ec3d3401: Merge branch 'bug/2.7.x/13686_DS_Fix' into 2.7.x
rPUd4646526905f: Merge pull request #637 from zaphod42/bug/master/13655-test-failures-on-centos5

Branches

Unknown

Tags

Unknown

Event Timeline

Patrick Carlisle <patrick@puppetlabs.com> committed rPUaa19f5cf75c6: Merge branch '2.7.x' (authored by Patrick Carlisle <patrick@puppetlabs.com>).Apr 10 2012, 12:00 AM

Merged Changes

5ab3ec3d3401 Merge branch 'bug/2.7.x/13686_DS_Fix' into 2.7.x
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
4ad37dc38dda Merge remote-tracking branch 'kelseyhightower/ticket/2.7.
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
c8db033b5c88 Merge remote-tracking branch 'kelseyhightower/kelseyhightower/ticket/2.7.
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
7afcb0471eb3 (#9167) Do not send email when nothing changes
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
a26ff1648b48 [#13686] Fix directoryservices ShadowHashData code
Author
Gary Larizza <gary@puppetlabs.com>
Browse Repository
No Builds
No Audits
8ceaaf002a55 Merge pull request #638 from zaphod42/bug/2.7.x/13655-test-failures-on-centos5
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
b85cdc9d6216 Fixup tests to work on CentOS 5
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
537488f1a7e4 Merge pull request #528 from stschulte/ticket/2.7.x/1076
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
ca22046e7696 Merge pull request #635 from cprice-puppet/bug/2.7.x/util_symbolize_hash
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
fc2964f9a801 fix bug in Util#symbolizehash!
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
ff444aa32a61 Merge pull request #633 from cprice-puppet/bug/2.7.
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
46d8973ba39d (#13567) Fix create_resources name parameter bug
Author
Reid Vandewiele <marut@cat.pdx.edu>
Browse Repository
No Builds
No Audits
da765a867cd1 Merge pull request #623 from kelseyhightower/ticket/2.7.
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
bca484949000 (#13636) Update Module Face copyright date
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
a2990a83f880 (#13737) Swap build_tree and format_tree method names
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
245c6b71d484 (#9167) Do not send email when nothing changes
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
d88f3e7c387e Merge pull request #613 from puppetlabs/geordi
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
1de8bd735c8f Add Module Tool
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
271c7f2f4838 Make core changes needed for the puppet module tool
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
7994400aab51 (#13367) Patch SemVer to permit ranges including pre-release components.
Author
Pieter van de Bruggen <pvande@gmail.com>
Browse Repository
No Builds
No Audits
1342558a01d7 Monkey patch FileUtils.mv in Ruby 1.8.5
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
c6d656ae204c (#1076) Show warning if an empty group is specified
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
e1f995705242 Maint: Remove unused mock objects in user spec
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
bc64d9b45109 Maint: Use real objects in user spec
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
7eb4f5bd949c Maint: Add a real provider class to user spec
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
d28c62ab190b Maint: Remove unused variable in user spec
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits

Changes (123)

Path

Size

acceptance/

tests/

modules/

already_installed.rb

already_installed_elsewhere.rb

already_installed_with_local_changes.rb

force_ignores_dependencies.rb

ignoring_dependencies.rb

nonexistent_directory.rb

with_dependencies.rb

with_existing_module_directory.rb

with_necessary_upgrade.rb

with_no_dependencies.rb

with_unnecessary_upgrade.rb

with_unsatisfied_constraints.rb

with_circular_dependencies.rb

with_installed_modules.rb

with_invalid_dependencies.rb

with_missing_dependencies.rb

with_repeated_dependencies.rb

without_installed_modules.rb

by_description.rb

by_module_name.rb

communication_error.rb

multiple_search_terms.rb

using_directory_name.rb

using_version_filter.rb

with_active_dependency.rb

with_module_installed.rb

with_multiple_modules_installed.rb

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

lib/

puppet/

application/

face/

help/

module/

forge/

module_tool/

applications.rb

applications/

shared_behaviors.rb

skeleton/

templates/

generator/

interrogation.rb

node/

parser/

functions/

create_resources.rb

provider/

nameservice/

directoryservice.rb

reports/

type/

util/

monkey_patches.rb

spec/

fixtures/

unit/

reports/

tagmail/

tagmail_email.conf

integration/

faces/

documentation_spec.rb

module_tool_spec.rb

unit/

face/

module/

install_spec.rb

uninstall_spec.rb

upgrade_spec.rb

forge/

repository_spec.rb

module_tool/

application_spec.rb

application_spec.rb

installer_spec.rb

uninstaller_spec.rb

upgrader_spec.rb

uninstaller_spec.rb

module_tool_spec.rb

node/

environment_spec.rb

parser/

functions/

create_resources_spec.rb

provider/

nameservice/

directoryservice_spec.rb

reports/

tagmail_spec.rb

type/

util/

terminal_spec.rb

rPUaa19f5cf75c6

acceptance/tests/modules/install/already_installed.rb

Loading...

acceptance/tests/modules/install/already_installed_elsewhere.rb

Loading...

acceptance/tests/modules/install/already_installed_with_local_changes.rb

Loading...

acceptance/tests/modules/install/force_ignores_dependencies.rb

Loading...

acceptance/tests/modules/install/ignoring_dependencies.rb

Loading...

acceptance/tests/modules/install/nonexistent_directory.rb

Loading...

acceptance/tests/modules/install/with_cycles.rb

Loading...

acceptance/tests/modules/install/with_dependencies.rb

Loading...

acceptance/tests/modules/install/with_existing_module_directory.rb

Loading...

acceptance/tests/modules/install/with_necessary_upgrade.rb

Loading...

acceptance/tests/modules/install/with_no_dependencies.rb

Loading...

acceptance/tests/modules/install/with_unnecessary_upgrade.rb

Loading...

acceptance/tests/modules/install/with_unsatisfied_constraints.rb

Loading...

acceptance/tests/modules/list/with_circular_dependencies.rb

Loading...

acceptance/tests/modules/list/with_installed_modules.rb

Loading...

acceptance/tests/modules/list/with_invalid_dependencies.rb

Loading...

acceptance/tests/modules/list/with_missing_dependencies.rb

Loading...

acceptance/tests/modules/list/with_repeated_dependencies.rb

Loading...

acceptance/tests/modules/list/without_installed_modules.rb

Loading...

acceptance/tests/modules/search/by_description.rb

Loading...

acceptance/tests/modules/search/by_keyword.rb

Loading...

acceptance/tests/modules/search/by_module_name.rb

Loading...

acceptance/tests/modules/search/communication_error.rb

Loading...

acceptance/tests/modules/search/formatting.rb

Loading...

acceptance/tests/modules/search/multiple_search_terms.rb

Loading...

acceptance/tests/modules/search/no_results.rb

Loading...

acceptance/tests/modules/uninstall/using_directory_name.rb

Loading...

acceptance/tests/modules/uninstall/using_version_filter.rb

Loading...

acceptance/tests/modules/uninstall/with_active_dependency.rb

Loading...

acceptance/tests/modules/uninstall/with_module_installed.rb

Loading...

acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb

Loading...

acceptance/tests/modules/upgrade/in_a_secondary_directory.rb

Loading...

acceptance/tests/modules/upgrade/introducing_new_dependencies.rb

Loading...

acceptance/tests/modules/upgrade/not_upgradable.rb

Loading...

acceptance/tests/modules/upgrade/that_was_installed_twice.rb

Loading...

acceptance/tests/modules/upgrade/to_a_specific_version.rb

Loading...

acceptance/tests/modules/upgrade/to_installed_version.rb

Loading...

acceptance/tests/modules/upgrade/with_constraints_on_it.rb

Loading...

acceptance/tests/modules/upgrade/with_constraints_on_its_dependencies.rb

Loading...

acceptance/tests/modules/upgrade/with_local_changes.rb

Loading...

acceptance/tests/modules/upgrade/with_scattered_dependencies.rb

Loading...

acceptance/tests/modules/upgrade/with_update_available.rb

Loading...

lib/puppet/application/module.rb

Loading...

lib/puppet/face/help/man.erb

Loading...

lib/puppet/face/module.rb

Loading...

lib/puppet/face/module/build.rb

Loading...

lib/puppet/face/module/changes.rb

Loading...

lib/puppet/face/module/clean.rb

Loading...

lib/puppet/face/module/generate.rb

Loading...

lib/puppet/face/module/install.rb

Loading...

lib/puppet/face/module/list.rb

Loading...

lib/puppet/face/module/search.rb

Loading...

lib/puppet/face/module/uninstall.rb

Loading...

lib/puppet/face/module/upgrade.rb

Loading...

lib/puppet/forge.rb

Loading...

lib/puppet/forge/cache.rb

Loading...

lib/puppet/forge/repository.rb

Loading...

lib/puppet/module.rb

Loading...

lib/puppet/module_tool.rb

Loading...

lib/puppet/module_tool/applications.rb

Loading...

lib/puppet/module_tool/applications/application.rb

Loading...

lib/puppet/module_tool/applications/checksummer.rb

Loading...

lib/puppet/module_tool/applications/cleaner.rb

Loading...

lib/puppet/module_tool/applications/installer.rb

Loading...

lib/puppet/module_tool/applications/searcher.rb

Loading...

lib/puppet/module_tool/applications/uninstaller.rb

Loading...

lib/puppet/module_tool/applications/unpacker.rb

Loading...

lib/puppet/module_tool/applications/upgrader.rb

Loading...

lib/puppet/module_tool/errors.rb

Loading...

lib/puppet/module_tool/errors/base.rb

Loading...

lib/puppet/module_tool/errors/installer.rb

Loading...

lib/puppet/module_tool/errors/shared.rb

Loading...

lib/puppet/module_tool/errors/uninstaller.rb

Loading...

lib/puppet/module_tool/errors/upgrader.rb

Loading...

lib/puppet/module_tool/shared_behaviors.rb

Loading...

lib/puppet/module_tool/skeleton/templates/generator/metadata.json

Loading...

lib/puppet/module_tool/utils

Loading...

lib/puppet/module_tool/utils.rb

Loading...

lib/puppet/module_tool/utils/interrogation.rb

Loading...

lib/puppet/node/environment.rb

Loading...

lib/puppet/parser/functions/create_resources.rb

Loading...

lib/puppet/provider/nameservice/directoryservice.rb

Loading...

lib/puppet/reports/tagmail.rb

Loading...

lib/puppet/type/user.rb

Loading...

lib/puppet/util.rb

Loading...

lib/puppet/util/monkey_patches.rb

Loading...

lib/puppet/util/terminal.rb

Loading...

lib/semver.rb

Loading...

spec/fixtures/unit/reports/tagmail/tagmail_email.conf

Loading...

spec/integration/faces/documentation_spec.rb

Loading...

spec/integration/module_tool_spec.rb

Loading...

spec/unit/face/module/install_spec.rb

Loading...

spec/unit/face/module/list_spec.rb

Loading...

spec/unit/face/module/search_spec.rb

Loading...

spec/unit/face/module/uninstall_spec.rb

Loading...

spec/unit/face/module/upgrade_spec.rb

Loading...

spec/unit/forge/repository_spec.rb

Loading...

spec/unit/forge_spec.rb

Loading...

spec/unit/module_spec.rb

Loading...

spec/unit/module_tool/application_spec.rb

Loading...

spec/unit/module_tool/applications/application_spec.rb

Loading...

spec/unit/module_tool/applications/installer_spec.rb

Loading...

spec/unit/module_tool/applications/uninstaller_spec.rb

Loading...

spec/unit/module_tool/applications/upgrader_spec.rb

Loading...

spec/unit/module_tool/uninstaller_spec.rb

Loading...

spec/unit/module_tool_spec.rb

Loading...

spec/unit/node/environment_spec.rb

Loading...

spec/unit/parser/functions/create_resources_spec.rb

Loading...

spec/unit/provider/nameservice/directoryservice_spec.rb

Loading...

spec/unit/reports/tagmail_spec.rb

Loading...

spec/unit/semver_spec.rb

Loading...

spec/unit/type/user_spec.rb

Loading...

spec/unit/util/terminal_spec.rb

Loading...

spec/unit/util_spec.rb

Loading...