Diffusion puppet e6ec6468c4a9

Merge commit '2.6.3' into next
e6ec6468c4a9Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

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

Details

Provenance

Paul Berry <paul@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU53bb805f118c: Incremented CHANGELOG for 2.6.3
rPUfb2b9e659904: Merge branch 'next' of git://github.com/puppetlabs/puppet into next

Branches

Unknown

Tags

Unknown

Event Timeline

Paul Berry <paul@puppetlabs.com> committed rPUe6ec6468c4a9: Merge commit '2.6.3' into next (authored by Paul Berry <paul@puppetlabs.com>).Nov 18 2010, 12:19 AM

Merged Changes

53bb805f118c Incremented CHANGELOG for 2.6.3
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
184733cda074 [#5322] (#5322) Remove spec file that adds little value and causes failures
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
178c2a628256 Fix test failures that fixing #4726 exposed.
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
74b6c09e3b07 (#4726) Fix RRD legacy support
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
866205624873 Fix for #4279 -- mount detection on HP-UX
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
fbb096a1eb63 Fix for #5055 -- adding to_sym to Puppet::Node::Environment
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
b2ff6a50202a Fix for #5298 -- Collections need to do type lookup
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
1ce00dccb840 Step towards [5298] -- cleanup indentation, etc. in AST::Collection
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
722608b3592c Fixed #5287 - Schedule documentation is incorrect
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
c8b6fb5bed05 Fixed #5296 - test warnings messages
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
d221c05e0862 (#5297) Fix schedule tests that were missing stubs for Time.now
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
f2fd0d1ec854 Fix for #5273 -- user resource constantly resetting password age
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
544dcf80db32 Fix #5289 -- Bad copy/paste changes message on test failure
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
126681ff87f3 Updated CHANGELOG for 2.6.3rc3
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
b15231df5842 Fix for #4299 -- Don't require which
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
ea435a43dc97 Fix #5020 - Prefer finding node name from REST uri over certname
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
a097b939ab52 Fix for #4894 -- retry tests if port is in use
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
ee61b4ecec7d Fix for #4955 -- Race condition & memory leak in Puppet::Util
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
f57425da6aee Fix #4921 - race condition in Parser Functions creation
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
9604f1c4cd5a Fix #5252 - line number mis-attribution during parsing
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
cc5224c1912f Maint. fix for test broken by 00eedac5
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
5f7d0fbb3699 Fix for #2568 -- Add a dbconnections option to set AR pool size
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
ba4d22bce3fb Maint. Removing code for which no CLA has been signed
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
4a3d5d7c11be Reimplementation of functionality removed by prior commit
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
235d64163c95 Refactor for CLA
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
9ba0c8a22c6f Fix #4923 - close process race when truncating existing file
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
cb16d3dcbad4 Puppet-load: better and safer error reporting
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
1d2674250537 Fix #5023 - puppet-load multiple nodes support
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
00eedac5917f capture stderr from exec resources
Author
Nigel Kersten <nigelk@google.com>
Browse Repository
No Builds
No Audits
4cbceab68f3d (#4573) FreeBSD service provider now supports versions <7 and >8
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
06c8748cbfed Fix #3808 - puppetdoc should use --force-update only if RDoc supports it
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
6e6712b54394 [#4813] Remove dead code from puppet/rails/host.rb
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
956296a74c70 Fix #4911 - Do not generate doc for standard RDoc parser generated object
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
4fa24bb4be7f Fix #5127 - error when accessing array elements
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
abb8c669378a (#5242) Fix schedule specs that fail near daylight savings
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
ec667fd53f9f Kludge for #5206 -- port of fix for #3536 to yaml
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
9a3b5849c54c (#5062) Add envpuppet helper script to ext/
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
aad700802b9a [#5225] Fix spec failure that depended on time change
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
21db472640c8 (#5233) Randomize tmp dir paths
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (60)

Path

Size

ext/

puppetstoredconfigclean.rb

lib/

puppet/

indirector/

catalog/

network/

handler/

node/

parser/

ast/

parser_support.rb

provider/

confine/

package/

service/

user/

user_role_add.rb

rails/

type/

util/

command_line.rb

file_locking.rb

rdoc/

generators/

puppet_generator.rb

spec/

integration/

parser/

functions_spec.rb

ruby_manifest_spec.rb

ssl/

certificate_authority_spec.rb

util/

file_locking_spec.rb

unit/

application/

indirector/

catalog/

compiler_spec.rb

network/

handler/

fileserver_spec.rb

parser/

ast/

collection_spec.rb

resource_spec.rb

provider/

confine/

service/

freebsd_spec.rb

ssh_authorized_key/

type/

schedule_spec.rb

util/

command_line_spec.rb

file_locking_spec.rb

storage_spec.rb

test/

other/

puppet/

tc_suidmanager.rb

ral/

manager/

providers/

rPUe6ec6468c4a9

CHANGELOG

Loading...

ext/puppetstoredconfigclean.rb

Loading...

lib/puppet/daemon.rb

Loading...

lib/puppet/defaults.rb

Loading...

lib/puppet/indirector/catalog/compiler.rb

Loading...

lib/puppet/network/handler/fileserver.rb

Loading...

lib/puppet/network/server.rb

Loading...

lib/puppet/node/environment.rb

Loading...

lib/puppet/parser/ast/collection.rb

Loading...

lib/puppet/parser/ast/leaf.rb

Loading...

lib/puppet/parser/functions.rb

Loading...

lib/puppet/parser/parser_support.rb

Loading...

lib/puppet/provider.rb

Loading...

lib/puppet/provider/confine/exists.rb

Loading...

lib/puppet/provider/mount.rb

Loading...

lib/puppet/provider/package/openbsd.rb

Loading...

lib/puppet/provider/service/freebsd.rb

Loading...

lib/puppet/provider/user/user_role_add.rb

Loading...

lib/puppet/provider/user/useradd.rb

Loading...

lib/puppet/rails.rb

Loading...

lib/puppet/rails/host.rb

Loading...

lib/puppet/resource.rb

Loading...

lib/puppet/type/exec.rb

Loading...

lib/puppet/type/schedule.rb

Loading...

lib/puppet/util.rb

Loading...

lib/puppet/util/command_line.rb

Loading...

lib/puppet/util/file_locking.rb

Loading...

lib/puppet/util/metric.rb

Loading...

lib/puppet/util/rdoc.rb

Loading...

lib/puppet/util/rdoc/generators/puppet_generator.rb

Loading...

lib/puppet/util/reference.rb

Loading...

lib/puppet/util/suidmanager.rb

Loading...

lib/puppet/util/zaml.rb

Loading...

spec/integration/parser/functions_spec.rb

Loading...

spec/integration/parser/ruby_manifest_spec.rb

Loading...

spec/integration/ssl/certificate_authority_spec.rb

Loading...

spec/integration/util/file_locking_spec.rb

Loading...

spec/unit/application/apply_spec.rb

Loading...

spec/unit/daemon_spec.rb

Loading...

spec/unit/indirector/catalog/compiler_spec.rb

Loading...

spec/unit/network/handler/fileserver_spec.rb

Loading...

spec/unit/network/server_spec.rb

Loading...

spec/unit/parser/ast/collection_spec.rb

Loading...

spec/unit/parser/ast/leaf_spec.rb

Loading...

spec/unit/parser/ast/resource_spec.rb

Loading...

spec/unit/parser/parser_spec.rb

Loading...

spec/unit/provider/confine/exists_spec.rb

Loading...

spec/unit/provider/mount_spec.rb

Loading...

spec/unit/provider/service/freebsd_spec.rb

Loading...

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

Loading...

spec/unit/rails_spec.rb

Loading...

spec/unit/type/schedule_spec.rb

Loading...

spec/unit/util/command_line_spec.rb

Loading...

spec/unit/util/file_locking_spec.rb

Loading...

spec/unit/util/rdoc_spec.rb

Loading...

spec/unit/util/storage_spec.rb

Loading...

test/other/provider.rb

Loading...

test/puppet/tc_suidmanager.rb

Loading...

test/ral/manager/type.rb

Loading...

test/ral/providers/provider.rb

Loading...