Merge branch '2.7.x'
23a1a17bebaaUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

Conflicts:
lib/puppet/daemon.rb
spec/unit/daemon_spec.rb
spec/unit/parser/ast/leaf_spec.rb
spec/unit/provider/package/dpkg_spec.rb
spec/unit/util/settings_spec.rb

Details

Provenance

cprice <chris@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU56ce669c68f7: Merge pull request #597 from stschulte/ticket/2.7.x/8193
rPU1d09389a0656: Merge pull request #589 from…

Branches

Unknown

Tags

Unknown

Event Timeline

cprice <chris@puppetlabs.com> committed rPU23a1a17bebaa: Merge branch '2.7.x' (authored by cprice <chris@puppetlabs.com>).Mar 27 2012, 8:48 PM

Merged Changes

56ce669c68f7 Merge pull request #597 from stschulte/ticket/2.7.x/8193
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
eb46b93208d0 Merge pull request #470 from daniel-pittman/bug/2.7.x/12479-bad-undef-vs-regex…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
b2e0944c06ea Merge pull request #595 from jeffweiss/ticket/2.7.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
db17d7c2a463 (#13380) Cron acceptance tests don't ensure cron actually installed
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
2b62839e54a8 Merge pull request #583 from nfagerlund/ticket/2.7.x/3022_force_attribute
Author
Kelsey Hightower <kelsey.hightower@puppetlabs.com>
Browse Repository
No Builds
No Audits
75476e1ae2b3 Merge remote-tracking branch 'daniel-pittman/refactor/2.7.x/4862-remove-the…
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
7048e889d726 (#3022) File type's force attribute's description is incomplete
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
3df8eef6c13c Merge pull request #580 from pcarlisle/ticket/2.7.x/13117-semodule-broken
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
96eda070716a Merge pull request #581 from joshcooper/maint/2.7.x/fix-fqdn-rendezvous
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
43003f5b6a62 (Maint) Consistently use the same agent fqdn
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
95c2b901a9d4 Stub execpipe using StringIO
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
ca3236423264 (#13117) Fix selmodule error on each_lines
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
dba27c9809d5 (#4862) Finally remove the event-loop library.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
8e1176639afb (#4862) define_method is not a public method in Ruby.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
11501a7c8db9 (#4862) `returning` is not a standard Ruby method.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
30a23ac94c99 (#4862) Stop using EventLoop in the Puppet daemon.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
2732f250886f (#12479) Don't make undef regexp match as the string undef.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
a62f71105055 (#8193) Add support for new ssh keytypes in authorized_key provider
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
0efc65d6084d (#8193) Add unit tests for new ssh keytypes
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
5dfc436a23cc (#8193) Support new keytypes for sshkey
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
36e66429430a (#8193) Support new keytypes for ssh_authorized_key
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits

Changes (35)

Path

Size

acceptance/

tests/

resource/

cron/

should_create_cron.rb

should_match_existing.rb

should_remove_cron.rb

should_remove_matching.rb

should_update_existing.rb

ticket_7117_broke_env_criteria_authconf.rb

lib/

puppet/

external/

interface/

module_tool/

parser/

ast/

leaf.rb

provider/

selmodule/

semodule.rb

ssh_authorized_key/

parsed.rb

type/

file.rb

ssh_authorized_key.rb

sshkey.rb

util/

network_device/

config.rb

settings.rb

spec/

unit/

agent_spec.rb

daemon_spec.rb

parser/

ast/

leaf_spec.rb

provider/

package/

ssh_authorized_key/

type/

ssh_authorized_key_spec.rb

sshkey_spec.rb

util/

settings_spec.rb

test/

other/

puppet.rb

rPU23a1a17bebaa

View Options

acceptance/tests/resource/cron/should_create_cron.rb

View Options

acceptance/tests/resource/cron/should_match_existing.rb

View Options

acceptance/tests/resource/cron/should_remove_cron.rb

View Options

acceptance/tests/resource/cron/should_remove_matching.rb

View Options

acceptance/tests/resource/cron/should_update_existing.rb

View Options

acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb

View Options

lib/puppet/agent.rb

View Options

lib/puppet/daemon.rb

View Options

lib/puppet/external/event-loop

View Options

lib/puppet/external/event-loop.rb

View Options

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

View Options

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

View Options

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

View Options

lib/puppet/interface/action.rb

View Options

lib/puppet/module_tool/modulefile.rb

View Options

lib/puppet/parser/ast/leaf.rb

View Options

lib/puppet/provider/selmodule/semodule.rb

View Options

lib/puppet/provider/ssh_authorized_key/parsed.rb

View Options

lib/puppet/type/file.rb

View Options

lib/puppet/type/ssh_authorized_key.rb

View Options

lib/puppet/type/sshkey.rb

View Options

lib/puppet/util/network_device/config.rb

View Options

lib/puppet/util/settings.rb

View Options

spec/unit/agent_spec.rb

View Options

spec/unit/daemon_spec.rb

View Options

spec/unit/parser/ast/leaf_spec.rb

View Options

spec/unit/provider/package/dpkg_spec.rb

View Options

spec/unit/provider/package/openbsd_spec.rb

View Options

spec/unit/provider/package/pacman_spec.rb

View Options

spec/unit/provider/selmodule_spec.rb

View Options

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

View Options

spec/unit/type/ssh_authorized_key_spec.rb

View Options

spec/unit/type/sshkey_spec.rb

View Options

spec/unit/util/settings_spec.rb

View Options

Merge branch '2.7.x'23a1a17bebaaUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (35)

rPU23a1a17bebaa

acceptance/tests/resource/cron/should_create_cron.rb

acceptance/tests/resource/cron/should_match_existing.rb

acceptance/tests/resource/cron/should_remove_cron.rb

acceptance/tests/resource/cron/should_remove_matching.rb

acceptance/tests/resource/cron/should_update_existing.rb

acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb

lib/puppet/agent.rb

lib/puppet/daemon.rb

lib/puppet/external/event-loop

lib/puppet/external/event-loop.rb

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

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

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

lib/puppet/interface/action.rb

lib/puppet/module_tool/modulefile.rb

lib/puppet/parser/ast/leaf.rb

lib/puppet/provider/selmodule/semodule.rb

lib/puppet/provider/ssh_authorized_key/parsed.rb

lib/puppet/type/file.rb

lib/puppet/type/ssh_authorized_key.rb

lib/puppet/type/sshkey.rb

lib/puppet/util/network_device/config.rb

lib/puppet/util/settings.rb

spec/unit/agent_spec.rb

spec/unit/daemon_spec.rb

spec/unit/parser/ast/leaf_spec.rb

spec/unit/provider/package/dpkg_spec.rb

spec/unit/provider/package/openbsd_spec.rb

spec/unit/provider/package/pacman_spec.rb

spec/unit/provider/selmodule_spec.rb

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

spec/unit/type/ssh_authorized_key_spec.rb

spec/unit/type/sshkey_spec.rb

spec/unit/util/settings_spec.rb

test/other/puppet.rb

Merge branch '2.7.x'
23a1a17bebaaUnpublished
Actions