Merge commit '2.6.3rc2' into next
80adb39d1f4eUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge commit '2.6.3rc2' into next

Manually resolved conflicts:
lib/puppet/parser/ast/resource.rb
spec/unit/parser/ast/resource_spec.rb

Details

Provenance

Paul Berry <paul@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU244213c856f3: Updated CHANGELOG for 2.6.3rc2
rPU2279fe12b32b: Merge branch 'maint/next/add_local_branch_to_mail_patches' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Paul Berry <paul@puppetlabs.com> committed rPU80adb39d1f4e: Merge commit '2.6.3rc2' into next (authored by Paul Berry <paul@puppetlabs.com>).Nov 10 2010, 12:11 AM

Merged Changes

244213c856f3 Updated CHANGELOG for 2.6.3rc2
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
76ac1f88ce2a Fixed #5112 - Launchd Service broke in 2.6.2 with OS X 10.4 Clients.
Author
donavan <donavan@desinc.net>
Browse Repository
No Builds
No Audits
776ea2a17de7 Fixed #5137 - Removed no longer required TOC references
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
31118fe85aca Kludge for #5048 -- serialization compatibility with 0.25.x
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
65ef24e5c1c3 (#4534/#4778) -- Normalize parameterized classes
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
3b53bfcd0dd2 Fix for #5022 -- Escaped newlines should be elided
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

CHANGELOG

lib/

puppet/

parser/

ast/

resource.rb

compiler.rb

lexer.rb

provider/

service/

resource/

util/

spec/

unit/

parser/

ast/

resource/

rPU80adb39d1f4e

View Options

CHANGELOG

View Options

lib/puppet/parser/ast/resource.rb

View Options

lib/puppet/parser/compiler.rb

View Options

lib/puppet/parser/lexer.rb

View Options

lib/puppet/provider/service/launchd.rb

View Options

lib/puppet/resource.rb

View Options

lib/puppet/resource/type.rb

View Options

lib/puppet/util/reference.rb

View Options

spec/unit/parser/ast/resource_spec.rb

View Options

spec/unit/parser/compiler_spec.rb

View Options

spec/unit/parser/lexer_spec.rb

View Options

spec/unit/resource/type_spec.rb

Merge commit '2.6.3rc2' into next80adb39d1f4eUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (12)

rPU80adb39d1f4e

CHANGELOG

lib/puppet/parser/ast/resource.rb

lib/puppet/parser/compiler.rb

lib/puppet/parser/lexer.rb

lib/puppet/provider/service/launchd.rb

lib/puppet/resource.rb

lib/puppet/resource/type.rb

lib/puppet/util/reference.rb

spec/unit/parser/ast/resource_spec.rb

spec/unit/parser/compiler_spec.rb

spec/unit/parser/lexer_spec.rb

spec/unit/resource/type_spec.rb

Merge commit '2.6.3rc2' into next
80adb39d1f4eUnpublished
Actions