Merge branch '2.6.next' into 2.6.x
1f438da968e1Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.next' into 2.6.x

Details

Provenance

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

Parents

rPU8f907f21c052: adding test for ticket 7139
rPUe059539a0d7b: Update CHANGELOG for 2.6.8

Branches

Unknown

Tags

Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU1f438da968e1: Merge branch '2.6.next' into 2.6.x (authored by Daniel Pittman <daniel@puppetlabs.com>).May 12 2011, 8:46 PM

Merged Changes

8f907f21c052 adding test for ticket 7139
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits
97e8ef32ff17 Merge branch 'ticket/2.6.next/7139' into 2.6.next
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
90eb937a093b (#7139) Accept '/' as a valid path in filesets
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
37c86dd466aa Merge remote-tracking branch 'toddz/feature/2.6.next/vim-indenting' into 2.6.
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
28920686e93a Merge branch 'ticket/2.6.next/6844' into 2.6.next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
1b2a7d90af49 case seems needless here as there is only two opts, also the rest of the file…
Author
ben hengst <notbenh@cpan.org>
Browse Repository
No Builds
No Audits
c4a2647ad58f Merge branch 'ticket/2.6.x/6845' into 2.6.next
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
729336e3d74f (#6845) Mount writes incorrect vfstab entries
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
6ab224313c69 Merge branch 'ticket/2.6.next/6442-agent_doesnt_need_namespaceauth' into 2.6.
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
16cf1ac559af (#6442) Be able to start agents --listen without namespaceauth.conf
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
361d6a3a6917 Merge branch 'tickets/2.6.next/3420' into 2.6.next
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
035240241d38 (#3420) Nagios "name" attribute does not output correctly
Author
Jim Pirzyk <jim+puppet@pirzyk.org>
Browse Repository
No Builds
No Audits
ddc4e1486892 Merge branch 'tickets/2.6.next/4487' into 2.6.next
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
f656818bcd7c (#4487) When setting environment on a host, ensure it is a string.
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
2cce32658855 add test for ticket 7101
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits
1ee6f949416a Merge branch 'tickets/2.6.x/6487-help-directoryservice-provider-work-on-future…
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
c306db2037a1 (#6487) Add some testing for OS X version support in DirectoryService provider
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
0008b630f8bd (#6487) Directoryservice provider will fail in future OS releases
Author
Gary Larizza <ccshots@gmail.com>
Browse Repository
No Builds
No Audits
0b9c7adce13c Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
34f9f4162827 Maint: Fix a #4655 introduced log inconsistency
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6b18f8f01f12 Move acceptance tests from puppet-acceptance repo
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits
f6afa8722a58 Merge branch 'ticket/2.6.next/7166' into 2.6.next
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
9a5bf6e25d58 Fixed #7166 - Replaced deprecated stomp "send" method with "publish"
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
72cd6fb38333 Merge branch 'tickets/2.6.x/4655-parameterized-classes-default-stages' into 2.6.
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
656eff821bec (#4655) Allow stage to be set using a default class parameter
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
16d1f784cd00 Merge remote branch 'james/tickets/2.6.x/6681' into 2.6.next
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
7f658e6a19e4 vim: Initial ftplugin and indent support
Author
Todd Zullinger <tmz@pobox.com>
Browse Repository
No Builds
No Audits
ccbe9f399a5c Fixed #6681 - Remove --force-yes option from aptitude is used
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits

Changes (32)

Path

Size

acceptance/

tests/

stages

ticket_4655_default_stage_for_classes.rb

ticket_7139_puppet_resource_file_qualified_paths.rm

ext/

vim/

lib/

puppet/

application/

file_serving/

indirector/

parser/

provider/

mount/

nameservice/

package/

rails/

util/

queue/

spec/

integration/

indirector/

catalog/

queue_spec.rb

unit/

application/

file_serving/

indirector/

parser/

provider/

nameservice/

directoryservice_spec.rb

rails/

host_spec.rb

util/

queue/

stomp_spec.rb

rPU1f438da968e1

View Options

acceptance/tests/stages/ticket_4655_default_stage_for_classes.rb

View Options

acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rm

View Options

ext/vim/README

View Options

ext/vim/ftplugin/puppet.vim

View Options

ext/vim/indent/puppet.vim

View Options

lib/puppet.rb

View Options

lib/puppet/application/agent.rb

View Options

lib/puppet/file_serving/fileset.rb

View Options

lib/puppet/indirector/queue.rb

View Options

lib/puppet/parser/compiler.rb

View Options

lib/puppet/parser/resource.rb

View Options

lib/puppet/parser/scope.rb

View Options

lib/puppet/provider/mount/parsed.rb

View Options

lib/puppet/provider/naginator.rb

View Options

lib/puppet/provider/nameservice/directoryservice.rb

View Options

lib/puppet/provider/package/aptitude.rb

View Options

lib/puppet/rails/host.rb

View Options

lib/puppet/util/queue.rb

View Options

lib/puppet/util/queue/stomp.rb

View Options

spec/integration/indirector/catalog/queue_spec.rb

View Options

spec/unit/application/agent_spec.rb

View Options

spec/unit/file_serving/fileset_spec.rb

View Options

spec/unit/indirector/queue_spec.rb

View Options

spec/unit/parser/compiler_spec.rb

View Options

spec/unit/parser/resource_spec.rb

View Options

spec/unit/parser/scope_spec.rb

View Options

spec/unit/provider/nameservice/directoryservice_spec.rb

View Options

spec/unit/rails/host_spec.rb

View Options

spec/unit/util/queue/stomp_spec.rb

Merge branch '2.6.next' into 2.6.x1f438da968e1UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (32)

rPU1f438da968e1

acceptance/tests/stages/ticket_4655_default_stage_for_classes.rb

acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rm

ext/vim/README

ext/vim/ftplugin/puppet.vim

ext/vim/indent/puppet.vim

lib/puppet.rb

lib/puppet/application/agent.rb

lib/puppet/file_serving/fileset.rb

lib/puppet/indirector/queue.rb

lib/puppet/parser/compiler.rb

lib/puppet/parser/resource.rb

lib/puppet/parser/scope.rb

lib/puppet/provider/mount/parsed.rb

lib/puppet/provider/naginator.rb

lib/puppet/provider/nameservice/directoryservice.rb

lib/puppet/provider/package/aptitude.rb

lib/puppet/rails/host.rb

lib/puppet/util/queue.rb

lib/puppet/util/queue/stomp.rb

spec/integration/indirector/catalog/queue_spec.rb

spec/unit/application/agent_spec.rb

spec/unit/file_serving/fileset_spec.rb

spec/unit/indirector/queue_spec.rb

spec/unit/parser/compiler_spec.rb

spec/unit/parser/resource_spec.rb

spec/unit/parser/scope_spec.rb

spec/unit/provider/nameservice/directoryservice_spec.rb

spec/unit/rails/host_spec.rb

spec/unit/util/queue/stomp_spec.rb

Merge branch '2.6.next' into 2.6.x
1f438da968e1Unpublished
Actions