diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-17 15:19:15 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-17 15:19:15 -0800 |
| commit | e6ec6468c4a9eec58dc155858665a70eee4dfb8c (patch) | |
| tree | 85cdb7614a1922752ff652b93f2947ef231fa8fb /ext | |
| parent | fb2b9e65990477e81728402afa1aab6fbe4a9c7e (diff) | |
| parent | 53bb805f118ccaca5598e60afadfa6b777410a0f (diff) | |
| download | puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.tar.gz puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.tar.xz puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.zip | |
Merge commit '2.6.3' into next
Resolved conflicts manually:
spec/integration/indirector/bucket_file/rest_spec.rb
spec/integration/indirector/certificate_revocation_list/rest_spec.rb
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/puppetstoredconfigclean.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/puppetstoredconfigclean.rb b/ext/puppetstoredconfigclean.rb index 9b7b0c8a7..16f39efa1 100644 --- a/ext/puppetstoredconfigclean.rb +++ b/ext/puppetstoredconfigclean.rb @@ -70,8 +70,6 @@ case adapter args[:port] = pm_conf[:dbport] unless pm_conf[:dbport].to_s.empty? socket = pm_conf[:dbsocket] args[:socket] = socket unless socket.to_s.empty? - connections = pm_conf[:dbconnections].to_i - args[:pool] = connections if connections > 0 else raise ArgumentError, "Invalid db adapter #{adapter}" end |