Merge branch 'stable'
35685835af95Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'stable'

Conflicts:
lib/puppet/defaults.rb

Details

Provenance

Adrien Thebo <git@somethingsinistral.net>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU8c5313ae1ae4: Merge branch 'pull-2740' into stable
rPU81e1b5fa3d05: Merge pull request #2717 from razalas/fix/master/remove_code_duplication

Branches

Unknown

Tags

Unknown

Event Timeline

Adrien Thebo <git@somethingsinistral.net> committed rPU35685835af95: Merge branch 'stable' (authored by Adrien Thebo <git@somethingsinistral.net>).Jun 5 2014, 2:20 AM

Merged Changes

8c5313ae1ae4 Merge branch 'pull-2740' into stable
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
1efe27a46e54 (PUP-2650) Defer deprecation warnings until we can read disable_warnings
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
e68f934b1e27 (PUP-2650) Add disable_warnings setting
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
cc3c10f667b1 (PUP-2650) Add :array setting type
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
56c96a4c0f6e Merge branch 'pup_2364_spike_vars' into stable
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
8c23a5bee480 (PUP-2364) Use the the puppet config vardir setting
Author
Kurt Wall <kurt.wall@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

acceptance/

tests/

agent/

agent_disable_lockfile.rb

environment/

use_enc_environment_for_pluginsync.rb

pluginsync/

files_earlier_in_modulepath_take_precendence.rb

ticket_6541_invalid_filebucket_files.rb

ticket_6734_6256_5530_5503.rb

ticket_9862_puppet_runs_without_service_user_or_group_present.rb

lib/

puppet/

settings/

util/

spec/

unit/

settings/

array_setting_spec.rb

settings_spec.rb

util/

logging_spec.rb

rPU35685835af95

View Options

acceptance/tests/agent/agent_disable_lockfile.rb

View Options

acceptance/tests/environment/use_enc_environment_for_pluginsync.rb

View Options

acceptance/tests/pluginsync/files_earlier_in_modulepath_take_precendence.rb

View Options

acceptance/tests/ticket_6541_invalid_filebucket_files.rb

View Options

acceptance/tests/ticket_6734_6256_5530_5503.rb

View Options

acceptance/tests/ticket_9862_puppet_runs_without_service_user_or_group_present.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/settings.rb

View Options

lib/puppet/settings/array_setting.rb

View Options

lib/puppet/settings/base_setting.rb

View Options

lib/puppet/util/logging.rb

View Options

spec/unit/settings/array_setting_spec.rb

View Options

spec/unit/settings_spec.rb

View Options

spec/unit/util/logging_spec.rb

Merge branch 'stable'35685835af95UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (14)

rPU35685835af95

acceptance/tests/agent/agent_disable_lockfile.rb

acceptance/tests/environment/use_enc_environment_for_pluginsync.rb

acceptance/tests/pluginsync/files_earlier_in_modulepath_take_precendence.rb

acceptance/tests/ticket_6541_invalid_filebucket_files.rb

acceptance/tests/ticket_6734_6256_5530_5503.rb

acceptance/tests/ticket_9862_puppet_runs_without_service_user_or_group_present.rb

lib/puppet/defaults.rb

lib/puppet/settings.rb

lib/puppet/settings/array_setting.rb

lib/puppet/settings/base_setting.rb

lib/puppet/util/logging.rb

spec/unit/settings/array_setting_spec.rb

spec/unit/settings_spec.rb

spec/unit/util/logging_spec.rb

Merge branch 'stable'
35685835af95Unpublished
Actions