Merge branch 'master' into puppet-4
3c663009ec44Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into puppet-4

Details

Provenance

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

Parents

rPUbbc43ccf549d: Merge branch 'master' into puppet-4
rPU6b96e48ea3fb: Merge pull request #3008 from nfagerlund/docs_37_deprecations_and_revisions

Branches

Unknown

Tags

Unknown

Event Timeline

Kylo Ginsberg <kylo@puppetlabs.com> committed rPU3c663009ec44: Merge branch 'master' into puppet-4 (authored by Kylo Ginsberg <kylo@puppetlabs.com>).Aug 25 2014, 12:21 AM

Merged Changes

6b96e48ea3fb Merge pull request #3008 from nfagerlund/docs_37_deprecations_and_revisions
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
979b883583b9 Merge pull request #3010 from kylog/issue/pup-3129/delete-_timestamp-from…
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
6aece3f75a8b (PUP-3129) Do not store _timestamp fact in immutable hash
Author
Henrik Lindberg <henrik.lindberg@cloudsmith.com>
Browse Repository
No Builds
No Audits
fe2067e1b9e9 (docs) Clarify that the file type's mode attribute expects a string, not a…
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
dc8b6abe5305 (docs) Clarify description and error message for http_proxy_password setting
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
49ab44e56787 Merge pull request #2946 from highb/pup-2040-pmtignore
Author
Anderson Mills <anderson@puppetlabs.com>
Browse Repository
No Builds
No Audits
4be5411ca26e (docs) Document special value for yumrepo's proxy attribute
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
14a85f776fcb (docs) Add note about install_options to pacman provider
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
eecedc71312d (PUP-2040) Update vendoring instructions
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
42d7292472fb (PUP-2040) .pmtignore spec tests
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
91adc5502136 (PUP-796) Deprecate CouchDB facts terminus (docs only)
Author
Nick Fagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
6e939292594f (PUP-2040) .pmtignore and .gitignore for build
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (22)

Path

Size

lib/

puppet/

defaults.rb

indirector/

facts/

couch.rb

module_tool/

applications/

builder.rb

parser/

scope.rb

provider/

package/

pacman.rb

type/

file/

vendor/

spec/

unit/

module_tool/

applications/

builder_spec.rb

rPU3c663009ec44

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/indirector/facts/couch.rb

View Options

lib/puppet/module_tool/applications/builder.rb

View Options

lib/puppet/parser/scope.rb

View Options

lib/puppet/provider/package/pacman.rb

View Options

lib/puppet/type/file/mode.rb

View Options

lib/puppet/type/yumrepo.rb

View Options

lib/puppet/vendor.rb

View Options

lib/puppet/vendor/load_pathspec.rb

View Options

lib/puppet/vendor/pathspec/CHANGELOG.md

View Options

lib/puppet/vendor/pathspec/LICENSE

View Options

lib/puppet/vendor/pathspec/PUPPET_README.md

View Options

lib/puppet/vendor/pathspec/README.md

View Options

lib/puppet/vendor/pathspec/lib/pathspec.rb

View Options

lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb

View Options

lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb

View Options

lib/puppet/vendor/pathspec/lib/pathspec/spec.rb

View Options

lib/puppet/vendor/require_vendored.rb

View Options

spec/unit/module_tool/applications/builder_spec.rb

Merge branch 'master' into puppet-43c663009ec44UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (22)

rPU3c663009ec44

lib/puppet/defaults.rb

lib/puppet/indirector/facts/couch.rb

lib/puppet/module_tool/applications/builder.rb

lib/puppet/parser/scope.rb

lib/puppet/provider/package/pacman.rb

lib/puppet/type/file/mode.rb

lib/puppet/type/yumrepo.rb

lib/puppet/vendor.rb

lib/puppet/vendor/load_pathspec.rb

lib/puppet/vendor/pathspec/CHANGELOG.md

lib/puppet/vendor/pathspec/LICENSE

lib/puppet/vendor/pathspec/PUPPET_README.md

lib/puppet/vendor/pathspec/README.md

lib/puppet/vendor/pathspec/lib/pathspec.rb

lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb

lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb

lib/puppet/vendor/pathspec/lib/pathspec/spec.rb

lib/puppet/vendor/require_vendored.rb

spec/unit/module_tool/applications/builder_spec.rb

Merge branch 'master' into puppet-4
3c663009ec44Unpublished
Actions