Merge commit '2.6.2rc1'
da84c03a7d1fUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge commit '2.6.2rc1'

Details

Provenance

Jesse Wolfe <jes5199@gmail.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU917c520f1abc: Incremented version to 2.6.2
rPU0077379e5280: Merge commit '2.6.1'

Branches

Unknown

Tags

Unknown

Event Timeline

Jesse Wolfe <jes5199@gmail.com> committed rPUda84c03a7d1f: Merge commit '2.6.2rc1' (authored by Jesse Wolfe <jes5199@gmail.com>).Oct 1 2010, 8:35 PM

Merged Changes

917c520f1abc Incremented version to 2.6.2
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
900eae46029d Updated CHANGELOG for 2.6.2rc1
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
1b6094d20d0b Fixed documentation typo
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
bdf12fec3651 Fix for #4896 -- stray newline left over from removed diagnostic
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
e7424c69822a (#4772) Update SuSE .spec file
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
0aaa742e0f09 Fixes #4792 (Duplicate definition since 2.6.1 upgrade)
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
ea49d13192fc Improvement to #4025: made spec tests work on all platforms
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
0b4ce0898652 Adds #3046 - support for password min/max age
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
e9f9d26ff24f [#4783] (#4783) Fix RRDGraph report generation
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
34f87cfd74e5 Add user account expiry to the useradd type and provider
Author
Dean Wilson <dean.wilson@gmail.com>
Browse Repository
No Builds
No Audits
a7fb9b112025 Fixed #4025 (failure in launchd if certain plists are binary).
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
25738726526c Fix for #4649 -- avoid unsupported features on non-posix systems
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
eb9279c69d74 Fix for 4273 -- revert b7e2580ab49ecdb67fc9b522829c005fc3750fbe
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
53a2bea4ddad Fix for #4804 -- escaped backslashes in interpolated strings
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
d12e477326a6 Fixes #4863 (Missing "require 'webrick'" causes nondeterministic spec failures)
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
574812ef00e6 (#4860) Add regression tests that would have caught bad params method
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
68947e7f31b6 (#4860) Fix wrong method name.. params seems to be renamed to parameters
Author
Simon Effenberg <se@plista.com>
Browse Repository
No Builds
No Audits
021359bd7448 Fix for #4644: install.rb works properly on Windows
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
d057b90bba4f Fix #4726 Update puppet rrdtool metric code to support modern rrd ruby bindings
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
66cf3a925b4b Fix #4226 - Prepend 'Puppet CA: ' to fqdn for default root ca_name
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
d54352a0cc30 Port Puppet::SSLCertificates::CA test to rspec
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
effc6b8e2929 Fixes #4852 - error messages involving Whits now mention Classes instead
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
3f99bd71811b Fix #4267 - Create a backup before dropping permissions
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6468f4ede9d9 (#4763) Don't call a method that was removed in Rails 3 activerecord
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
79d5fde2246c Fixed #4763 - Hardcoded ActiveRecord version
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
4798df328526 Fixes #4822 -- Puppet doc -o option broken
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
99c1019e1d34 [#4798] Puppet doc manifests documentation mode broken
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
8cd1540f82cb [#4692] undefined variables cause :undef to be passed to functions
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
06bf566cf71b [#4787] Missing require causing failure
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
bba04e08ccf6 Fix for #4746 -- Newline goes at the _end_ of the line
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
9e17c25117f9 Fix #4743: Allow the audit meta-parameter to accept both 'all', and :all
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
f95006148c3a [#4716] ResourceTypeAPI exposes implementation details that are likely to change
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
8ff4b9a0b163 Fixed #4819 - corrected cron documentation
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
2b50f30c703a [#4771] Import of manifests with the same name only happens once
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
7b8cb741596c Fix for #4708 - tagmail should allow . in tagname
Author
Dan Bode <bodepd@gmail.com>
Browse Repository
No Builds
No Audits
6f229eea198d Minimal fix for #4631 -- set implicit classes as in 0.25.x
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
021d534482dd Fixed #3707 - rpm, like dpkg-query exits 1 if the package is not installed.
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
216f66326381 Fixed Puppet Doc TOC generation
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
c3cb57c73865 Fixed versioncmp function typo
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
898a17077c8e Fixed Reductive references in LICENSE file
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
996f14e8bb45 Documentation updates for Markdown conversion
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits

Changes (80)

Path

Size

CHANGELOG

LICENSE

conf/

suse/

lib/

puppet/

dsl/

external/

event-loop/

event-loop.rb

feature/

base.rb

rails.rb

network/

http/

webrick/

rest.rb

http_pool.rb

parser/

ast/

functions/

provider/

nameservice/

package/

service/

ssh_authorized_key/

user/

reference/

reports/

ssl/

certificate_request.rb

sslcertificates/

type/

util/

rdoc/

spec/

fixtures/

yaml/

report0.25.x.yaml

report2.6.x.yaml

integration/

application/

doc_spec.rb

defaults_spec.rb

parser/

compiler_spec.rb

ruby_manifest_spec.rb

lib/

puppet_spec/

files.rb

spec_helper.rb

unit/

application_spec.rb

dsl/

resource_type_api_spec.rb

indirector/

node/

active_record_spec.rb

parser/

ast/

provider/

service/

launchd_spec.rb

user/

user_role_add_spec.rb

reports/

type/

util/

rdoc/

parser_spec.rb

zaml_spec.rb

test/

certmgr/

ca.rb

rPUda84c03a7d1f

View Options

CHANGELOG

View Options

LICENSE

View Options

conf/suse/puppet.spec

View Options

conf/suse/ruby-env.patch

View Options

install.rb

View Options

lib/puppet.rb

View Options

lib/puppet/application.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/dsl.rb

View Options

lib/puppet/dsl/resource_type_api.rb

View Options

lib/puppet/external/event-loop/event-loop.rb

View Options

lib/puppet/feature/base.rb

View Options

lib/puppet/feature/rails.rb

View Options

lib/puppet/network/http/webrick/rest.rb

View Options

lib/puppet/network/http_pool.rb

View Options

lib/puppet/parser/ast/function.rb

View Options

lib/puppet/parser/ast/resource.rb

View Options

lib/puppet/parser/functions/extlookup.rb

View Options

lib/puppet/parser/functions/versioncmp.rb

View Options

lib/puppet/parser/lexer.rb

View Options

lib/puppet/parser/parser_support.rb

View Options

lib/puppet/parser/resource.rb

View Options

lib/puppet/parser/type_loader.rb

View Options

lib/puppet/provider/nameservice.rb

View Options

lib/puppet/provider/nameservice/objectadd.rb

View Options

lib/puppet/provider/package/rpm.rb

View Options

lib/puppet/provider/service/freebsd.rb

View Options

lib/puppet/provider/service/launchd.rb

View Options

lib/puppet/provider/ssh_authorized_key/parsed.rb

View Options

lib/puppet/provider/user/hpux.rb

View Options

lib/puppet/provider/user/user_role_add.rb

View Options

lib/puppet/provider/user/useradd.rb

View Options

lib/puppet/rails.rb

View Options

lib/puppet/reference/configuration.rb

View Options

lib/puppet/reference/indirection.rb

View Options

lib/puppet/reference/metaparameter.rb

View Options

lib/puppet/reference/type.rb

View Options

lib/puppet/reports/rrdgraph.rb

View Options

lib/puppet/reports/tagmail.rb

View Options

lib/puppet/ssl/certificate_request.rb

View Options

lib/puppet/sslcertificates/ca.rb

View Options

lib/puppet/type.rb

View Options

lib/puppet/type/cron.rb

View Options

lib/puppet/type/tidy.rb

View Options

lib/puppet/type/user.rb

View Options

lib/puppet/type/whit.rb

View Options

lib/puppet/util.rb

View Options

lib/puppet/util/metric.rb

View Options

lib/puppet/util/rdoc/parser.rb

View Options

lib/puppet/util/reference.rb

View Options

lib/puppet/util/zaml.rb

View Options

spec/fixtures/yaml/report0.25.x.yaml

View Options

spec/fixtures/yaml/report2.6.x.yaml

View Options

spec/integration/application/doc_spec.rb

View Options

spec/integration/defaults_spec.rb

View Options

spec/integration/parser/compiler_spec.rb

View Options

spec/integration/parser/ruby_manifest_spec.rb

View Options

spec/lib/puppet_spec/files.rb

View Options

spec/spec_helper.rb

View Options

spec/unit/application_spec.rb

View Options

spec/unit/dsl/resource_type_api_spec.rb

View Options

spec/unit/indirector/node/active_record_spec.rb

View Options

spec/unit/parser/ast/function_spec.rb

View Options

spec/unit/parser/lexer_spec.rb

View Options

spec/unit/parser/parser_spec.rb

View Options

spec/unit/parser/type_loader_spec.rb

View Options

spec/unit/provider/service/launchd_spec.rb

View Options

spec/unit/provider/user/user_role_add_spec.rb

View Options

spec/unit/provider/user/useradd_spec.rb

View Options

spec/unit/rails_spec.rb

View Options

spec/unit/reports/rrdgraph_spec.rb

View Options

spec/unit/reports/tagmail_spec.rb

View Options

spec/unit/sslcertificates/ca_spec.rb

View Options

spec/unit/type/user_spec.rb

View Options

spec/unit/type/whit_spec.rb

View Options

spec/unit/type_spec.rb

View Options

spec/unit/util/rdoc/parser_spec.rb

View Options

spec/unit/util/zaml_spec.rb

View Options

Merge commit '2.6.2rc1'da84c03a7d1fUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (80)

rPUda84c03a7d1f

CHANGELOG

LICENSE

conf/suse/puppet.spec

conf/suse/ruby-env.patch

install.rb

lib/puppet.rb

lib/puppet/application.rb

lib/puppet/defaults.rb

lib/puppet/dsl.rb

lib/puppet/dsl/resource_type_api.rb

lib/puppet/external/event-loop/event-loop.rb

lib/puppet/feature/base.rb

lib/puppet/feature/rails.rb

lib/puppet/network/http/webrick/rest.rb

lib/puppet/network/http_pool.rb

lib/puppet/parser/ast/function.rb

lib/puppet/parser/ast/resource.rb

lib/puppet/parser/functions/extlookup.rb

lib/puppet/parser/functions/versioncmp.rb

lib/puppet/parser/lexer.rb

lib/puppet/parser/parser_support.rb

lib/puppet/parser/resource.rb

lib/puppet/parser/type_loader.rb

lib/puppet/provider/nameservice.rb

lib/puppet/provider/nameservice/objectadd.rb

lib/puppet/provider/package/rpm.rb

lib/puppet/provider/service/freebsd.rb

lib/puppet/provider/service/launchd.rb

lib/puppet/provider/ssh_authorized_key/parsed.rb

lib/puppet/provider/user/hpux.rb

lib/puppet/provider/user/user_role_add.rb

lib/puppet/provider/user/useradd.rb

lib/puppet/rails.rb

lib/puppet/reference/configuration.rb

lib/puppet/reference/indirection.rb

lib/puppet/reference/metaparameter.rb

lib/puppet/reference/type.rb

lib/puppet/reports/rrdgraph.rb

lib/puppet/reports/tagmail.rb

lib/puppet/ssl/certificate_request.rb

lib/puppet/sslcertificates/ca.rb

lib/puppet/type.rb

lib/puppet/type/cron.rb

lib/puppet/type/tidy.rb

lib/puppet/type/user.rb

lib/puppet/type/whit.rb

lib/puppet/util.rb

lib/puppet/util/metric.rb

lib/puppet/util/rdoc/parser.rb

lib/puppet/util/reference.rb

lib/puppet/util/zaml.rb

spec/fixtures/yaml/report0.25.x.yaml

spec/fixtures/yaml/report2.6.x.yaml

spec/integration/application/doc_spec.rb

spec/integration/defaults_spec.rb

spec/integration/parser/compiler_spec.rb

spec/integration/parser/ruby_manifest_spec.rb

spec/lib/puppet_spec/files.rb

spec/spec_helper.rb

spec/unit/application_spec.rb

spec/unit/dsl/resource_type_api_spec.rb

spec/unit/indirector/node/active_record_spec.rb

spec/unit/parser/ast/function_spec.rb

spec/unit/parser/lexer_spec.rb

spec/unit/parser/parser_spec.rb

spec/unit/parser/type_loader_spec.rb

spec/unit/provider/service/launchd_spec.rb

spec/unit/provider/user/user_role_add_spec.rb

spec/unit/provider/user/useradd_spec.rb

spec/unit/rails_spec.rb

spec/unit/reports/rrdgraph_spec.rb

spec/unit/reports/tagmail_spec.rb

Merge commit '2.6.2rc1'
da84c03a7d1fUnpublished
Actions