Merge branch 'stable'
af02828c7b16Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'stable'

Details

Provenance

Thomas Hallgren <thomas@tada.se>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUd75d56332b53: Merge pull request #3504 from thallgren/issue/pup-3548/enable-3xcall-from…
rPUc188a2bb47e5: Merge pull request #3537 from hlindberg/PUP-3924_remove-hiera-backend…

Branches

Unknown

Tags

Unknown

Event Timeline

Thomas Hallgren <thomas@tada.se> committed rPUaf02828c7b16: Merge branch 'stable' (authored by Thomas Hallgren <thomas@tada.se>).Jan 29 2015, 1:43 PM

Merged Changes

d75d56332b53 Merge pull request #3504 from thallgren/issue/pup-3548/enable-3xcall-from…
Author
Thomas Hallgren <thomas@tada.se>
Browse Repository
No Builds
No Audits
5d12a4d046cf (PUP-3548) Use Symbol instead of String for param in spec test
Author
Thomas Hallgren <thomas@tada.se>
Browse Repository
No Builds
No Audits
c4030c3302b4 Revert "Revert "(PUP-3548) Allow 4x function to call 3x function""
Author
Thomas Hallgren <thomas@tada.se>
Browse Repository
No Builds
No Audits
e6cebd88d57b Merge pull request #3538 from hlindberg/PUP…
Author
Peter Huene <peterhuene@gmail.com>
Browse Repository
No Builds
No Audits
0427bc7f9d97 (PUP-3923) Fix lexer problem seeing regexp for div after var or word
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
9e2ad6aaa0bd Merge pull request #3396 from nfagerlund/docs_dec5_package_source
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
77743cd53dbc (docs) Clarify that adminfile comes from the target system, not the puppet…
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
4355be717596 (docs) Clarify docs for the package type's source attribute
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits

Changes (27)

Path

Size

lib/

puppet/

functions.rb

pops.rb

pops/

evaluator/

evaluator_impl.rb

runtime3_converter.rb

functions/

parser/

type/

spec/

fixtures/

unit/

pops/

loaders/

mix_4x_and_3x_functions

	mix_4x_and_3x_functions/
	dependent_modules_with_metadata/

	usee/
	user/

metadata.json

user/

metadata.json

unit/

pops/

loaders/

loaders_spec.rb

parser/

lexer2_spec.rb

rPUaf02828c7b16

View Options

lib/puppet/functions.rb

View Options

lib/puppet/pops.rb

View Options

lib/puppet/pops/evaluator/evaluator_impl.rb

View Options

lib/puppet/pops/evaluator/runtime3_converter.rb

View Options

lib/puppet/pops/evaluator/runtime3_support.rb

View Options

lib/puppet/pops/functions/function.rb

View Options

lib/puppet/pops/parser/lexer2.rb

View Options

lib/puppet/type/package.rb

View Options

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb

View Options

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb

View Options

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json

View Options

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/lib/puppet/functions/user/caller.rb

View Options

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/lib/puppet/functions/user/caller_ws.rb

View Options

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/metadata.json

View Options

spec/unit/pops/loaders/loaders_spec.rb

View Options

spec/unit/pops/parser/lexer2_spec.rb

Merge branch 'stable'af02828c7b16UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (27)

rPUaf02828c7b16

lib/puppet/functions.rb

lib/puppet/pops.rb

lib/puppet/pops/evaluator/evaluator_impl.rb

lib/puppet/pops/evaluator/runtime3_converter.rb

lib/puppet/pops/evaluator/runtime3_support.rb

lib/puppet/pops/functions/function.rb

lib/puppet/pops/parser/lexer2.rb

lib/puppet/type/package.rb

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/lib/puppet/functions/user/caller.rb

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/lib/puppet/functions/user/caller_ws.rb

spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/metadata.json

spec/unit/pops/loaders/loaders_spec.rb

spec/unit/pops/parser/lexer2_spec.rb

Merge branch 'stable'
af02828c7b16Unpublished
Actions