Diffusion puppet 6540ec01f840

Merge remote-tracking branch 'upstream/stable'
6540ec01f840Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/stable'

upstream/stable: (PUP-2158) Unlist configured environment (PUP-2158) Test dynamic environments with an empty environmentpath (PUP-2158) Fix integration apply application spec (PUP-2129) Fix issues with false interpolation start (no-such-method) (PUP-2158) Report 404 for missing environment (PUP-2158) Default a missing manifest to no_manifest (PUP-2158) Hide dir envs behind a feature flag

Conflicts:
lib/puppet/node/environment.rb
spec/unit/environments_spec.rb

Details

Provenance

Andrew Parker <andy@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU152a9461cd2e: Merge pull request #2519 from jpartlow/issue/stable/pup-2158-hide-dir-envs…
rPU7b7fec7ad3d6: Merge branch 'stable'

Branches

Unknown

Tags

Unknown

Event Timeline

Andrew Parker <andy@puppetlabs.com> committed rPU6540ec01f840: Merge remote-tracking branch 'upstream/stable' (authored by Andrew Parker <andy@puppetlabs.com>).Apr 9 2014, 4:08 PM

Merged Changes

152a9461cd2e Merge pull request #2519 from jpartlow/issue/stable/pup-2158-hide-dir-envs…
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
8c3898c8ba80 (PUP-2158) Unlist configured environment
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
e25dae5b6591 (PUP-2158) Test dynamic environments with an empty environmentpath
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
59d5e97f35c5 (PUP-2158) Fix integration apply application spec
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
b8b6c3561f0c Merge pull request #2518 from hlindberg/pup-2129_false-interpolation-start
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
3e2098145d8f (PUP-2129) Fix issues with false interpolation start (no-such-method)
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
63830709c38f (PUP-2158) Report 404 for missing environment
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
f6637b0a3dba (PUP-2158) Default a missing manifest to no_manifest
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
eb640cb6d654 (PUP-2158) Hide dir envs behind a feature flag
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (47)

Path

Size

acceptance/

tests/

environment/

cmdline_overrides_environment.rb

lib/

puppet/

environments.rb

network/

http/

api/

node/

pops/

parser/

interpolation_support.rb

test/

spec/

integration/

application/

directory_environments_spec.rb

indirector/

file_content/

file_server_spec.rb

node/

environment_spec.rb

resource/

type_collection_spec.rb

unit/

application/

environments_spec.rb

face/

module/

install_spec.rb

uninstall_spec.rb

indirector/

node/

active_record_spec.rb

request_spec.rb

module_tool/

applications/

installer_spec.rb

uninstaller_spec.rb

module_tool_spec.rb

network/

http/

api/

v2/

environments_spec.rb

node/

environment_spec.rb

parser/

ast/

collection_spec.rb

compiler_spec.rb

functions_spec.rb

resource_spec.rb

pops/

parser/

parse_heredoc_spec.rb

rails/

resource/

type_collection_spec.rb

resource_spec.rb

util/

autoload_spec.rb

rdoc/

rPU6540ec01f840

acceptance/tests/environment/cmdline_overrides_environment.rb

Loading...

lib/puppet.rb

Loading...

lib/puppet/defaults.rb

Loading...

lib/puppet/environments.rb

Loading...

lib/puppet/network/http/api/v1.rb

Loading...

lib/puppet/network/http/issues.rb

Loading...

lib/puppet/node/environment.rb

Loading...

lib/puppet/pops/parser/interpolation_support.rb

Loading...

lib/puppet/test/test_helper.rb

Loading...

spec/integration/application/apply_spec.rb

Loading...

spec/integration/directory_environments_spec.rb

Loading...

spec/integration/indirector/file_content/file_server_spec.rb

Loading...

spec/integration/node/environment_spec.rb

Loading...

spec/integration/resource/type_collection_spec.rb

Loading...

spec/unit/application/apply_spec.rb

Loading...

spec/unit/environments_spec.rb

Loading...

spec/unit/face/module/install_spec.rb

Loading...

spec/unit/face/module/list_spec.rb

Loading...

spec/unit/face/module/uninstall_spec.rb

Loading...

spec/unit/face/parser_spec.rb

Loading...

spec/unit/indirector/node/active_record_spec.rb

Loading...

spec/unit/indirector/node/ldap_spec.rb

Loading...

spec/unit/indirector/node/plain_spec.rb

Loading...

spec/unit/indirector/request_spec.rb

Loading...

spec/unit/module_spec.rb

Loading...

spec/unit/module_tool/applications/installer_spec.rb

Loading...

spec/unit/module_tool/applications/uninstaller_spec.rb

Loading...

spec/unit/module_tool_spec.rb

Loading...

spec/unit/network/http/api/v1_spec.rb

Loading...

spec/unit/network/http/api/v2/environments_spec.rb

Loading...

spec/unit/node/environment_spec.rb

Loading...

spec/unit/node_spec.rb

Loading...

spec/unit/parser/ast/collection_spec.rb

Loading...

spec/unit/parser/compiler_spec.rb

Loading...

spec/unit/parser/files_spec.rb

Loading...

spec/unit/parser/functions_spec.rb

Loading...

spec/unit/parser/parser_spec.rb

Loading...

spec/unit/parser/resource_spec.rb

Loading...

spec/unit/parser/scope_spec.rb

Loading...

spec/unit/pops/parser/lexer2_spec.rb

Loading...

spec/unit/pops/parser/parse_heredoc_spec.rb

Loading...

spec/unit/rails/host_spec.rb

Loading...

spec/unit/resource/type_collection_spec.rb

Loading...

spec/unit/resource/type_spec.rb

Loading...

spec/unit/resource_spec.rb

Loading...

spec/unit/util/autoload_spec.rb

Loading...

spec/unit/util/rdoc/parser_spec.rb

Loading...