Diffusion puppet a6affa1b7051

Merge branch '2.7.x'
a6affa1b7051Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

Conflicts:
acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb

Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>

Details

Provenance

Daniel Pittman <daniel@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUae5443650863: Merge branch '2.7rc' into 2.7.x
rPU6d4cf14c03b8: Merge pull request #375 from carlasouza/master

Branches

Unknown

Tags

Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPUa6affa1b7051: Merge branch '2.7.x' (authored by Daniel Pittman <daniel@puppetlabs.com>).Jan 24 2012, 2:56 AM

Merged Changes

ae5443650863 Merge branch '2.7rc' into 2.7.x
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
48cf180f0421 Merge branch '2.6.x' into 2.7.x
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
311848a4c74b Merge pull request #395 from joshcooper/ticket/2.6.x/6541-use-the-same…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
a0b53861f278 Merge pull request #394 from mmrobins/ticket/2.7.x/11600_put_module_face_back
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
d937ae3a506f (#6541) Use the same filebucket for backup and restore
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
c78ea44304d3 Merge branch 'schedule/bug/10296-test_cleanup_2.7.x' of git://github.
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
e4f6bc953132 Revert "(#11600) Remove module face"
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
651db09b83ac Merge pull request #384 from glarizza/bug/2.7.x/5445_create_varlib
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
7c8c421b5c85 Merge pull request #376 from lak/tickets/2.7.x/6404…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
3abfa67732f7 (#10296) Switch schedule tests from should to must
Author
Sean Millichamp <sean@bruenor.org>
Browse Repository
No Builds
No Audits
72a2fe0f4e84 (#5445) Create /var/lib/puppet in OS X Package
Author
Gary Larizza <gary@puppetlabs.com>
Browse Repository
No Builds
No Audits
0a4d48fd26bf Merge pull request #373 from lak/tickets/2.7.x/2056…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
646a5744d5f3 Merge pull request #372 from domcleal/tickets/2.7.x/11826
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
238088fee162 Merge pull request #364 from domcleal/tickets/2.7.x/11961
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
4472b06fb1c4 Merge pull request #362 from domcleal/tickets/2.7.x/12051
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
8804e1dc0c06 Merge pull request #361 from stschulte/ticket/2.7.x/12070
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
a02d4c3d7b35 Merge pull request #383 from daniel-pittman/bug/2.7.x/6710-fixed-1.9.2-test…
Author
Deepak Giridharagopal <deepak@brownman.org>
Browse Repository
No Builds
No Audits
0f2bb2769781 (#6710) Fix Ruby 1.9.2 failures due to Array#to_s changes.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
a6255d2cec8d (6404) Failing when no file is specified to backup
Author
Luke Kanies <luke@puppetlabs.com>
Browse Repository
No Builds
No Audits
f9a6337c2331 Merge pull request #360 from joshcooper/ticket/2.7.x/11930-forward-slashes
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
a508347f7deb Merge pull request #371 from nanliu/ticket/2.7.x/5353
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
691267c934b0 Merge pull request #271 from nicklewis/ticket/2.7.x/6710
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
93454974d10e (2056) Launchd now supports overriding stop/start
Author
Luke Kanies <luke@puppetlabs.com>
Browse Repository
No Builds
No Audits
11dc062f80ea Removing resource stubbing from launchd tests
Author
Luke Kanies <luke@puppetlabs.com>
Browse Repository
No Builds
No Audits
17ac2c17a963 (#11826) Fix error when no certs were printed to console from ca face
Author
Dominic Cleal <dcleal@redhat.com>
Browse Repository
No Builds
No Audits
ad834226dd96 (#5353) Change agent default to graph=true
Author
Nan Liu <nan@puppetlabs.com>
Browse Repository
No Builds
No Audits
5f5e103d4aa8 (#11961) Apply and catch a timeout when contacting PyPI over XMLRPC
Author
Dominic Cleal <dcleal@redhat.com>
Browse Repository
No Builds
No Audits
f2c407a406f2 (#12051) Send exec onlyif/unless command output to debug log
Author
Dominic Cleal <dcleal@redhat.com>
Browse Repository
No Builds
No Audits
9e6a01fb9c5f (#12070) Fix crontab value munging
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
b1eda3608c57 maint: Add expected error messages to cron spec
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
c86c97d6a403 maint: Use a real provider class in cron spec
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
01e7200872b1 maint: Remove unused vars in cron spec
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
38f386fa3893 maint: Fix indention in cron spec
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
d60a88ecd458 (#11930) Add validation of Windows paths in the generate function
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
aa4896586a14 (#11930) Use Puppet::Util.absolute_path? to validate paths
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
1ffbeb1b8ff3 (#11930) Use FileUtils.mkdir_p to recursively create directories
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
eee351103bd2 (Maint) Remove dead code
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
b16bf84f3be9 Merge pull request #356 from joshcooper/ticket/2.7rc/11767-remove-ssldir…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
0d8a22a1f05c (#11767) No longer necessary to delete ssl directory in each test
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
470a6646b4fa Merge pull request #354 from djm68/fix_test_3360_allow_duplicate_csr_with_option
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
64446acc1852 (maint) Fix test 3360 to use per host cfg data
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
69f957e961b9 Merge branch '2.7.x' of github.com:puppetlabs/puppet into 2.7.x
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
e78dc4cfa7c3 Merge branch 'bug/2.7.x/11057-debug-output-enhancement' into 2.7.x
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
5d1b7fe824d6 (#11057) Add spec, should notify why a run is skipped
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
9e7ce1640a2e (#11057) Note why a scheduled run was skipped in Puppet.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
e1828ba69b50 Updated CHANGELOG for 2.7.10rc1
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
132dca4c894a (#6710) Support relationships for resources defined by other constructs
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
982564ece58b (#6710) Support relationship arrows between resource refs with title arrays
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0e6d0a4c46cc maint: Unify 'type' and 'classref' non-terminals in the grammar
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (64)

Path

Size

CHANGELOG

acceptance/

pending/

ticket_6710_relationship_syntax_should_work_with_title_arrays.rb

tests/

allow_arbitrary_node_name_fact_for_agent.rb

allow_arbitrary_node_name_for_agent.rb

helpful_error_message_when_hostname_not_match_server_certificate.rb

ticket_3360_allow_duplicate_csr_with_option_set.rb

ticket_5477_master_not_dectect_sitepp.rb

ticket_6541_invalid_filebucket_files.rb

ticket_7117_broke_env_criteria_authconf.rb

	tests/
	pending/

ticket_6710_relationship_syntax_should_work_with_title_arrays.rb

conf/

osx/

redhat/

suse/

lib/

puppet/

application/

face/

file_serving/

indirector/

node/

parameter/

parser/

ast/

functions/

provider/

package/

service/

type/

util/

log/

destinations.rb

spec/

integration/

parser/

unit/

application/

face/

file_serving/

indirector/

node/

parser/

functions/

generate_spec.rb

provider/

package/

service/

type/

rPUa6affa1b7051

View Options

CHANGELOG

View Options

acceptance/pending/ticket_6710_relationship_syntax_should_work_with_title_arrays.rb

View Options

acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb

View Options

acceptance/tests/allow_arbitrary_node_name_for_agent.rb

View Options

acceptance/tests/helpful_error_message_when_hostname_not_match_server_certificate.rb

View Options

acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb

View Options

acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb

View Options

acceptance/tests/ticket_6541_invalid_filebucket_files.rb

View Options

acceptance/tests/ticket_6710_relationship_syntax_should_work_with_title_arrays.rb

View Options

acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb

View Options

conf/osx/createpackage.sh

View Options

conf/redhat/puppet.spec

View Options

conf/suse/puppet.spec

View Options

lib/puppet.rb

View Options

lib/puppet/agent.rb

View Options

lib/puppet/application/agent.rb

View Options

lib/puppet/application/filebucket.rb

View Options

lib/puppet/application/module.rb

View Options

lib/puppet/face/ca.rb

View Options

lib/puppet/face/module.rb

View Options

lib/puppet/file_serving/base.rb

View Options

lib/puppet/indirector/exec.rb

View Options

lib/puppet/node/environment.rb

View Options

lib/puppet/parameter/path.rb

View Options

lib/puppet/parser/ast/relationship.rb

View Options

lib/puppet/parser/functions/file.rb

View Options

lib/puppet/parser/functions/generate.rb

View Options

lib/puppet/parser/grammar.ra

View Options

lib/puppet/parser/parser.rb

View Options

lib/puppet/parser/relationship.rb

View Options

lib/puppet/parser/type_loader.rb

View Options

lib/puppet/provider/package/pip.rb

View Options

lib/puppet/provider/service/launchd.rb

View Options

lib/puppet/type/cron.rb

View Options

lib/puppet/type/exec.rb

View Options

lib/puppet/type/k5login.rb

View Options

lib/puppet/type/package.rb

View Options

lib/puppet/util.rb

View Options

lib/puppet/util/log/destinations.rb

View Options

spec/integration/parser/compiler_spec.rb

View Options

spec/unit/agent_spec.rb

View Options

spec/unit/application/filebucket_spec.rb

View Options

spec/unit/face/ca_spec.rb

View Options

spec/unit/face/module/build_spec.rb

View Options

spec/unit/face/module/changes_spec.rb

View Options

spec/unit/face/module/clean_spec.rb

View Options

spec/unit/face/module/generate_spec.rb

View Options

spec/unit/face/module/install_spec.rb

View Options

spec/unit/face/module/list_spec.rb

View Options

spec/unit/face/module/search_spec.rb

View Options

spec/unit/face/module/uninstall_spec.rb

View Options

spec/unit/file_serving/base_spec.rb

View Options

spec/unit/file_serving/content_spec.rb

View Options

spec/unit/file_serving/metadata_spec.rb

View Options

spec/unit/indirector/exec_spec.rb

View Options

spec/unit/indirector/node/exec_spec.rb

View Options

spec/unit/parser/functions/generate_spec.rb

View Options

spec/unit/provider/package/pip_spec.rb

View Options

spec/unit/provider/service/launchd_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/schedule_spec.rb

Merge branch '2.7.x'a6affa1b7051UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (64)

rPUa6affa1b7051

CHANGELOG

acceptance/pending/ticket_6710_relationship_syntax_should_work_with_title_arrays.rb

acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb

acceptance/tests/allow_arbitrary_node_name_for_agent.rb

acceptance/tests/helpful_error_message_when_hostname_not_match_server_certificate.rb

acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb

acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb

acceptance/tests/ticket_6541_invalid_filebucket_files.rb

acceptance/tests/ticket_6710_relationship_syntax_should_work_with_title_arrays.rb

acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb

conf/osx/createpackage.sh

conf/redhat/puppet.spec

conf/suse/puppet.spec

lib/puppet.rb

lib/puppet/agent.rb

lib/puppet/application/agent.rb

lib/puppet/application/filebucket.rb

lib/puppet/application/module.rb

lib/puppet/face/ca.rb

lib/puppet/face/module.rb

lib/puppet/file_serving/base.rb

lib/puppet/indirector/exec.rb

lib/puppet/node/environment.rb

lib/puppet/parameter/path.rb

lib/puppet/parser/ast/relationship.rb

lib/puppet/parser/functions/file.rb

lib/puppet/parser/functions/generate.rb

lib/puppet/parser/grammar.ra

lib/puppet/parser/parser.rb

lib/puppet/parser/relationship.rb

lib/puppet/parser/type_loader.rb

lib/puppet/provider/package/pip.rb

lib/puppet/provider/service/launchd.rb

lib/puppet/type/cron.rb

lib/puppet/type/exec.rb

lib/puppet/type/k5login.rb

lib/puppet/type/package.rb

lib/puppet/util.rb

lib/puppet/util/log/destinations.rb

spec/integration/parser/compiler_spec.rb

spec/unit/agent_spec.rb

spec/unit/application/filebucket_spec.rb

spec/unit/face/ca_spec.rb

spec/unit/face/module/build_spec.rb

spec/unit/face/module/changes_spec.rb

spec/unit/face/module/clean_spec.rb

spec/unit/face/module/generate_spec.rb

spec/unit/face/module/install_spec.rb

spec/unit/face/module/list_spec.rb

spec/unit/face/module/search_spec.rb

spec/unit/face/module/uninstall_spec.rb

spec/unit/file_serving/base_spec.rb

spec/unit/file_serving/content_spec.rb

spec/unit/file_serving/metadata_spec.rb

spec/unit/indirector/exec_spec.rb

spec/unit/indirector/node/exec_spec.rb

spec/unit/parser/functions/generate_spec.rb

spec/unit/provider/package/pip_spec.rb

spec/unit/provider/service/launchd_spec.rb

spec/unit/type/cron_spec.rb

spec/unit/type/exec_spec.rb

spec/unit/type/file_spec.rb

spec/unit/type/schedule_spec.rb

Merge branch '2.7.x'
a6affa1b7051Unpublished
Actions