Merge remote-tracking branch 'upstream/2.7.x' into 2.7rc
c00e8f243029Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/2.7.x' into 2.7rc

Details

Provenance

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

Parents

rPU04fbccdb05aa: Try again to avoid circular dependency in file indirections
rPU2baceaa92c7d: Merge pull request #927 from joshcooper/ticket/2.7.x/14964-close-unlink

Branches

Unknown

Tags

Unknown

Event Timeline

Andrew Parker <andy@puppetlabs.com> committed rPUc00e8f243029: Merge remote-tracking branch 'upstream/2.7.x' into 2.7rc (authored by Andrew Parker <andy@puppetlabs.com>).Jul 13 2012, 10:34 PM

Merged Changes

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

2baceaa92c7d Merge pull request #927 from joshcooper/ticket/2.7.x/14964-close-unlink
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
125ececa4a19 (Maint) Spec test wasn't testing anything
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
4c18d085e0b9 (#14964) Unlink Tempfiles consistently across different ruby versions
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
690c39bbe2c9 (Maint) Require the right file for md5
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
44ada582453e Extract host validation in store report processor
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
91df2f352921 Use cross-platform absolute paths in file_serving tests
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
d20d46583bde Merge pull request #910 from Whopper92/puppet_module_dir
Author
Matthaus Litteken <mlitteken@gmail.com>
Browse Repository
No Builds
No Audits
59f4226b6469 Merge pull request #866 from Whopper92/logrotate_update
Author
Matthaus Litteken <mlitteken@gmail.com>
Browse Repository
No Builds
No Audits
c48bd17b34c7 Merge pull request #798 from zaphod42/bug/2.7.x/14400-user-resources-generate…
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
fe5688aa144a Merge pull request #918 from joshcooper/maint/2.7.x/updated-README_DEVELOPER
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
17f13370d9fb Merge pull request #911 from nfagerlund/maint/2.7.x/file_replace_default_value
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
79b4e6c311a6 Merge pull request #922 from nfagerlund/maint/2.7.x/wether
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
c7e4ca7fcd24 (#15221) Create /etc/puppet/modules directory for puppet module tool
Author
Will Hopper <whopper@puppetlabs.com>
Browse Repository
No Builds
No Audits
c05489b39f85 (Maint:) Fix bad doc strings for two settings ("wether")
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
33fce7305e48 Try again to avoid circular dependency in file indirections
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
b227aa103f49 Remove useless tests for Envelope
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
86ccca4494d1 Clear deprecation warnings between tests
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
d7078c3ba04a Avoid circular requirement in FileMetadata indirection
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
03d546e36193 (Maint) Document common Windows issues
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
8aa738340157 Merge remote-tracking branch 'cve/2.7rc' into 2.7.x
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
ecc52ed6dd10 Merge pull request #851 from joshcooper/ticket/2.7.x/11868-msi-provider
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
761b48f8f4cd (#11868) Use `Installer` automation interface to query package state
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
3f5454abbd1a Merge pull request #912 from daniel-pittman/maint/2.7.x/tests-must-use-must-not…
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
e13e751bd47d Merge pull request #913 from daniel-pittman/perf/2.7.x/eliminate-require-in…
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
37742db73df7 Eliminate require calls at runtime.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
be5fcf4e7d3c Fix broken TransBucket transformation tests.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
8f991875ccda Fix broken ability to remove resources from the catalog.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
9bd4fd317af1 Fix type check when transforming catalog.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
825b80d31bc9 Fix all trivial "should to must" errors in our tests.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
7a7bea767722 Enforce "must not should" on Puppet::Type instances in tests.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
566bdd95bced Maint: Note in docs that the file type's "replace" attribute defaults to true
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
c737f5066e6a Merge pull request #828 from joshcooper/ticket/2.7.x/set-scheduled-tasks
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
3316a7df176a Merge pull request #849 from joshcooper/ticket/2.7.x/14964-unlink-tempfile
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
82f234989353 Merge pull request #861 from joshcooper/ticket/2.7.x/13489-service-refresh
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
831b970601aa Initialize resources strictly in backup specs
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0a07ee5afff6 Refactor file backup specs
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
8c5826f2056e (maint) Add tags to .gitingore
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
8fbc27f293cd Merge pull request #894 from kbarber/ticket/2.7.x/14715-solaris_pmt_gnu_tar
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
df242de3ffea Merge pull request #896 from pcarlisle/maint/2.7.x/sqlite-memory-db
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0eef289b9cb1 Use in memory sqlite database for unit tests
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0bbd16568359 (#14715) Use gtar with 'puppet module install' on Solaris
Author
Ken Barber <ken@bob.sh>
Browse Repository
No Builds
No Audits
de4976e46387 Merge branch 'ticket/2.7.x/14740-ordering-error' of https://github.
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
6fa20bfb8b0f Stub pkginfo when installing in openbsd spec
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
730c149515cf Merge pull request #878 from domcleal/tickets/2.7.x/15078
Author
nfagerlund <nick.fagerlund@puppetlabs.com>
Browse Repository
No Builds
No Audits
a274e45196f3 Merge pull request #881 from kbarber/ticket/2.7.x/14962-pmt_relative_modulepath
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
39f0bf443b55 (#14962) PMT doesn't support setting a relative modulepath
Author
Ken Barber <ken@bob.sh>
Browse Repository
No Builds
No Audits
39f425fec2d7 (#15078) Document USR2 log rotation signal
Author
Dominic Cleal <dcleal@redhat.com>
Browse Repository
No Builds
No Audits
d41b6d2d8103 Merge pull request #871 from Whopper92/createpackage_update
Author
Matthaus Litteken <mlitteken@gmail.com>
Browse Repository
No Builds
No Audits
300fce9193dd (#14909) Update createpackage.sh to resolve permissions issues
Author
Will Hopper <whopper@puppetlabs.com>
Browse Repository
No Builds
No Audits
be829aeb0a43 Merge branch '2.7rc' into 2.7.x
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (91)

Path

Size

.gitignore

README_DEVELOPER.md

acceptance/

tests/

modules/

install/

with_modulepath.rb

list/

with_modulepath.rb

uninstall/

with_modulepath.rb

resource/

scheduled_task/

ticket_13489_service_refresh.pp

conf/

osx/

createpackage.sh

redhat/

logrotate

puppet.spec

lib/

puppet/

application/

agent.rb

master.rb

defaults.rb

face/

module/

file_bucket/

indirector/

interface/

module_tool/

applications/

unpacker.rb

network/

handler/

fileserver.rb

parser/

functions/

provider/

augeas/

augeas.rb

package/

msi.rb

scheduled_task/

win32_taskscheduler.rb

service/

rails/

reports/

resource/

ssl/

test/

type/

util/

windows/

man/

man8/

puppet-agent.8

puppet-master.8

puppetmasterd.8

spec/

fixtures/

unit/

provider/

	augeas/	augeas/	etc/
		mount/	parsed/

	fstab
	linux.fstab

integration/

type/

file_spec.rb

lib/

puppet_spec/

database.rb

files.rb

monkey_patches/

alias_should_to_must.rb

shared_behaviours/

file_serving_model.rb

unit/

face/

module/

install_spec.rb

indirector/

envelope_spec.rb

module_tool/

applications/

unpacker_spec.rb

other/

transbucket_spec.rb

parser/

functions/

create_resources_spec.rb

provider/

augeas/

augeas_spec.rb

package/

msi_spec.rb

openbsd_spec.rb

scheduled_task/

win32_taskscheduler_spec.rb

service/

reports/

resource/

type/

scheduled_task_spec.rb

util/

test/

ral/

manager/

attributes.rb

rPUc00e8f243029

View Options

.gitignore

View Options

README_DEVELOPER.md

View Options

acceptance/tests/modules/install/with_modulepath.rb

View Options

acceptance/tests/modules/list/with_modulepath.rb

View Options

acceptance/tests/modules/uninstall/with_modulepath.rb

View Options

acceptance/tests/resource/scheduled_task/should_create.rb

View Options

acceptance/tests/resource/scheduled_task/should_destroy.rb

View Options

acceptance/tests/resource/scheduled_task/should_modify.rb

View Options

acceptance/tests/resource/scheduled_task/should_query.rb

View Options

acceptance/tests/ticket_13489_service_refresh.pp

View Options

conf/osx/createpackage.sh

View Options

conf/redhat/logrotate

View Options

conf/redhat/puppet.spec

View Options

lib/puppet/application/agent.rb

View Options

lib/puppet/application/master.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/face/module/install.rb

View Options

lib/puppet/file_bucket/dipper.rb

View Options

lib/puppet/indirector/indirection.rb

View Options

lib/puppet/interface/action_manager.rb

View Options

lib/puppet/module_tool/applications/unpacker.rb

View Options

lib/puppet/network/handler/fileserver.rb

View Options

lib/puppet/parser/functions/fqdn_rand.rb

View Options

lib/puppet/parser/functions/md5.rb

View Options

lib/puppet/parser/functions/sha1.rb

View Options

lib/puppet/parser/functions/template.rb

View Options

lib/puppet/parser/type_loader.rb

View Options

lib/puppet/provider/augeas/augeas.rb

View Options

lib/puppet/provider/package/msi.rb

View Options

lib/puppet/provider/scheduled_task/win32_taskscheduler.rb

View Options

lib/puppet/provider/service/windows.rb

View Options

lib/puppet/rails/benchmark.rb

View Options

lib/puppet/reports/store.rb

View Options

lib/puppet/resource/catalog.rb

View Options

lib/puppet/resource/type_collection.rb

View Options

lib/puppet/ssl/base.rb

View Options

lib/puppet/test/test_helper.rb

View Options

lib/puppet/type.rb

View Options

lib/puppet/type/augeas.rb

View Options

lib/puppet/type/file.rb

View Options

lib/puppet/type/scheduled_task.rb

View Options

lib/puppet/util.rb

View Options

lib/puppet/util/autoload.rb

View Options

lib/puppet/util/checksums.rb

View Options

lib/puppet/util/diff.rb

View Options

lib/puppet/util/filetype.rb

View Options

lib/puppet/util/run_mode.rb

View Options

lib/puppet/util/suidmanager.rb

View Options

lib/puppet/util/windows/user.rb

View Options

man/man8/puppet-agent.8

View Options

man/man8/puppet-master.8

View Options

man/man8/puppetmasterd.8

View Options

spec/fixtures/unit/provider/augeas/augeas/augeas/lenses/test.aug

View Options

spec/fixtures/unit/provider/augeas/augeas/etc/fstab

View Options

spec/fixtures/unit/provider/augeas/augeas/etc/hosts

View Options

spec/fixtures/unit/provider/augeas/augeas/etc/test

View Options

spec/fixtures/unit/provider/augeas/augeas/test.aug

View Options

spec/integration/type/file_spec.rb

View Options

spec/lib/puppet_spec/database.rb

View Options

spec/lib/puppet_spec/files.rb

View Options

spec/monkey_patches/alias_should_to_must.rb

View Options

spec/shared_behaviours/file_serving_model.rb

View Options

spec/unit/face/module/install_spec.rb

View Options

spec/unit/indirector/envelope_spec.rb

View Options

spec/unit/module_tool/applications/unpacker_spec.rb

View Options

spec/unit/other/transbucket_spec.rb

View Options

spec/unit/parser/functions/create_resources_spec.rb

View Options

spec/unit/provider/augeas/augeas_spec.rb

View Options

spec/unit/provider/package/msi_spec.rb

View Options

spec/unit/provider/package/openbsd_spec.rb

View Options

spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb

View Options

spec/unit/provider/service/windows_spec.rb

View Options

spec/unit/reports/store_spec.rb

View Options

spec/unit/resource/catalog_spec.rb

View Options

spec/unit/resource_spec.rb

View Options

spec/unit/transaction_spec.rb

View Options

spec/unit/type/file_spec.rb

View Options

spec/unit/type/interface_spec.rb

View Options

spec/unit/type/scheduled_task_spec.rb

View Options

spec/unit/type/tidy_spec.rb

View Options

spec/unit/type/vlan_spec.rb

View Options

spec/unit/type_spec.rb

View Options

spec/unit/util/backups_spec.rb

View Options

spec/unit/util_spec.rb

View Options

test/ral/manager/attributes.rb

Merge remote-tracking branch 'upstream/2.7.x' into 2.7rcc00e8f243029UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (91)

rPUc00e8f243029

.gitignore

README_DEVELOPER.md

acceptance/tests/modules/install/with_modulepath.rb

acceptance/tests/modules/list/with_modulepath.rb

acceptance/tests/modules/uninstall/with_modulepath.rb

acceptance/tests/resource/scheduled_task/should_create.rb

acceptance/tests/resource/scheduled_task/should_destroy.rb

acceptance/tests/resource/scheduled_task/should_modify.rb

acceptance/tests/resource/scheduled_task/should_query.rb

acceptance/tests/ticket_13489_service_refresh.pp

conf/osx/createpackage.sh

conf/redhat/logrotate

conf/redhat/puppet.spec

lib/puppet/application/agent.rb

lib/puppet/application/master.rb

lib/puppet/defaults.rb

lib/puppet/face/module/install.rb

lib/puppet/file_bucket/dipper.rb

lib/puppet/indirector/indirection.rb

lib/puppet/interface/action_manager.rb

lib/puppet/module_tool/applications/unpacker.rb

lib/puppet/network/handler/fileserver.rb

lib/puppet/parser/functions/fqdn_rand.rb

lib/puppet/parser/functions/md5.rb

lib/puppet/parser/functions/sha1.rb

lib/puppet/parser/functions/template.rb

lib/puppet/parser/type_loader.rb

lib/puppet/provider/augeas/augeas.rb

lib/puppet/provider/package/msi.rb

lib/puppet/provider/scheduled_task/win32_taskscheduler.rb

lib/puppet/provider/service/windows.rb

lib/puppet/rails/benchmark.rb

lib/puppet/reports/store.rb

lib/puppet/resource/catalog.rb

lib/puppet/resource/type_collection.rb

lib/puppet/ssl/base.rb

lib/puppet/test/test_helper.rb

lib/puppet/type.rb

lib/puppet/type/augeas.rb

lib/puppet/type/file.rb

lib/puppet/type/scheduled_task.rb

lib/puppet/util.rb

lib/puppet/util/autoload.rb

lib/puppet/util/checksums.rb

lib/puppet/util/diff.rb

lib/puppet/util/filetype.rb

lib/puppet/util/run_mode.rb

lib/puppet/util/suidmanager.rb

lib/puppet/util/windows/user.rb

man/man8/puppet-agent.8

man/man8/puppet-master.8

man/man8/puppetmasterd.8

spec/fixtures/unit/provider/augeas/augeas/augeas/lenses/test.aug

spec/fixtures/unit/provider/augeas/augeas/etc/fstab

spec/fixtures/unit/provider/augeas/augeas/etc/hosts

spec/fixtures/unit/provider/augeas/augeas/etc/test

spec/fixtures/unit/provider/augeas/augeas/test.aug

spec/integration/type/file_spec.rb

spec/lib/puppet_spec/database.rb

spec/lib/puppet_spec/files.rb

spec/monkey_patches/alias_should_to_must.rb

spec/shared_behaviours/file_serving_model.rb

spec/unit/face/module/install_spec.rb

spec/unit/indirector/envelope_spec.rb

spec/unit/module_tool/applications/unpacker_spec.rb

spec/unit/other/transbucket_spec.rb

spec/unit/parser/functions/create_resources_spec.rb

spec/unit/provider/augeas/augeas_spec.rb

spec/unit/provider/package/msi_spec.rb

spec/unit/provider/package/openbsd_spec.rb

spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb

spec/unit/provider/service/windows_spec.rb

Merge remote-tracking branch 'upstream/2.7.x' into 2.7rc
c00e8f243029Unpublished
Actions