puppet into 2.6.next
adb8c7994ea7Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next

Details

Provenance

Markus Roberts <Markus@reality.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU443eba9b7a85: Merge remote branch 'jamtur01/tickets/2.6.x/1657' into 2.6.next
rPU517c6794606e: Merge branch '2.6.next' into 2.6.x

Branches

Unknown

Tags

Unknown

Event Timeline

Markus Roberts <Markus@reality.com> committed rPUadb8c7994ea7: Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next (authored by Markus Roberts <Markus@reality.com>).Feb 2 2011, 1:22 AM

Merged Changes

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

443eba9b7a85 Merge remote branch 'jamtur01/tickets/2.6.x/1657' into 2.6.next
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
2d4fb3a609f3 Merge branch 'ticket/2.6.next/3165' into 2.6.next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
90f84fd613c6 Merge commit 'f279f2c24ad1c87940eca3592f4c6e2f5676c694' into 2.6.next
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
f279f2c24ad1 Fixed #4968 - Updated list of options turned on by --test in documentation
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
b29f86487581 Merge branch 'feature/master/5061' into 2.6.next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
846012158d08 Merge branch 'ticket/2.6.next/5045' into 2.6.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
9550a884b791 Merge branch 'tickets/2.6.x/2096' into 2.6.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
ce5a2bf3ba66 (#5061) - allow special hostclass/define variables to be evaluated as defaults.
Author
Dan Bode <bodepd@gmail.com>
Browse Repository
No Builds
No Audits
1ab9bd833237 Merge branch 'ticket/2.6.next/6107' into 2.6.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
fd73874147a1 (#6107) Fix an error when auditing a file with empty content
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
8625dc960776 Merge branch 'issues/2.6.next/5566' into 2.6.next
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
530496b00d48 Remove already initialized constant warning from file_spec.rb tests
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
c78d5d1f6711 Merge branch 'issues/2.6.next/5566' into 2.6.next
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
76788f80aab1 (#5566) Treat source only File checksums as syntax errors when used with content
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
d6572921832c Rename variable used in File type validation to be more clear
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
3398139f29d2 Remove invalid "timestamp" and "time", and add missing "ctime" File checksum…
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
6c93eb2c142e Remove order dependency when specifying source and checksum on File type
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
1a78484a0d68 Merge remote branch 'jamtur01/tickets/2.6.x/3646' into 2.6.next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
f135a6436084 Merge branch 'bug/2.6.next/5755' into 2.6.next
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
3a125d486ba4 Bug #5755 -- ZAML generates extra newline in some hash backreferences.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
5bba59a7126e Merge branch 'bug/2.6.next/5681-aix-mount-output' into 2.6.next
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
50c12e55b6f8 bug #5681 -- code fix to handle AIX mount output
Author
Rick Bradley <rick@rickbradley.com>
Browse Repository
No Builds
No Audits
139760bfa7d7 Bug #5681 -- parse AIX mount command output.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
2f74d83f22e0 Spec for #5681 to allow parsing of AIX mount output in mount provider
Author
Rick Bradley <rick@rickbradley.com>
Browse Repository
No Builds
No Audits
8de9b9aeadce Merge branch 'bug/2.6.next/6091-multiple-slashes-in-path-are-legal' into 2.6.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
878f266fbf89 Fixed #6091 - Changed POSIX path matching to allow multiple leading slashes
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
eb97aa5f7cbf Bug #6091 -- test leading double-slash in filenames are allowed.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
95ebc00c4a52 Merge branch 'bug/2.6.next/6061-password-max-age' into 2.6.next
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
c50a48edb19e Fixed #6061 - Allowed -1 as password min/max age
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
bf44e72b1918 Bug #6061 -- verify that negative {min,max}_password_age are accepted.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
1dc6b42d5dba Merge branch 'bug/2.6.next/5855-freebsd-withenv' into 2.6.next
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
af1c1febd6ae Feature #5855 -- fix withenv call in freebsd package provider
Author
fredrik-eriksson <fredrik.eriksson@loopia.se>
Browse Repository
No Builds
No Audits
d8716416746b Feature #5855 -- undefined method 'withenv' in FreeBSD package provider.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
3478190ce9b8 Merge branch 'bug/2.6.next/6009' into 2.6.next
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
f1ab58839b5f Fixed #6009 - nested member list vs directory service group provider
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
682f12a91fcf Merge branch 'ticket/2.6.next/5944' into 2.6.next
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
86a2a0031fda (#5944) Remove documentation of define() when used on nodes, as it is not a…
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
2b9f6535d46e (#5944) Further edits of inline defined() documentation.
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
5d108e8007b7 (#5944) Improve documentation of defined() function
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
e0eaf3a40d1c Merge branch 'ticket/2.6.next/5594' into 2.6.next
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
7d38ab24fa37 (#5594) Update documentation of exec resource type.
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
f4e002eee99f Merge branch 'ticket/2.6.next/5931' into 2.6.next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
67e1bba154ac (#5931) Prevent errors when calling insync? on audited properties
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
0f9d23617e41 Maint: Removed dead code from resource harness.
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
0765afbd2459 Maint: Rename misleading insync? method in file provider
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
6075f8fd98b0 Merge branch 'ticket/2.6.next/5548' into 2.6.next
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
0084b082df01 (#5548) Specify return values of manual status commands in service type…
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
3cfbd0722c5f (#5045) Cleaning up some tests and code
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
a2036ea69399 (#5045) External node classifiers should be able to specify params for classes
Author
Dan Bode <bodepd@gmail.com>
Browse Repository
No Builds
No Audits
18ca97b0d16f (#5045) Adds support to resource/type to also accept a param hash
Author
Dan Bode <bodepd@gmail.com>
Browse Repository
No Builds
No Audits

Changes (58)

Path

Size

lib/

puppet/

indirector/

resource/

parser/

functions/

property/

provider/

file/

nameservice/

package/

zone/

reference/

resource/

transaction/

type/

file/

util/

command_line/

spec/

fixtures/

unit/

provider

mount

mount-output.aix.txt

unit/

parser/

property/

provider/

directoryservice_spec.rb

package/

freebsd_spec.rb

resource/

type_spec.rb

type/

file/

ssh_authorized_key_spec.rb

user_spec.rb

zpool_spec.rb

util/

zaml_spec.rb

rPUadb8c7994ea7

View Options

lib/puppet/indirector/resource/ral.rb

View Options

lib/puppet/parser/compiler.rb

View Options

lib/puppet/parser/functions/defined.rb

View Options

lib/puppet/property.rb

View Options

lib/puppet/property/keyvalue.rb

View Options

lib/puppet/property/list.rb

View Options

lib/puppet/provider/file/posix.rb

View Options

lib/puppet/provider/file/win32.rb

View Options

lib/puppet/provider/mount.rb

View Options

lib/puppet/provider/nameservice/directoryservice.rb

View Options

lib/puppet/provider/package/freebsd.rb

View Options

lib/puppet/provider/zone/solaris.rb

View Options

lib/puppet/reference/configuration.rb

View Options

lib/puppet/resource/type.rb

View Options

lib/puppet/transaction/resource_harness.rb

View Options

lib/puppet/type.rb

View Options

lib/puppet/type/cron.rb

View Options

lib/puppet/type/exec.rb

View Options

lib/puppet/type/file.rb

View Options

lib/puppet/type/file/checksum.rb

View Options

lib/puppet/type/file/content.rb

View Options

lib/puppet/type/file/owner.rb

View Options

lib/puppet/type/file/source.rb

View Options

lib/puppet/type/file/target.rb

View Options

lib/puppet/type/host.rb

View Options

lib/puppet/type/mount.rb

View Options

lib/puppet/type/package.rb

View Options

lib/puppet/type/service.rb

View Options

lib/puppet/type/user.rb

View Options

lib/puppet/type/yumrepo.rb

View Options

lib/puppet/type/zpool.rb

View Options

lib/puppet/util/checksums.rb

View Options

lib/puppet/util/command_line/puppetd

View Options

lib/puppet/util/command_line/puppetmasterd

View Options

lib/puppet/util/zaml.rb

View Options

spec/fixtures/unit/provider/mount/mount-output.aix.txt

View Options

spec/unit/parser/compiler_spec.rb

View Options

spec/unit/property/keyvalue_spec.rb

View Options

spec/unit/property/list_spec.rb

View Options

spec/unit/provider/mount_spec.rb

View Options

spec/unit/provider/nameservice/directoryservice_spec.rb

View Options

spec/unit/provider/package/freebsd_spec.rb

View Options

spec/unit/resource/type_spec.rb

View Options

spec/unit/type/file/content_spec.rb

View Options

spec/unit/type/file/ensure_spec.rb

View Options

spec/unit/type/file/group_spec.rb

View Options

spec/unit/type/file/owner_spec.rb

View Options

spec/unit/type/file/selinux_spec.rb

View Options

spec/unit/type/file_spec.rb

View Options

spec/unit/type/mount_spec.rb

View Options

spec/unit/type/ssh_authorized_key_spec.rb

View Options

spec/unit/type/user_spec.rb

View Options

spec/unit/type/zpool_spec.rb

View Options

spec/unit/util/zaml_spec.rb

Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.nextadb8c7994ea7UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (58)

rPUadb8c7994ea7

lib/puppet/indirector/resource/ral.rb

lib/puppet/parser/compiler.rb

lib/puppet/parser/functions/defined.rb

lib/puppet/property.rb

lib/puppet/property/keyvalue.rb

lib/puppet/property/list.rb

lib/puppet/provider/file/posix.rb

lib/puppet/provider/file/win32.rb

lib/puppet/provider/mount.rb

lib/puppet/provider/nameservice/directoryservice.rb

lib/puppet/provider/package/freebsd.rb

lib/puppet/provider/zone/solaris.rb

lib/puppet/reference/configuration.rb

lib/puppet/resource/type.rb

lib/puppet/transaction/resource_harness.rb

lib/puppet/type.rb

lib/puppet/type/cron.rb

lib/puppet/type/exec.rb

lib/puppet/type/file.rb

lib/puppet/type/file/checksum.rb

lib/puppet/type/file/content.rb

lib/puppet/type/file/owner.rb

lib/puppet/type/file/source.rb

lib/puppet/type/file/target.rb

lib/puppet/type/host.rb

lib/puppet/type/mount.rb

lib/puppet/type/package.rb

lib/puppet/type/service.rb

lib/puppet/type/user.rb

lib/puppet/type/yumrepo.rb

lib/puppet/type/zpool.rb

lib/puppet/util/checksums.rb

lib/puppet/util/command_line/puppetd

lib/puppet/util/command_line/puppetmasterd

lib/puppet/util/zaml.rb

spec/fixtures/unit/provider/mount/mount-output.aix.txt

spec/unit/parser/compiler_spec.rb

spec/unit/property/keyvalue_spec.rb

spec/unit/property/list_spec.rb

spec/unit/provider/mount_spec.rb

spec/unit/provider/nameservice/directoryservice_spec.rb

spec/unit/provider/package/freebsd_spec.rb

spec/unit/resource/type_spec.rb

spec/unit/type/file/content_spec.rb

spec/unit/type/file/ensure_spec.rb

spec/unit/type/file/group_spec.rb

spec/unit/type/file/owner_spec.rb

spec/unit/type/file/selinux_spec.rb

spec/unit/type/file_spec.rb

spec/unit/type/mount_spec.rb

spec/unit/type/ssh_authorized_key_spec.rb

spec/unit/type/user_spec.rb

spec/unit/type/zpool_spec.rb

spec/unit/util/zaml_spec.rb

Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next
adb8c7994ea7Unpublished
Actions