Diffusion puppet 9d08fed3602a

Merge branch '2.7.x'
9d08fed3602aUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

Details

Provenance

Nick Lewis <nick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU45f0855bd6be: Merge pull request #284 from MaxMartin/ticket/2.7.x/10109-composite-namevars
rPU9b7c73a74d5d: Merge branch 'add-pkgin-provider'

Branches

Unknown

Tags

Unknown

Event Timeline

Nick Lewis <nick@puppetlabs.com> committed rPU9d08fed3602a: Merge branch '2.7.x' (authored by Nick Lewis <nick@puppetlabs.com>).Dec 17 2011, 12:50 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

45f0855bd6be Merge pull request #284 from MaxMartin/ticket/2.7.x/10109-composite-namevars
Author
lifton <lifton@puppetlabs.com>
Browse Repository
No Builds
No Audits
788d9368cb33 Merge pull request #282 from jhelwig/last-run-summary-permissions-on-windows
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
8ec608644d8b Account for Windows file mode translation for lastrunfile
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
e40439196af1 Merge branch 'tickets/2.7.x/7106-last-run-summary-permissions' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
b28cac8bea0e (#7106) Obey specified owner, group, and permissions for last run summary file
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
4cc1142da35e Merge pull request #280 from joshcooper/ticket/2.7.x/10586-file-sourcing-from…
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
a08370db73c2 Merge pull request #281 from joshcooper/ticket/2.7.x/11408-fact-plugin-sync
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
b8c5ee2172e5 (#11408) Fix fact and plugin sync on Windows
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
d4d3cb363eae (#10586) Don't copy owner and group when sourcing files from master
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
933844567fbe Merge pull request #279 from pcarlisle/tickets/2.7.x/7428-cert-ruby-1.9.2-issues
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
1519d30b1f1e (#7428) Fix option parsing for ruby 1.9 in cert application
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
2717c55076ea Merge pull request #278 from nfagerlund/ticket/2.7.x/11404-type-reference…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
213cecc80a2f Revert "(#11423) Clearer error message about duplicate imported resources."
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
e8e1f577ba09 (#11423) Clearer error message about duplicate imported resources.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
ff396bfe35ae Maint: Fix redhatfedorasusecentosslesoelovm in type reference
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
6682fe7f11c2 Maint: Padding should be added when dochook strings are consumed, not hardcoded…
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
b569c7e9720e (#11404) Fix broken and unreliable indentation in provider lists in type…
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
c15d997379a8 Maint: Make indentation for markdown definition lists more readable and reliable
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
e80ca2d8e781 (#11404) Move markdown_header and markdown_definitionlist to Puppet::Util::Docs
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
7da15bfbcfd6 Merge branch 'tickets/2.7.x/11333-fix-ensurable' into 2.7.x
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
471fb589a42c (#11333) Make Puppet::Type.ensurable? false when exists? is undefined
Author
Ilya Sher <ilya.sher@coding-knight.com>
Browse Repository
No Builds
No Audits
04b027b8d4a4 Merge branch 'tickets/2.7.x/10676' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
31cef941a7d3 Add config and puppet version to the last run summary file
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
f71af6f690a4 (#10676) Include all resource statuses in reports regardless of count
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
40313fa143ed Merge remote-tracking branch 'jhelwig/tickets/2.7.x/8062-yum-epoch' into 2.7.x
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
2eff2fab91aa Merge branch 'apache2-conf-fix' of git://github.com/eklein/puppet into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
2be44d40dbcc (#8062) Consider package epoch version when comparing yum package versions
Author
Jude Nagurney <jude@pwan.org>
Browse Repository
No Builds
No Audits
8ae917aaeabc Merge branch 'tickets/2.7.x/6412' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
e9a5116f945a (#6412) Return :undef when accessing non-existing hash/array elements
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
b9dcf4b33aeb Merge remote-tracking branch 'stschulte/ticket/2.7.x/9544' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
f4bf4f46f021 Merge branch '4865-notify-start-of-evaluation' into 2.7.x
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
cbd78da1b8e1 (#4865) Log when we start evaluating resources at the info level
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
e465598ab1b7 Merge remote-tracking branch 'daniel-pittman/feature/2.7.x/4865-notify-start-of…
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
56fbe018bb7e Merge pull request #267 from mmrobins/maint/2.7.x/add_tap
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
e8f140788c3b maint: Add tap to fix Ruby 1.8.5 failures
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
bfcb5084d852 Merge branch '10321-rangearray' into 2.7.x
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
ddde61ec3f02 (#10321) Fix array support in schedule's range parameter
Author
Sean Millichamp <sean@bruenor.org>
Browse Repository
No Builds
No Audits
0be9f5c9e9af Merge branch '2.7rc' into 2.7.x
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
87f6f0546f25 Update CHANGELOG for 2.7.9 release
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
234afdf23ad9 Merge branch 'fix-1.8.5-incompatibilities' into 2.7rc
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
da11dc71b0fc Fix Ruby 1.8.5-incompatible code in FileBucket::Dipper spec
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
737c2f66476b Fix Ruby 1.8.5-incompatible code in Transaction#eval_generate
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
042925dfca3b Fix Ruby 1.8.5-incompatible code in spec setup
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0022f4712748 Revert "Build a Rake task for building Apple Packages"
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
4af4e79c3b2b Merge branch '2.7rc' into 2.7.x
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
2ae312f09bbb Merge pull request #261 from jeffmccune/minor/2.7.
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
3265b2c2c280 Updating CHANGELOG for 2.7.8 release
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
8d83c4e218be (maint) Fix grammar mistakes in README_DEVELOPER
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
8cca3770ee08 Build a Rake task for building Apple Packages
Author
Gary Larizza <gary@puppetlabs.com>
Browse Repository
No Builds
No Audits
4275fd498528 (#11291) Update description of show_diff setting to match behavior as of 2.7.8
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits

Changes (146)

Path

Size

README_DEVELOPER.md

conf/

redhat/

solaris/

suse/

ext/

puppetstoredconfigclean.rb

rack/

files/

lib/

puppet/

application/

configurer/

face/

applications.rb

contents_description.rb

interrogation.rb

network/

http/

api/

parser/

ast/

functions/

create_resources.rb

provider/

package/

rails/

database/

resource/

transaction/

type/

file/

util/

monkey_patches.rb

queue/

spec/

fixtures/

releases/

jamtur01-apache

vhost-default.conf.erb

integration/

configurer_spec.rb

module_tool_spec.rb

provider/

package_spec.rb

util/

windows/

security_spec.rb

unit/

application/

configurer/

downloader_spec.rb

configurer_spec.rb

face/

changes_spec.rb

generate_spec.rb

install_spec.rb

file_bucket/

application_spec.rb

metadata_spec.rb

repository_spec.rb

module_tool_spec.rb

network/

http/

api/

parser/

ast/

functions/

create_resources_spec.rb

provider/

package/

transaction/

type/

file/

schedule_spec.rb

util/

queue/

reference_spec.rb

rPU9d08fed3602a

CHANGELOG

Loading...

README_DEVELOPER.md

Loading...

conf/redhat/puppet.spec

Loading...

conf/solaris/pkginfo

Loading...

conf/suse/puppet.spec

Loading...

ext/puppetstoredconfigclean.rb

Loading...

ext/rack/files/apache2.conf

Loading...

lib/puppet.rb

Loading...

lib/puppet/application/agent.rb

Loading...

lib/puppet/application/apply.rb

Loading...

lib/puppet/application/cert.rb

Loading...

lib/puppet/application/module.rb

Loading...

lib/puppet/configurer.rb

Loading...

lib/puppet/configurer/downloader.rb

Loading...

lib/puppet/defaults.rb

Loading...

lib/puppet/face/module.rb

Loading...

lib/puppet/face/module/build.rb

Loading...

lib/puppet/face/module/changes.rb

Loading...

lib/puppet/face/module/clean.rb

Loading...

lib/puppet/face/module/generate.rb

Loading...

lib/puppet/face/module/install.rb

Loading...

lib/puppet/face/module/search.rb

Loading...

lib/puppet/module_tool.rb

Loading...

lib/puppet/module_tool/applications.rb

Loading...

lib/puppet/module_tool/applications/application.rb

Loading...

lib/puppet/module_tool/applications/builder.rb

Loading...

lib/puppet/module_tool/applications/checksummer.rb

Loading...

lib/puppet/module_tool/applications/cleaner.rb

Loading...

lib/puppet/module_tool/applications/generator.rb

Loading...

lib/puppet/module_tool/applications/installer.rb

Loading...

lib/puppet/module_tool/applications/searcher.rb

Loading...

lib/puppet/module_tool/applications/unpacker.rb

Loading...

lib/puppet/module_tool/cache.rb

Loading...

lib/puppet/module_tool/checksums.rb

Loading...

lib/puppet/module_tool/contents_description.rb

Loading...

lib/puppet/module_tool/dependency.rb

Loading...

lib/puppet/module_tool/metadata.rb

Loading...

lib/puppet/module_tool/modulefile.rb

Loading...

lib/puppet/module_tool/repository.rb

Loading...

lib/puppet/module_tool/skeleton.rb

Loading...

lib/puppet/module_tool/skeleton/templates/generator/Modulefile.erb

Loading...

lib/puppet/module_tool/skeleton/templates/generator/README.erb

Loading...

lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb

Loading...

lib/puppet/module_tool/skeleton/templates/generator/metadata.json

Loading...

lib/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb

Loading...

lib/puppet/module_tool/skeleton/templates/generator/tests/init.pp.erb

Loading...

lib/puppet/module_tool/utils.rb

Loading...

lib/puppet/module_tool/utils/interrogation.rb

Loading...

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

Loading...

lib/puppet/parser/ast/leaf.rb

Loading...

lib/puppet/parser/functions/create_resources.rb

Loading...

lib/puppet/provider.rb

Loading...

lib/puppet/provider/package/yum.rb

Loading...

lib/puppet/rails.rb

Loading...

lib/puppet/rails/database/schema.rb

Loading...

lib/puppet/resource/catalog.rb

Loading...

lib/puppet/transaction.rb

Loading...

lib/puppet/transaction/report.rb

Loading...

lib/puppet/type.rb

Loading...

lib/puppet/type/file.rb

Loading...

lib/puppet/type/file/ctime.rb

Loading...

lib/puppet/type/file/mtime.rb

Loading...

lib/puppet/type/file/source.rb

Loading...

lib/puppet/type/file/type.rb

Loading...

lib/puppet/type/schedule.rb

Loading...

lib/puppet/util/docs.rb

Loading...

lib/puppet/util/monkey_patches.rb

Loading...

lib/puppet/util/queue/stomp.rb

Loading...

lib/puppet/util/reference.rb

Loading...

lib/puppet/util/zaml.rb

Loading...

spec/fixtures/releases/jamtur01-apache/Modulefile

Loading...

spec/fixtures/releases/jamtur01-apache/files/httpd

Loading...

spec/fixtures/releases/jamtur01-apache/files/test.vhost

Loading...

spec/fixtures/releases/jamtur01-apache/lib/puppet/provider/a2mod/debian.rb

Loading...

spec/fixtures/releases/jamtur01-apache/lib/puppet/type/a2mod.rb

Loading...

spec/fixtures/releases/jamtur01-apache/manifests/dev.pp

Loading...

spec/fixtures/releases/jamtur01-apache/manifests/init.pp

Loading...

spec/fixtures/releases/jamtur01-apache/manifests/params.pp

Loading...

spec/fixtures/releases/jamtur01-apache/manifests/php.pp

Loading...

spec/fixtures/releases/jamtur01-apache/manifests/ssl.pp

Loading...

spec/fixtures/releases/jamtur01-apache/manifests/vhost.pp

Loading...

spec/fixtures/releases/jamtur01-apache/metadata.json

Loading...

spec/fixtures/releases/jamtur01-apache/templates/vhost-default.conf.erb

Loading...

spec/fixtures/releases/jamtur01-apache/tests/apache.pp

Loading...

spec/fixtures/releases/jamtur01-apache/tests/dev.pp

Loading...

spec/fixtures/releases/jamtur01-apache/tests/init.pp

Loading...

spec/fixtures/releases/jamtur01-apache/tests/php.pp

Loading...

spec/fixtures/releases/jamtur01-apache/tests/ssl.pp

Loading...

spec/fixtures/releases/jamtur01-apache/tests/vhost.pp

Loading...

spec/integration/configurer_spec.rb

Loading...

spec/integration/module_tool_spec.rb

Loading...

spec/integration/provider/package_spec.rb

Loading...

spec/integration/util/windows/security_spec.rb

Loading...

spec/unit/application/agent_spec.rb

Loading...

spec/unit/application/apply_spec.rb

Loading...

spec/unit/application/cert_spec.rb

Loading...

spec/unit/configurer/downloader_spec.rb

Loading...

spec/unit/configurer_spec.rb

Loading...

spec/unit/face/module/build_spec.rb

Loading...

spec/unit/face/module/changes_spec.rb

Loading...

spec/unit/face/module/clean_spec.rb

Loading...

spec/unit/face/module/generate_spec.rb

Loading...

spec/unit/face/module/install_spec.rb

Loading...

spec/unit/face/module/search_spec.rb

Loading...

spec/unit/face/module_spec.rb

Loading...

spec/unit/file_bucket/dipper_spec.rb

Loading...

spec/unit/module_tool/application_spec.rb

Loading...

spec/unit/module_tool/metadata_spec.rb

Loading...

spec/unit/module_tool/repository_spec.rb

Loading...

spec/unit/module_tool_spec.rb

Loading...

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

Loading...

spec/unit/parser/ast/leaf_spec.rb

Loading...

spec/unit/parser/functions/create_resources_spec.rb

Loading...

spec/unit/provider/package/yum_spec.rb

Loading...

spec/unit/rails_spec.rb

Loading...

spec/unit/transaction/report_spec.rb

Loading...

spec/unit/type/file/source_spec.rb

Loading...

spec/unit/type/file_spec.rb

Loading...

spec/unit/type/schedule_spec.rb

Loading...

spec/unit/type_spec.rb

Loading...

spec/unit/util/queue/stomp_spec.rb

Loading...

spec/unit/util/reference_spec.rb

Loading...

spec/unit/util/zaml_spec.rb

Loading...