Merge commit '2.6.next^1' into next
cc43dd79ad8dUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge commit '2.6.next^1' into next

These changes were superseded by existing commits in next:
lib/puppet/parser/compiler.rb
spec/unit/parser/compiler_spec.rb

Details

Provenance

Jesse Wolfe <jes5199@gmail.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU0fec21fcd887: Merge branch 'ticket/2.6.next/5221' into 2.6.next
rPUc0236aab1145: Merge branch 'tickets/next/6855-searching_in_resource_type' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Jesse Wolfe <jes5199@gmail.com> committed rPUcc43dd79ad8d: Merge commit '2.6.next^1' into next (authored by Jesse Wolfe <jes5199@gmail.com>).Mar 26 2011, 12:24 AM

Merged Changes

0fec21fcd887 Merge branch 'ticket/2.6.next/5221' into 2.6.next
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0f3e537a127f Merge branch 'feature/2.6.next/4576' of https://github.com/bodepd/puppet into 2.
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
99201ff662e8 Merge branch '2.6.x' into 2.6.next
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
76b3ee6822f5 Update CHANGELOG for 2.6.7
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
7761acb5acd9 (#5221) Add test for fix to fileset with trailing separator
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
357514ceec94 (#5221) Fix fileset path absoluteness checking with trailing slash
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
9f1a01653f97 Merge branch 'ticket/2.6.next/4769' into 2.6.next
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
f8941b80bb8b (#4769) Fix negative timeout support for newer rubies
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
196294a73e32 (4576) - if ENC declares invalid class, it is logged at warning.
Author
Dan Bode <bodepd@gmail.com>
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

CHANGELOG

lib/

puppet/

file_serving/

fileset.rb

type/

exec.rb

spec/

unit/

file_serving/

fileset_spec.rb

type/

exec_spec.rb

rPUcc43dd79ad8d

View Options

CHANGELOG

View Options

lib/puppet/file_serving/fileset.rb

View Options

lib/puppet/type/exec.rb

View Options

spec/unit/file_serving/fileset_spec.rb

View Options

spec/unit/type/exec_spec.rb

Merge commit '2.6.next^1' into nextcc43dd79ad8dUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (5)

rPUcc43dd79ad8d

CHANGELOG

lib/puppet/file_serving/fileset.rb

lib/puppet/type/exec.rb

spec/unit/file_serving/fileset_spec.rb

spec/unit/type/exec_spec.rb

Merge commit '2.6.next^1' into next
cc43dd79ad8dUnpublished
Actions