Merge branch '2.7.x' into 2.7rc
4965b7c2cc50Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x' into 2.7rc

Details

Provenance

Moses Mendoza <moses@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUc00e8f243029: Merge remote-tracking branch 'upstream/2.7.x' into 2.7rc
rPU00e4a2451716: Merge pull request #989 from zaphod42/maint/2.7.x/remove_patchwork_reference

Branches

Unknown

Tags

Unknown

Event Timeline

Moses Mendoza <moses@puppetlabs.com> committed rPU4965b7c2cc50: Merge branch '2.7.x' into 2.7rc (authored by Moses Mendoza <moses@puppetlabs.com>).Aug 1 2012, 7:09 PM

Merged Changes

00e4a2451716 Merge pull request #989 from zaphod42/maint/2.7.x/remove_patchwork_reference
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
1dd660a20c24 (Maint) Remove reference to Patchwork
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
33dc4e5c0ea7 Merge pull request #978 from zaphod42/bug/2.7.x/15595-better-ssl-verify-errors
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
4388f7e07210 Merge pull request #960 from hkenney/maint/2.7.x/fix_up_contributing_md
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
a26d1eebc830 Replace "the short version" with outline
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
b73d0dde1889 (#15595) Improve message on SSL errors
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
9567ec8dc0c1 (#15595) Clear up tests around ssl errors
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
ccca77ff06b2 use error_message instead of error
Author
Dustin J. Mitchell <dustin@mozilla.com>
Browse Repository
No Builds
No Audits
3809b59195ab updates as requested
Author
Dustin J. Mitchell <dustin@mozilla.com>
Browse Repository
No Builds
No Audits
e7b30496726f (#15595) Offer better errors for certificate validation errors
Author
Dustin J. Mitchell <dustin@mozilla.com>
Browse Repository
No Builds
No Audits
6a43e969180c Update CONTRIBUTING.md
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
c44973c407ef (Maint) Remove some more ambiguity
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
c23600131cd4 Use rspec 2.11 compatible block syntax
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
1691bd3c2a04 Merge branch 'non-string-resource-titles' of https://github.
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
b504ab729558 Fix buggy resource title tests
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
00b563d11241 (Maint) Be more honest about submission methods
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
b90c92b2f010 (Maint) Clarify that Redmine tickets are mandatory
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
62c14bd120fc (Maint) Clarify which branches changes should be based on
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
c0a0a45c010c tidy.rb: Added info about the default value of 'type' to the doc.
Author
Jakub Holy <jakub.holy@iterate.no>
Browse Repository
No Builds
No Audits
2d994c2213ca Switch Rakefile off deprecated rake/gempackagetask
Author
R. Tyler Croy <tyler@monkeypox.org>
Browse Repository
No Builds
No Audits
7324f54a675d Update main readme to have links to contrib and dev docs
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
e69e4fccca02 Merge pull request #950 from zaphod42/bug/2.7.x/13070-error-describing-types
Author
Hailee Kenney <hailee@puppetlabs.com>
Browse Repository
No Builds
No Audits
57a74f7a9c84 (13070) Mark files as loaded before we load
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
96d70720844d Merge pull request #943 from joshcooper/maint/2.7.x/openrc-spec
Author
Josh Cooper <josh+github@puppetlabs.com>
Browse Repository
No Builds
No Audits
a23cf6e9e1eb (Maint) Don't assume paths are absolute
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
c88735293b0d Merge pull request #654 from stschulte/feature/2.7.x/13880
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
eb3158423078 Merge pull request #585 from andytinycat/2.7.x
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
1100101d6ebc Merge pull request #864 from stschulte/ticket/2.7.x/14531
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
5ae4e1e5ff11 Merge pull request #805 from stschulte/ticket/2.7.x/14599
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
aaf1e008e3f4 Merge pull request #839 from jeffmccune/ticket/2.7.
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
8d51f195ff77 Merge pull request #870 from MosesMendoza/maint/2.7.
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
dd96d846f32d Determine packaging version with git describe
Author
Moses Mendoza <moses@puppetlabs.com>
Browse Repository
No Builds
No Audits
78a72c959363 Merge pull request #869 from stschulte/ticket/2.7.x/14600
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
8eb67f71351c Merge pull request #388 from codec/ticket/2.7.x/10354-missing-userdel-flag
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
cc4d8d22be15 Don't allow resource titles which aren't strings
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0d5a46ad63b3 (#14600) Fix cleanup of tempfiles in file_spec
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
0219818c1646 (#14531) Change default ensure value from symlink to link
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
0b01bb31e366 (#14860) Fix puppet cert exit status on failures
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
b572810ed207 (#14599) Handle ENOTDIR in file type
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
085936460b0b (#13880) Add openrc spec - service with extreme long name
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
af6f7bab66d4 (#13880) Add openrc service provider for Gentoo and Funtoo
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
06eb9a9bdba5 Fixes for #10915 and #11200 - user provider for AIX
Author
Andy Sykes <a.sykes@ucl.ac.uk>
Browse Repository
No Builds
No Audits
ed7384546fd2 (#10354) added delete command to fix missing userdel flag in useradd provider
Author
codec <codec@fnord.cx>
Browse Repository
No Builds
No Audits

Changes (58)

Path

Size

CONTRIBUTING.md

README.md

Rakefile

lib/

puppet/

indirector/

rest.rb

parser/

ast/

resource.rb

provider/

service/

user/

ssl/

certificate_authority/

type/

util/

spec/

fixtures/

unit/

provider/

service/

openrc/

rcservice_list

rcstatus

integration/

defaults_spec.rb

network/

server/

parser/

type/

shared_behaviours/

things_that_declare_options.rb

unit/

application/

face/

indirector/

certificate_request/

ca_spec.rb

facts/

inventory_service_spec.rb

queue_spec.rb

rest_spec.rb

indirector_spec.rb

interface/

action_builder_spec.rb

action_manager_spec.rb

action_spec.rb

face_collection_spec.rb

option_spec.rb

interface_spec.rb

network/

handler/

fileserver_spec.rb

parser/

ast/

resource_spec.rb

functions/

create_resources_spec.rb

lexer_spec.rb

provider/

nameservice/

directoryservice_spec.rb

package/

freebsd_spec.rb

pkgdmg_spec.rb

service/

	openrc_spec.rb
	gentoo_spec.rb

user/

useradd_spec.rb

resource_spec.rb

simple_graph_spec.rb

ssl/

certificate_authority/

interface_spec.rb

certificate_authority_spec.rb

type/

util/

rPU4965b7c2cc50

View Options

CONTRIBUTING.md

View Options

README.md

View Options

Rakefile

View Options

lib/puppet/indirector/rest.rb

View Options

lib/puppet/parser/ast/resource.rb

View Options

lib/puppet/provider/service/gentoo.rb

View Options

lib/puppet/provider/service/openrc.rb

View Options

lib/puppet/provider/user/aix.rb

View Options

lib/puppet/provider/user/useradd.rb

View Options

lib/puppet/ssl/certificate_authority/interface.rb

View Options

lib/puppet/type/file.rb

View Options

lib/puppet/type/tidy.rb

View Options

lib/puppet/util/autoload.rb

View Options

spec/fixtures/unit/provider/service/openrc/rcservice_list

View Options

spec/fixtures/unit/provider/service/openrc/rcstatus

View Options

spec/integration/defaults_spec.rb

View Options

spec/integration/network/server/mongrel_spec.rb

View Options

spec/integration/parser/parser_spec.rb

View Options

spec/integration/type/file_spec.rb

View Options

spec/shared_behaviours/path_parameters.rb

View Options

spec/shared_behaviours/things_that_declare_options.rb

View Options

spec/unit/application/facts_spec.rb

View Options

spec/unit/application_spec.rb

View Options

spec/unit/face/ca_spec.rb

View Options

spec/unit/face/help_spec.rb

View Options

spec/unit/face/node_spec.rb

View Options

spec/unit/indirector/certificate_request/ca_spec.rb

View Options

spec/unit/indirector/facts/inventory_service_spec.rb

View Options

spec/unit/indirector/queue_spec.rb

View Options

spec/unit/indirector/rest_spec.rb

View Options

spec/unit/indirector_spec.rb

View Options

spec/unit/interface/action_builder_spec.rb

View Options

spec/unit/interface/action_manager_spec.rb

View Options

spec/unit/interface/action_spec.rb

View Options

spec/unit/interface/face_collection_spec.rb

View Options

spec/unit/interface/option_spec.rb

View Options

spec/unit/interface_spec.rb

View Options

spec/unit/network/handler/fileserver_spec.rb

View Options

spec/unit/parser/ast/resource_spec.rb

View Options

spec/unit/parser/functions/create_resources_spec.rb

View Options

spec/unit/parser/lexer_spec.rb

View Options

spec/unit/provider/nameservice/directoryservice_spec.rb

View Options

spec/unit/provider/package/freebsd_spec.rb

View Options

spec/unit/provider/package/pkgdmg_spec.rb

View Options

spec/unit/provider/service/openrc_spec.rb

View Options

spec/unit/provider/user/useradd_spec.rb

View Options

spec/unit/resource_spec.rb

View Options

spec/unit/simple_graph_spec.rb

View Options

spec/unit/ssl/certificate_authority/interface_spec.rb

View Options

spec/unit/ssl/certificate_authority_spec.rb

View Options

spec/unit/type/cron_spec.rb

View Options

spec/unit/type/exec_spec.rb

View Options

spec/unit/type/file_spec.rb

View Options

spec/unit/type/user_spec.rb

View Options

spec/unit/type_spec.rb

View Options

spec/unit/util/autoload_spec.rb

View Options

spec/unit/util/suidmanager_spec.rb

Merge branch '2.7.x' into 2.7rc4965b7c2cc50UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (58)

rPU4965b7c2cc50

CONTRIBUTING.md

README.md

Rakefile

lib/puppet/indirector/rest.rb

lib/puppet/parser/ast/resource.rb

lib/puppet/provider/service/gentoo.rb

lib/puppet/provider/service/openrc.rb

lib/puppet/provider/user/aix.rb

lib/puppet/provider/user/useradd.rb

lib/puppet/ssl/certificate_authority/interface.rb

lib/puppet/type/file.rb

lib/puppet/type/tidy.rb

lib/puppet/util/autoload.rb

spec/fixtures/unit/provider/service/openrc/rcservice_list

spec/fixtures/unit/provider/service/openrc/rcstatus

spec/integration/defaults_spec.rb

spec/integration/network/server/mongrel_spec.rb

spec/integration/parser/parser_spec.rb

spec/integration/type/file_spec.rb

spec/shared_behaviours/path_parameters.rb

spec/shared_behaviours/things_that_declare_options.rb

spec/unit/application/facts_spec.rb

spec/unit/application_spec.rb

spec/unit/face/ca_spec.rb

spec/unit/face/help_spec.rb

spec/unit/face/node_spec.rb

spec/unit/indirector/certificate_request/ca_spec.rb

spec/unit/indirector/facts/inventory_service_spec.rb

spec/unit/indirector/queue_spec.rb

spec/unit/indirector/rest_spec.rb

spec/unit/indirector_spec.rb

spec/unit/interface/action_builder_spec.rb

spec/unit/interface/action_manager_spec.rb

spec/unit/interface/action_spec.rb

spec/unit/interface/face_collection_spec.rb

spec/unit/interface/option_spec.rb

spec/unit/interface_spec.rb

spec/unit/network/handler/fileserver_spec.rb

spec/unit/parser/ast/resource_spec.rb

spec/unit/parser/functions/create_resources_spec.rb

spec/unit/parser/lexer_spec.rb

spec/unit/provider/nameservice/directoryservice_spec.rb

spec/unit/provider/package/freebsd_spec.rb

spec/unit/provider/package/pkgdmg_spec.rb

spec/unit/provider/service/openrc_spec.rb

spec/unit/provider/user/useradd_spec.rb

spec/unit/resource_spec.rb

spec/unit/simple_graph_spec.rb

spec/unit/ssl/certificate_authority/interface_spec.rb

spec/unit/ssl/certificate_authority_spec.rb

spec/unit/type/cron_spec.rb

spec/unit/type/exec_spec.rb

spec/unit/type/file_spec.rb

spec/unit/type/user_spec.rb

spec/unit/type_spec.rb

spec/unit/util/autoload_spec.rb

spec/unit/util/suidmanager_spec.rb

Merge branch '2.7.x' into 2.7rc
4965b7c2cc50Unpublished
Actions