Merge branch 'master' into puppet-4
a34abcd7a989Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into puppet-4

Details

Provenance

Kylo Ginsberg <kylo@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU347774aae0c9: Merge branch 'master' into puppet-4
rPUbe206c961b65: Merge pull request #2954 from joshcooper/ticket/master/PUP-744-rescue-openssl

Branches

Unknown

Tags

Unknown

Event Timeline

Kylo Ginsberg <kylo@puppetlabs.com> committed rPUa34abcd7a989: Merge branch 'master' into puppet-4 (authored by Kylo Ginsberg <kylo@puppetlabs.com>).Aug 8 2014, 11:05 PM

Merged Changes

be206c961b65 Merge pull request #2954 from joshcooper/ticket/master/PUP-744-rescue-openssl
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
ff61d011ec8d (PUP-744) Expand scope of OpenSSL rescue block
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
25cb2c4638f9 (maint) Refactor HTTPS verification tests into a shared examples
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
f52dc05e7988 Merge pull request #2949 from roidelapluie/Remove_Puppet_Doc_Oudated_Documentat…
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
f4c0f3d68ae4 Merge pull request #2948 from jpartlow/maint/master/only-preserve-config-for…
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
baeaa48b24f3 Merge pull request #2947 from adrienthebo/issue/master/pup-2946-filebucket…
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
50c06efa202d (PUP-2946) Don't use private FileUtils methods
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
8d452e944299 (PUP-2946) Ensure #compare_stream uses binary strings
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
bbdecd91fdf3 (doc) Remove outdated notice concerning rdoc and ruby > 1.8.7
Author
Julien Pivotto <roidelapluie@inuits.eu>
Browse Repository
No Builds
No Audits
7d6c472027fa (maint) Guard preserve_configuration in acceptance
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

acceptance/

Rakefile

docs/

acceptance_tests.md

lib/

puppet/

application/

doc.rb

file_system/

file19.rb

network/

http/

connection.rb

spec/

integration/

file_bucket/

file_spec.rb

unit/

network/

http/

connection_spec.rb

rPUa34abcd7a989

View Options

acceptance/Rakefile

View Options

docs/acceptance_tests.md

View Options

lib/puppet/application/doc.rb

View Options

lib/puppet/file_system/file19.rb

View Options

lib/puppet/network/http/connection.rb

View Options

spec/integration/file_bucket/file_spec.rb

View Options

spec/unit/network/http/connection_spec.rb

Merge branch 'master' into puppet-4a34abcd7a989UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (7)

rPUa34abcd7a989

acceptance/Rakefile

docs/acceptance_tests.md

lib/puppet/application/doc.rb

lib/puppet/file_system/file19.rb

lib/puppet/network/http/connection.rb

spec/integration/file_bucket/file_spec.rb

spec/unit/network/http/connection_spec.rb

Merge branch 'master' into puppet-4
a34abcd7a989Unpublished
Actions