Diffusion puppet 30b2b5dea2ce

Merge branch 'stable'
30b2b5dea2ceUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'stable'

stable: (maint) Install CA certs during git and package runs (PUP-3091) Add test coverage for heredoc support (PUP-3682) Disable HTTP keepalive in webrick on 1.8.7

Details

Provenance

Rob Reynolds <ferventcoder@gmail.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUfae3fc261135: Merge pull request #3328 from joshcooper/ticket/stable/maint-refactor-install…
rPU58d5eaf8427b: Merge pull request #3301 from demophoon/remove/master/zaml

Branches

Unknown

Tags

Unknown

Event Timeline

Rob Reynolds <ferventcoder@gmail.com> committed rPU30b2b5dea2ce: Merge branch 'stable' (authored by Rob Reynolds <ferventcoder@gmail.com>).Nov 21 2014, 10:36 PM

Merged Changes

fae3fc261135 Merge pull request #3328 from joshcooper/ticket/stable/maint-refactor-install…
Author
Rob Reynolds <ferventcoder@gmail.com>
Browse Repository
No Builds
No Audits
2c8053c82715 (maint) Install CA certs during git and package runs
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
bb2d5a560fbf Merge pull request #3327 from demophoon/fix/stable/pup-3091-heredoc-support
Author
Henrik Lindberg <henrik.lindberg@puppetlabs.com>
Browse Repository
No Builds
No Audits
5e1aeab43799 (PUP-3091) Add test coverage for heredoc support
Author
Britt Gresham <britt@puppetlabs.com>
Browse Repository
No Builds
No Audits
63984a11ad92 Merge pull request #3325 from joshcooper/ticket/stable/PUP-3682-disable-webrick…
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
8461eb4870c4 (PUP-3682) Disable HTTP keepalive in webrick on 1.8.7
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

acceptance/

config/

git/

packages/

setup/

	common/	pre-suite/
	git/	pre-suite/

	070_InstallCACerts.rb
	070_InstalCACerts.rb

git/

pre-suite/

070_InstalCACerts.rb

lib/

puppet/

network/

http/

webrick/

spec/

unit/

network/

http/

webrick/

pops/

parser/

parse_heredoc_spec.rb

rPU30b2b5dea2ce

acceptance/config/git/options.rb

Loading...

acceptance/config/packages/options.rb

Loading...

acceptance/setup/common/pre-suite/070_InstallCACerts.rb

Loading...

acceptance/setup/git/pre-suite/070_InstalCACerts.rb

Loading...

lib/puppet/network/http/webrick/rest.rb

Loading...

spec/unit/network/http/webrick/rest_spec.rb

Loading...

spec/unit/pops/parser/parse_heredoc_spec.rb

Loading...