Skip to content

Commit

Permalink
Merge pull request #1060 from justinstoller/maint-revert-defaultpoolsize
Browse files Browse the repository at this point in the history
Revert increase in default pool size
  • Loading branch information
Magisus authored May 6, 2020
2 parents b2bce62 + 007d37b commit c2ab6f8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ CHANGELOG

Unreleased
----
- Increase `pool_size` default to 4 from 1 [#1044](https://github.com/puppetlabs/r10k/pull/1044)
- Add exec environment source type. The exec source type allows for the implementation of external environment sources [#1042](https://github.com/puppetlabs/r10k/pull/1042)

3.4.1
Expand Down
2 changes: 1 addition & 1 deletion lib/r10k/puppetfile.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Puppetfile

include R10K::Settings::Mixin

def_setting_attr :pool_size, 4
def_setting_attr :pool_size, 1

include R10K::Logging

Expand Down
4 changes: 2 additions & 2 deletions lib/r10k/settings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ def self.global_settings
}),

Definition.new(:pool_size, {
:desc => "The amount of threads used to concurrently install modules. The default value is 4: install four modules at a time.",
:default => 4,
:desc => "The amount of threads used to concurrently install modules. The default value is 1: install one module at a time.",
:default => 1,
:validate => lambda do |value|
if !value.is_a?(Integer)
raise ArgumentError, "The pool_size setting should be an integer, not a #{value.class}"
Expand Down

0 comments on commit c2ab6f8

Please sign in to comment.