Diffusion puppet eadbf4939732

Merge branch '2.7.x'
eadbf4939732Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

2.7.x: (maint) Remove unnecessary step from puppet module build help (#13659) Convert fact values to string when searching database (#13649) Restrict module name matching (#13643) Make the use of FileUtils.rm_rf secure (#13642) Move search notice message (#13639) Don't send errors directly to stderr (#13638) Add SemVer#pre function (#3581) Stop forking around: Add fork helper method (#13397) fix gem provider ensure=>latest bug (#12101) Make Puppet::Util::absolute_path? usable in autoloader (#12101) Add shared context for specs to imitate windows or posix

Conflicts:
lib/puppet/util.rb
spec/unit/util_spec.rb

Details

Provenance

Patrick Carlisle <patrick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUc210584675f3: Merge pull request #614 from cprice-puppet/bug/2.7.x/13397-ensure-latest…
rPU89a485bbabf5: Bring Nagios module back into the core.

Branches

Unknown

Tags

Unknown

Event Timeline

Patrick Carlisle <patrick@puppetlabs.com> committed rPUeadbf4939732: Merge branch '2.7.x' (authored by Patrick Carlisle <patrick@puppetlabs.com>).Apr 10 2012, 8:13 PM

Merged Changes

c210584675f3 Merge pull request #614 from cprice-puppet/bug/2.7.x/13397-ensure-latest…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
1849f2702392 Merge pull request #639 from pcarlisle/ticket/2.7.x/13659-postgres-integer-facts
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
3afe751b62d2 Merge pull request #649 from jeffmccune/maint/2.7.x/puppet_module_build_help
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
04545eb125d6 Merge pull request #611 from pcarlisle/ticket/2.7.x/12101-reapply-autoload
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
cfc631f9c2ca Merge pull request #630 from kelseyhightower/ticket/2.7.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
30cb4a43049c Merge pull request #625 from kelseyhightower/ticket/2.7.x/13638_add_pre_funciton
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
ffc31bf687b0 Merge pull request #629 from kelseyhightower/ticket/2.7.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
8a4a51c08119 Merge pull request #627 from kelseyhightower/ticket/2.7.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
0b13a37ff4da Merge pull request #620 from kelseyhightower/kelseyhightower/ticket/2.7.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
130661156198 (maint) Remove unnecessary step from puppet module build help
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
aa267eff69dd Merge remote-tracking branch 'kelseyhightower/ticket/2.7.
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits
7e780946f76e (#13659) Convert fact values to string when searching database
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
e7d39119b3f9 (#13649) Restrict module name matching
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
9cbda4997d64 (#13643) Make the use of FileUtils.rm_rf secure
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
6819cf3480d8 (#13642) Move search notice message
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
28531f814a97 (#13639) Don't send errors directly to stderr
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
45f8009034fb (#13638) Add SemVer#pre function
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
1b810b1b8a5d (#3581) Stop forking around: Add fork helper method
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
e24755dafe0f (#13397) fix gem provider ensure=>latest bug
Author
Chris Price <chris@puppetlabs.com>
Browse Repository
No Builds
No Audits
3f28268b1716 (#12101) Make Puppet::Util::absolute_path? usable in autoloader
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
772f7566d68d (#12101) Add shared context for specs to imitate windows or posix
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (32)

Path

Size

lib/

puppet/

application/

face/

module/

forge/

module_tool/

applications/

node/

provider/

package/

rails/

inventory_node.rb

reports/

type/

util/

spec/

shared_behaviours/

path_parameters.rb

shared_contexts

unit/

application/

node/

environment_spec.rb

parser/

functions/

generate_spec.rb

provider/

exec/

windows_spec.rb

package/

type/

package_spec.rb

util/

execution_spec.rb

log/

destinations_spec.rb

rPUeadbf4939732

lib/puppet/application/kick.rb

Loading...

lib/puppet/face/module/build.rb

Loading...

lib/puppet/face/module/search.rb

Loading...

lib/puppet/forge.rb

Loading...

lib/puppet/forge/repository.rb

Loading...

lib/puppet/module_tool/applications/builder.rb

Loading...

lib/puppet/module_tool/applications/uninstaller.rb

Loading...

lib/puppet/module_tool/applications/unpacker.rb

Loading...

lib/puppet/node/environment.rb

Loading...

lib/puppet/provider/package/gem.rb

Loading...

lib/puppet/rails/inventory_node.rb

Loading...

lib/puppet/reports/tagmail.rb

Loading...

lib/puppet/type/package.rb

Loading...

lib/puppet/util.rb

Loading...

lib/puppet/util/autoload.rb

Loading...

lib/puppet/util/execution.rb

Loading...

lib/semver.rb

Loading...

spec/shared_behaviours/path_parameters.rb

Loading...

spec/shared_contexts/platform.rb

Loading...

spec/spec_helper.rb

Loading...

spec/unit/application/kick_spec.rb

Loading...

spec/unit/node/environment_spec.rb

Loading...

spec/unit/parser/functions/generate_spec.rb

Loading...

spec/unit/provider/exec/windows_spec.rb

Loading...

spec/unit/provider/package/gem_spec.rb

Loading...

spec/unit/semver_spec.rb

Loading...

spec/unit/type/exec_spec.rb

Loading...

spec/unit/type/package_spec.rb

Loading...

spec/unit/util/execution_spec.rb

Loading...

spec/unit/util/log/destinations_spec.rb

Loading...

spec/unit/util_spec.rb

Loading...