Diffusion puppet a8b832756b03

Merge remote-tracking branch 'upstream/master' into puppet-4
a8b832756b03Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/master' into puppet-4

upstream/master: correct test description for http_compression disabled (PUP-1680) Set accept-encoding to identity when http_compression is false (PUP-3177) Remove magic handling of square brackets in resource title (packaging) Update PUPPETVERSION to 3.7.0 (PUP-2914) Remove 'gem install rgen' step now that it's vendored (PUP-3048) Remove saucy from build defaults correct test description for http_compression disabled (PUP-1680) Set accept-encoding to identity when http_compression is false

Details

Provenance

Josh Cooper <josh@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUa5f2fe276dfa: Merge pull request #3049 from hlindberg/PUP-987_remove-ruby-dsl
rPU92e9d6150505: Merge remote-tracking branch 'upstream/stable'

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPUa8b832756b03: Merge remote-tracking branch 'upstream/master' into puppet-4 (authored by Josh Cooper <josh@puppetlabs.com>).Sep 8 2014, 11:26 PM

Merged Changes

92e9d6150505 Merge remote-tracking branch 'upstream/stable'
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
636adc044475 Merge remote-tracking branch 'upstream/pr/3057' into stable
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
c606c647aa44 correct test description for http_compression disabled
Author
Johan Haals <johan.haals@gmail.com>
Browse Repository
No Builds
No Audits
01a476c73dc3 (PUP-1680) Set accept-encoding to identity when http_compression is false
Author
Johan Haals <johan.haals@gmail.com>
Browse Repository
No Builds
No Audits
2663d7fb0ccc Merge pull request #3055 from hlindberg/PUP-3177_Stable-Remove-square-bracket…
Author
Josh Cooper <josh+github@puppetlabs.com>
Browse Repository
No Builds
No Audits
4e4252c456e5 Merge pull request #2915 from jhaals/jhaals/compression
Author
wayne <waynr@sdf.org>
Browse Repository
No Builds
No Audits
6563a6040877 (PUP-3177) Remove magic handling of square brackets in resource title
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
9c55b1c2132f Merge pull request #3037 from kylog/issue/pup-2914/remove-rgen-install-step
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
1681684857c6 Merge remote-tracking branch 'upstream/master' into stable
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
038d76e67db0 (packaging) Update PUPPETVERSION to 3.7.0
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
d02943ffc0d3 Merge remote-tracking branch 'upstream/master' into stable
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
1815df62389a (PUP-2914) Remove 'gem install rgen' step now that it's vendored
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
b2c3dba20452 Merge pull request #2969 from clantant/PUP-3048/stable/saucy
Author
Will Hopper <whopper@cat.pdx.edu>
Browse Repository
No Builds
No Audits
56b7f8cd36a3 (PUP-3048) Remove saucy from build defaults
Author
Eric Timmerman <eric.timmerman@puppetlabs.com>
Browse Repository
No Builds
No Audits
6d58b97400b0 correct test description for http_compression disabled
Author
Johan Haals <johan.haals@gmail.com>
Browse Repository
No Builds
No Audits
f527b2e44dae (PUP-1680) Set accept-encoding to identity when http_compression is false
Author
Johan Haals <johan.haals@gmail.com>
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

acceptance/

setup/

common/

pre-suite/

100_SetParser.rb

ext/

build_defaults.yaml

lib/

puppet/

network/

http/

spec/

unit/

network/

http/

compression_spec.rb

resource_spec.rb

rPUa8b832756b03

acceptance/setup/common/pre-suite/100_SetParser.rb

Loading...

ext/build_defaults.yaml

Loading...

lib/puppet/network/http/compression.rb

Loading...

lib/puppet/resource.rb

Loading...

lib/puppet/version.rb

Loading...

spec/unit/network/http/compression_spec.rb

Loading...

spec/unit/resource_spec.rb

Loading...