Merge branch 'stable'
c977f2ad51edUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'stable'

Details

Provenance

Kylo Ginsberg <kylo@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUd1a7fbecb6f0: Merge pull request #3210 from zaphod42/issue/stable/pup-3201-incorrect-string…
rPUcbea1e36621e: Merge pull request #3206 from adrienthebo/removal/master/pup-3305-default…

Branches

Unknown

Tags

Unknown

Event Timeline

Kylo Ginsberg <kylo@puppetlabs.com> committed rPUc977f2ad51ed: Merge branch 'stable' (authored by Kylo Ginsberg <kylo@puppetlabs.com>).Oct 20 2014, 7:08 PM

Merged Changes

d1a7fbecb6f0 Merge pull request #3210 from zaphod42/issue/stable/pup-3201-incorrect-string…
Author
Henrik Lindberg <henrik.lindberg@puppetlabs.com>
Browse Repository
No Builds
No Audits
d4b882760269 (PUP-3201) Stop using :undef for parameters in 4x
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
a40cfd624fbc (maint) Only test lookup() with future parser
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
8c8eb932fe76 Merge branch 'issue/stable/pup-3277-envdir-perms' into stable
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
b3b306a2b09a (PUP-3277) Ensure agents re-enabled after disable agent test
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
a00033e1c922 (PUP-3277) Use owner from puppet settings rather than beaker defaults
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
873a93ed5b5f Merge pull request #3195 from hlindberg/PUP-3401_fix-pattern-type
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
fcf55df943b1 Merge pull request #3197 from hkenney/issue/stable/pup…
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
04b47bebf80c (PUP-3334) Add test to ensure cache is cleared
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
920b127cb93d (PUP-3334) Clear environment settings caches
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
a8060647f705 Merge pull request #3164 from ffrank/ticket/3.7.x/PUP-3357-purge-unnamed-ssh…
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
2a0eaac7321f (PUP-3357) integration test for purging of unnamed ssh authorized keys
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits
c9fd8dcb8c18 (PUP-3357) unit tests for the purging of multiple unnamed keys
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits
fb430c075663 (PUP-3357) generate implicit names for ssh_authorized_keys if needed
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits
72d4edbe1a6d (PUP-3401) Fix type calculations of "all Patterns"
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
5b5add89d387 (PUP-3244) Fixup test for windows and future parser
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
6cdd9f87a860 Merge pull request #3194 from zaphod42/issue/stable/pup-3201-undef-not-working
Author
Henrik Lindberg <henrik.lindberg@puppetlabs.com>
Browse Repository
No Builds
No Audits
277f406293ef (PUP-3201) Treat :undef as PNilType
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (22)

Path

Size

acceptance/

lib/

puppet/

acceptance/

environment_utils.rb

tests/

agent/

agent_disable_lockfile.rb

lib/

puppet/

environments.rb

parser/

ast/

pops_bridge.rb

resource.rb

resource/

param.rb

pops/

evaluator/

evaluator_impl.rb

runtime3_support.rb

types/

type_calculator.rb

provider/

ssh_authorized_key/

parsed.rb

settings.rb

type/

user.rb

spec/

fixtures/

unit/

type/

user/

authorized_keys

integration/

parser/

future_compiler_spec.rb

type/

user_spec.rb

unit/

environments_spec.rb

parser/

functions/

lookup_spec.rb

resource/

param_spec.rb

resource_spec.rb

pops/

types/

type_calculator_spec.rb

provider/

ssh_authorized_key/

parsed_spec.rb

type/

user_spec.rb

rPUc977f2ad51ed

View Options

acceptance/lib/puppet/acceptance/environment_utils.rb

View Options

acceptance/tests/agent/agent_disable_lockfile.rb

View Options

lib/puppet/environments.rb

View Options

lib/puppet/parser/ast/pops_bridge.rb

View Options

lib/puppet/parser/resource.rb

View Options

lib/puppet/parser/resource/param.rb

View Options

lib/puppet/pops/evaluator/evaluator_impl.rb

View Options

lib/puppet/pops/evaluator/runtime3_support.rb

View Options

lib/puppet/pops/types/type_calculator.rb

View Options

lib/puppet/provider/ssh_authorized_key/parsed.rb

View Options

lib/puppet/settings.rb

View Options

lib/puppet/type/user.rb

View Options

spec/fixtures/unit/type/user/authorized_keys

View Options

spec/integration/parser/future_compiler_spec.rb

View Options

spec/integration/type/user_spec.rb

View Options

spec/unit/environments_spec.rb

View Options

spec/unit/parser/functions/lookup_spec.rb

View Options

spec/unit/parser/resource/param_spec.rb

View Options

spec/unit/parser/resource_spec.rb

View Options

spec/unit/pops/types/type_calculator_spec.rb

View Options

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

View Options

spec/unit/type/user_spec.rb

Merge branch 'stable'c977f2ad51edUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (22)

rPUc977f2ad51ed

acceptance/lib/puppet/acceptance/environment_utils.rb

acceptance/tests/agent/agent_disable_lockfile.rb

lib/puppet/environments.rb

lib/puppet/parser/ast/pops_bridge.rb

lib/puppet/parser/resource.rb

lib/puppet/parser/resource/param.rb

lib/puppet/pops/evaluator/evaluator_impl.rb

lib/puppet/pops/evaluator/runtime3_support.rb

lib/puppet/pops/types/type_calculator.rb

lib/puppet/provider/ssh_authorized_key/parsed.rb

lib/puppet/settings.rb

lib/puppet/type/user.rb

spec/fixtures/unit/type/user/authorized_keys

spec/integration/parser/future_compiler_spec.rb

spec/integration/type/user_spec.rb

spec/unit/environments_spec.rb

spec/unit/parser/functions/lookup_spec.rb

spec/unit/parser/resource/param_spec.rb

spec/unit/parser/resource_spec.rb

spec/unit/pops/types/type_calculator_spec.rb

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

spec/unit/type/user_spec.rb

Merge branch 'stable'
c977f2ad51edUnpublished
Actions