Diffusion puppet 009b350d06d3

Merge remote-tracking branch 'origin/2.7.x'
009b350d06d3Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'origin/2.7.x'

Conflicts:
lib/puppet/network/handler/fileserver.rb
spec/unit/provider/package/dpkg_spec.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

rPU5cc2cf7cb060: Merge branch 'ticket/2.7.x/12349-order_module_list_stderr_output' of https…
rPU6896d029f5f0: Merge pull request #461 from cprice-puppet/refactor/master/12309-posix-util…

Branches

Unknown

Tags

Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU009b350d06d3: Merge remote-tracking branch 'origin/2.7.x' (authored by Daniel Pittman <daniel@puppetlabs.com>).Feb 8 2012, 12:04 AM

Merged Changes

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

5cc2cf7cb060 Merge branch 'ticket/2.7.x/12349-order_module_list_stderr_output' of https…
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
3365c854b959 (#12349) Order stderr output to fix acceptance test for `module list`
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
e80e514b7883 Merge pull request #232 from kscherer/ticket/2.7.x/7485-zypper-0.6-support
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
f73a741e0dc6 (#7485) Support zypper 0.6 with zypper package provider
Author
Konrad Scherer <Konrad.Scherer@windriver.com>
Browse Repository
No Builds
No Audits
96e79544ad76 Merge remote-tracking branch 'daniel-pittman/bug/2.7.x/symbolic-file-mode…
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
5614ad1e3f87 Merge pull request #449 from mmrobins/ticket/2.7.x/12349…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
de58c0bc0c51 (#12349) Order module list output
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
77f5a487fec0 Symbolic file mode test fixes when no mode change happens.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
090b8b1f8467 Merge pull request #446 from joshcooper/ticket/2.7.x/12386-disable-kick-on…
Author
lifton <lifton@puppetlabs.com>
Browse Repository
No Builds
No Audits
5225d39435cf (#12386) Disable puppet kick on windows
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
132a2efed31b Merge pull request #391 from tdb/ticket/2.7.x/12081-missing-pw-userdel-flag
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
79c3b4785d51 Merge pull request #443 from jeffweiss/ticket/2.7.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
da2f43c16e33 Merge pull request #441 from nfagerlund/ticket/2.7.x/12356_hasstatus_exit_codes
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
8782e33e84e3 Merge pull request #435 from mmrobins/ticket/2.7.x/12349…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
984997f0d17c (#12372) Remove duplicate methods from certificate_request
Author
Jeff Weiss <jeff.a.weiss@gmail.com>
Browse Repository
No Builds
No Audits
057873790365 (#12356) Mention the expected exit codes in the hasstatus parameter doc
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
7485aa6e8081 Merge pull request #420 from daniel-pittman/feature/2.7.x/2927-symbolic-file…
Author
lifton <lifton@puppetlabs.com>
Browse Repository
No Builds
No Audits
bd45d79998c9 Merge pull request #438 from joshcooper/ticket/2.7.x/12363-use-tempfile
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
8fd54b122c14 Restore compatible `insync?` behaviour for matching arrays.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
55207268779e Fix bugs around the finer-grained insync? protocol.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
7c9f8613f6ad Finer-grained protocol for property `insync?`.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
c0e28b0d6834 Add unit tests for the `insysc?` method of a property.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
7f84c496e836 Property Spec cleanup: eliminate stubbing of resource and provider.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
d66bb00c5d2b Property Spec cleanup: last let method extraction.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
2775dd768a6e Property Spec cleanup: extract more let methods.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
cd536ab3431c Property Spec cleanup: remove unused instance variable.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
a5d7bd650661 Property Spec cleanup: remove some pointless extra stubs.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
f17dbf789824 Property Spec cleanup: extract property instance to a let method.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
4157102cd00c Property Spec cleanup: extract mock resource to let method.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
8f9214eae4ee Property Spec cleanup: extract mock provider to let method.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
47510b0878c3 Property Spec cleanup: extract new subclass to let method.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
03e37564daf0 (#2927) Acceptance test for symbolic file modes.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
51fa66659b61 (#12363) Use Tempfile to generate temp files
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
b7e1c32a06fc Merge pull request #425 from daniel-pittman/bug/2.7.x/12269-multiple-cycles-in…
Author
Deepak Giridharagopal <deepak@brownman.org>
Browse Repository
No Builds
No Audits
48dd82ea2e9f Merge pull request #436 from daniel-pittman/maint/2.7.4/stub-upstart-spec-test…
Author
R.I.Pienaar <rip@devco.net>
Browse Repository
No Builds
No Audits
7da2c58545f5 Alternate, and portable, stubbing of execution for upstart spec.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
a6c196f63be9 (#12349) Add module dependency errors to module list output
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
ec3bba570537 Merge pull request #433 from pcarlisle/ticket/2.7.x/12268-upstart
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
17d3e31bf8bb (#12268) Fix upstart test to work with String#each_line
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
d799770f4b0b Merge pull request #310 from nicklewis/fix-inherited-stages
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
b8696655f18b Merge pull request #300 from nfagerlund/ticket/2.7.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
62d4f78b445a Merge pull request #426 from daniel-pittman/bug/2.7.x/12268-1.9.3-compatibility…
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
5050b71ece12 Merge pull request #432 from jeffmccune/ticket/2.7.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
29a77284e4a1 Merge pull request #431 from mmrobins/ticket/2.7.x/12329…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
2303a815f86c Revert "Merge pull request #396 from jeffmccune/feature/2.7.
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
a11672690ed1 (#12329) Allow faces when_rendering blocks to take options
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
309c09c44fb7 Merge pull request #419 from nicklewis/ticket/2.7.x/10064
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
a8a0f5fc5d62 (#12268) String#each is not available in Ruby 1.9
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
2c216c76e59d Merge branch 'bug/2.7.x/11423-better-collector-error-message' into 2.7.x
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
20e03a926acd (#11423) Better error when imported resources overlap.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (85)

Path

Size

.gitignore

README_DEVELOPER.md

acceptance/

tests/

resource/

file/

symbolic_modes.rb

ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb

install.rb

lib/

puppet/

application/

face_base.rb

kick.rb

face/

module/

list.rb

file_serving/

configuration/

parser.rb

indirector/

file_bucket_file/

file.rb

interface/

action.rb

module.rb

module_tool/

contents_description.rb

network/

parser/

provider/

package/

selmodule/

service/

user/

resource/

ssl/

certificate_request.rb

type.rb

type/

service.rb

spec/

unit/

application/

face_base_spec.rb

kick_spec.rb

file_serving/

configuration/

parser_spec.rb

interface/

action_builder_spec.rb

network/

parser/

provider/

package/

service/

	upstart_spec.rb
	upstart.rb

user/

resource/

tasks/

rake/

README_DEVELOPER.markdown

rPU009b350d06d3

View Options

.gitignore

View Options

README_DEVELOPER.md

View Options

acceptance/tests/cycle_detection.rb

View Options

acceptance/tests/modules/fake_modulepath/apache/metadata.json

View Options

acceptance/tests/modules/fake_modulepath/bacula/metadata.json

View Options

acceptance/tests/modules/fake_modulepath/mysql/metadata.json

View Options

acceptance/tests/modules/fake_modulepath/sqlite/metadata.json

View Options

acceptance/tests/modules/list.rb

View Options

acceptance/tests/resource/file/symbolic_modes.rb

View Options

acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb

View Options

install.rb

View Options

lib/puppet/application/face_base.rb

View Options

lib/puppet/application/kick.rb

View Options

lib/puppet/face/module/list.rb

View Options

lib/puppet/file_serving/configuration/parser.rb

View Options

lib/puppet/indirector/file_bucket_file/file.rb

View Options

lib/puppet/interface/action.rb

View Options

lib/puppet/module.rb

View Options

lib/puppet/module_tool/contents_description.rb

View Options

lib/puppet/network/authconfig.rb

View Options

lib/puppet/network/handler/fileserver.rb

View Options

lib/puppet/parser/collector.rb

View Options

lib/puppet/parser/compiler.rb

View Options

lib/puppet/parser/resource.rb

View Options

lib/puppet/property.rb

View Options

lib/puppet/provider.rb

View Options

lib/puppet/provider/package/aix.rb

View Options

lib/puppet/provider/package/dpkg.rb

View Options

lib/puppet/provider/package/openbsd.rb

View Options

lib/puppet/provider/package/pkg.rb

View Options

lib/puppet/provider/package/pkgutil.rb

View Options

lib/puppet/provider/package/portage.rb

View Options

lib/puppet/provider/package/rpm.rb

View Options

lib/puppet/provider/package/sun.rb

View Options

lib/puppet/provider/package/zypper.rb

View Options

lib/puppet/provider/selmodule/semodule.rb

View Options

lib/puppet/provider/service/base.rb

View Options

lib/puppet/provider/service/src.rb

View Options

lib/puppet/provider/service/upstart.rb

View Options

lib/puppet/provider/user/aix.rb

View Options

lib/puppet/provider/user/pw.rb

View Options

lib/puppet/resource/catalog.rb

View Options

lib/puppet/resource/type.rb

View Options

lib/puppet/simple_graph.rb

View Options

lib/puppet/ssl/certificate_request.rb

View Options

lib/puppet/type.rb

View Options

lib/puppet/type/service.rb

View Options

spec/unit/application/face_base_spec.rb

View Options

spec/unit/application/kick_spec.rb

View Options

spec/unit/file_serving/configuration/parser_spec.rb

View Options

spec/unit/interface/action_builder_spec.rb

View Options

spec/unit/module_spec.rb

View Options

spec/unit/network/authconfig_spec.rb

View Options

spec/unit/parser/collector_spec.rb

View Options

spec/unit/parser/resource_spec.rb

View Options

spec/unit/property_spec.rb

View Options

spec/unit/provider/package/dpkg_spec.rb

View Options

spec/unit/provider/package/zypper_spec.rb

View Options

spec/unit/provider/selmodule_spec.rb

View Options

spec/unit/provider/service/upstart.rb

View Options

spec/unit/provider/service/upstart_spec.rb

View Options

spec/unit/provider/user/pw_spec.rb

View Options

spec/unit/provider_spec.rb

View Options

spec/unit/resource/catalog_spec.rb

View Options

spec/unit/simple_graph_spec.rb

View Options

spec/unit/type_spec.rb

View Options

tasks/rake/contrib

View Options

tasks/rake/contrib/progressbar.rb

View Options

tasks/rake/contrib/uri_ext.rb

View Options

tasks/rake/downloadtask.rb

View Options

tasks/windows

View Options

tasks/windows/README.markdown

View Options

tasks/windows/README_DEVELOPER.markdown

View Options

tasks/windows/windows.rake

View Options

wix

View Options

wix/include

View Options

wix/include/puppet.wxi

View Options

Merge remote-tracking branch 'origin/2.7.x'009b350d06d3UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (85)

rPU009b350d06d3

.gitignore

README_DEVELOPER.md

acceptance/tests/cycle_detection.rb

acceptance/tests/modules/fake_modulepath/apache/metadata.json

acceptance/tests/modules/fake_modulepath/bacula/metadata.json

acceptance/tests/modules/fake_modulepath/mysql/metadata.json

acceptance/tests/modules/fake_modulepath/sqlite/metadata.json

acceptance/tests/modules/list.rb

acceptance/tests/resource/file/symbolic_modes.rb

acceptance/tests/ticket_3172_puppet_kick_with_hostnames_on_the_command_line.rb

install.rb

lib/puppet/application/face_base.rb

lib/puppet/application/kick.rb

lib/puppet/face/module/list.rb

lib/puppet/file_serving/configuration/parser.rb

lib/puppet/indirector/file_bucket_file/file.rb

lib/puppet/interface/action.rb

lib/puppet/module.rb

lib/puppet/module_tool/contents_description.rb

lib/puppet/network/authconfig.rb

lib/puppet/network/handler/fileserver.rb

lib/puppet/parser/collector.rb

lib/puppet/parser/compiler.rb

lib/puppet/parser/resource.rb

lib/puppet/property.rb

lib/puppet/provider.rb

lib/puppet/provider/package/aix.rb

lib/puppet/provider/package/dpkg.rb

lib/puppet/provider/package/openbsd.rb

lib/puppet/provider/package/pkg.rb

lib/puppet/provider/package/pkgutil.rb

lib/puppet/provider/package/portage.rb

lib/puppet/provider/package/rpm.rb

lib/puppet/provider/package/sun.rb

lib/puppet/provider/package/zypper.rb

lib/puppet/provider/selmodule/semodule.rb

lib/puppet/provider/service/base.rb

lib/puppet/provider/service/src.rb

lib/puppet/provider/service/upstart.rb

lib/puppet/provider/user/aix.rb

lib/puppet/provider/user/pw.rb

lib/puppet/resource/catalog.rb

lib/puppet/resource/type.rb

lib/puppet/simple_graph.rb

lib/puppet/ssl/certificate_request.rb

lib/puppet/type.rb

lib/puppet/type/service.rb

spec/unit/application/face_base_spec.rb

spec/unit/application/kick_spec.rb

spec/unit/file_serving/configuration/parser_spec.rb

spec/unit/interface/action_builder_spec.rb

spec/unit/module_spec.rb

spec/unit/network/authconfig_spec.rb

spec/unit/parser/collector_spec.rb

spec/unit/parser/resource_spec.rb

spec/unit/property_spec.rb

spec/unit/provider/package/dpkg_spec.rb

spec/unit/provider/package/zypper_spec.rb

spec/unit/provider/selmodule_spec.rb

spec/unit/provider/service/upstart.rb

spec/unit/provider/service/upstart_spec.rb

spec/unit/provider/user/pw_spec.rb

spec/unit/provider_spec.rb

spec/unit/resource/catalog_spec.rb

spec/unit/simple_graph_spec.rb

spec/unit/type_spec.rb

tasks/rake/contrib

tasks/rake/contrib/progressbar.rb

tasks/rake/contrib/uri_ext.rb

tasks/rake/downloadtask.rb

tasks/windows

tasks/windows/README.markdown

Merge remote-tracking branch 'origin/2.7.x'
009b350d06d3Unpublished
Actions