HomePhorge

Merge branch 'refactor/2.6.x/11996-spec-failures-after-ruby-187-p357' into…
3a57b0736690Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'refactor/2.6.x/11996-spec-failures-after-ruby-187-p357' into refactor/2.7.x/11996-spec-failures-after-ruby-187-p357

Conflicts:
spec/unit/util/zaml_spec.rb

Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU3a57b0736690: Merge branch 'refactor/2.6.x/11996-spec-failures-after-ruby-187-p357' into… (authored by Daniel Pittman <daniel@puppetlabs.com>).Jan 18 2012, 10:49 PM