HomePhorge
Diffusion puppet ba0a343a3cab

Merge remote-tracking branch 'upstream/stable'
ba0a343a3cabUnpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/stable'

  • upstream/stable: (PUP-3366) Correct comparisson of Enum > Enum[a] PUP-3366 Fix issues with string/enum type assignable calculations (PUP-3227) Address man page ownship conflicts

Conflicts:
ext/debian/control

  • Took the Suggests like from the master branch and the Conflicts line from the stable branch

Details

Provenance
Andrew Parker <andy@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU9f4f7e1af873: Merge pull request #3134 from hlindberg/PUP-3366_string-enum-type-calculation
rPU05a0e557f42f: Merge pull request #3161 from daenney/debian-vardir-ssl
Branches
Unknown
Tags
Unknown

Event Timeline

Andrew Parker <andy@puppetlabs.com> committed rPUba0a343a3cab: Merge remote-tracking branch 'upstream/stable' (authored by Andrew Parker <andy@puppetlabs.com>).Oct 10 2014, 12:09 AM

Merged Changes

Changes (3)

PathSize
ext/
debian/
lib/
puppet/
pops/
types/
spec/
unit/
pops/
types/

rPUba0a343a3cab

View Options

ext/debian/control

Loading...
View Options

lib/puppet/pops/types/type_calculator.rb

Loading...
View Options

spec/unit/pops/types/type_calculator_spec.rb

Loading...