Merge branch 'master' into 2.7rc
91acd8be41f3Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into 2.7rc

Details

Provenance

Michael Stahnke <stahnma@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU6651b28d64d5: Merge branch '2.7.x'
rPU902c4147a210: Update configurer_spec.rb to work with Ruby 1.8.5

Branches

Unknown

Tags

Unknown

Event Timeline

Michael Stahnke <stahnma@puppetlabs.com> committed rPU91acd8be41f3: Merge branch 'master' into 2.7rc (authored by Michael Stahnke <stahnma@puppetlabs.com>).Jul 6 2011, 11:05 PM

Merged Changes

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

6651b28d64d5 Merge branch '2.7.x'
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
8772bb7659a8 Merge branch '2.7.x'
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
cf93404e53aa Merge branch 'template-not-defined-test-failure'
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
51608221da24 Clean up indentation, whitespace, and commented out code
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
92a8f4a1cbb4 Remove order dependency from functions integration spec
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
0b0a9be25f95 Merge branch '2.7.x'
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
649b3dc58349 Merge branch '2.7.x'
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
e0573603c578 Merge branch '2.7.x'
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
4801e10c8126 Merge branch '2.7.x'
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
520cbc0292ec Merge branch '2.7.x'
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
78657fcd7f77 Merge branch '2.6.x' into 2.7.x
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
4d6703ca2eb2 Merge branch 'test/2.6.x/4123'
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
fb0ddf2a85ea Merge branch 'tests/master/7117'
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
b101804f5825 add puppet master polling step for ticket 7117
Author
Dominic Maraglia <dominic@puppetlabs.com>
Browse Repository
No Builds
No Audits
2a86215498b2 Merge branch 'ticket/master/maint-ruby19_fix'
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
107b38a94f8b maint: Fix pacman provider to work with Ruby 1.9
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
7f826bfc1352 Merge branch '2.7.x'
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
25b967559dfa Merge branch 'vcsrepo'
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
8f0cecfb46af Added the vcsrepo type and providers to the core
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
b87a1dea704e Merge branch 'next'
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
7941336d6b91 Merge branch '2.7.next' into next
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
c81f5c6e6cdb Adding a sleep state post starting master
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits
b63fd841a188 Merge branch 'next'
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
51855e7f1787 Merge branch '2.7.next' into next
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
3b4fd7a2a448 Merge branch 'ticket/next/1853-pacman-provider' into next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
1dc662a0988f (#1853) Pacman package provider
Author
Paul Boyd <boyd.paul2@gmail.com>
Browse Repository
No Builds
No Audits
6bb2a85a2d1b (#1853) Pacman package provider
Author
Paul Boyd <boyd.paul2@gmail.com>
Browse Repository
No Builds
No Audits
c8215c550cbe Merge branch 'next'
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
a8e4df735abc Merge branch '2.7.next' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
82fb02ce27c9 Merge branch 'next'
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
704623cb95aa Merge branch '2.7.next' into next
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
9d73b73594d4 Merge branch 'tickets/next/7481' into next
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
81d566f21646 Fixed #7481 - Added MIT license to Thomas Bellman's function code
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
b586a08cde48 Merge branch 'ticket/next/7264-metaparameter_reference' into next
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
1695daca385b (#7264) Docs: Clarify that subscribe/notify imply require/before
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
7f9c9e1089c4 Merge branch 'next'
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
68c82d4d8b75 Merge branch '2.7.next' into next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
32b13dad0619 Merge branch 'ticket/next/7101-template-compilation' into next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
ac0581f16ca1 (#7101) Fix template error messages in Ruby 1.8.5
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
a80ff1ad0d25 Merge branch 'ticket/master/7101-template-compilation'
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
9d2500e7169b (#7101) Fix template error messages in Ruby 1.8.5
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
89e9a212e7c2 add test for ticket 7101
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits
74498afecdc0 add test for ticket 7101
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits
25593abbb044 Merge branch 'next'
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
e4b31b411a4b Merge branch '2.7.next' into next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
01f610bb223b Merge branch 'next'
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
fc66e98b84b9 Merge branch '2.7.next' into next
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
06b8e7608eb8 Merge branch 'maint/defined_type_has_two_parents' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6981ee5f526e Maint: Fix a #4655 introduced log inconsistency
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
cb43cfc85324 Moving tests from Puppet-acceptance repo
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

lib/

puppet/

parser/

functions/

regsubst.rb

shellquote.rb

sprintf.rb

provider/

package/

pacman.rb

spec/

unit/

provider/

package/

pacman_spec.rb

rPU91acd8be41f3

View Options

lib/puppet/parser/functions/regsubst.rb

View Options

lib/puppet/parser/functions/shellquote.rb

View Options

lib/puppet/parser/functions/sprintf.rb

View Options

lib/puppet/provider/package/pacman.rb

View Options

spec/unit/provider/package/pacman_spec.rb

Merge branch 'master' into 2.7rc91acd8be41f3UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (5)

rPU91acd8be41f3

lib/puppet/parser/functions/regsubst.rb

lib/puppet/parser/functions/shellquote.rb

lib/puppet/parser/functions/sprintf.rb

lib/puppet/provider/package/pacman.rb

spec/unit/provider/package/pacman_spec.rb

Merge branch 'master' into 2.7rc
91acd8be41f3Unpublished
Actions