Merge branch '2.7.x'
c17cc7a78a44Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

Details

Provenance

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

Parents

rPU9fc0a83de109: Merge branch '2.6.x' into 2.7.x
rPU9283cd6ed473: Merge pull request #298 from zsprackett/gitignore

Branches

Unknown

Tags

Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPUc17cc7a78a44: Merge branch '2.7.x' (authored by Daniel Pittman <daniel@puppetlabs.com>).Jan 18 2012, 11:09 PM

Merged Changes

9fc0a83de109 Merge branch '2.6.x' into 2.7.x
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
765036c707a2 Merge pull request #342 from daniel-pittman/refactor/2.6.x/11996-spec-failures…
Author
lifton <lifton@puppetlabs.com>
Browse Repository
No Builds
No Audits
d57c5730a948 Merge pull request #344 from daniel-pittman/refactor/2.7.x/11996-spec-failures…
Author
lifton <lifton@puppetlabs.com>
Browse Repository
No Builds
No Audits
8da947fd757d (#11996) Fix file content test after hash changes.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
884fe754e599 (#11996) Fix file server recursion test after hash changes.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
3fb0938827b5 (#11996) Fix graph cycle reporting order after hash changes.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
3a57b0736690 Merge branch 'refactor/2.6.x/11996-spec-failures-after-ruby-187-p357' into…
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
a758066dd374 (#11996) Fix test failures due to hash processing order changes.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
71062fb5b26e Merge pull request #346 from mmrobins/ticket/2.7.x/11600_remove_module_face
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
d6d6e60fc04a (#11600) Remove module face
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
b25c97413ff9 Merge pull request #340 from jeffmccune/ticket/2.7.x/11888_revert_for_27
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
c8f5cd6d1a43 Merge branch 'bug/2.7.x/11499-better-ip-address-validation-for-host-type' into…
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
18472282b665 (#11499) Better validation for IPv4 and IPv6 address in host type.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
a0f865b69ee4 Merge branch 'ticket/2.7.x/11802-fix_path_separator_windows_test_failures' of…
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
a406a2eb0825 (#11802) Fix module list specs on Windows
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
cb823279bd7c Merge branch 'bug/2.7.x/11803-broken-test-for-module-uninstall' into 2.7.x
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
13238af4240f (#11803) Fix broken tests for uninstall action on module face
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
7fdd8a154e40 (#11888) Revert 483a1d9 for 2.7.x only
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
96e79835e372 Merge pull request #332 from kelseyhightower/ticket/2.7.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
97fffa8a6b7a (#11803) Add uninstall action for the module face
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
75d7cad19be9 Merge pull request #338 from pcarlisle/ticket/2.7.x/freebsd-user-passwords
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
8b3e440d5e9f Merge pull request #333 from mmrobins/ticket/2.7.x/11802-puppet_module_list
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
89013a4517fe Merge pull request #337 from kelseyhightower/ticket/2.7.
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
2d4af0e649d4 (#11958) Improve error msg for missing pip command
Author
Kelsey Hightower <kelsey@puppetlabs.com>
Browse Repository
No Builds
No Audits
032043e325c7 (#11046) Add support for user expiry in pw user provider
Author
Tim Bishop <tim@bishnet.net>
Browse Repository
No Builds
No Audits
9b8829d2b6d4 (#11046) Improve pw group provider on FreeBSD
Author
Tim Bishop <tim@bishnet.net>
Browse Repository
No Builds
No Audits
fb111ef79829 (#10962) Make sure managehome is respected on FreeBSD
Author
Tim Bishop <tim@bishnet.net>
Browse Repository
No Builds
No Audits
884381f7d6bd (#11318) Add password management on FreeBSD
Author
Tim Bishop <tim@bishnet.net>
Browse Repository
No Builds
No Audits
9348fe206289 Merge pull request #336 from joshcooper/maint/2.7.x/cert-ttl-build-errors
Author
lifton <lifton@puppetlabs.com>
Browse Repository
No Builds
No Audits
acd2f917cb05 (Maint) Fix time-dependent certificate factory test failures
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
cd56926d4c36 (#11802) Add module list action
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
fecf5d693dde (#11803) Add modules_by_path method to environments
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
dad8697ced0e (#11802) Make Puppet::Module able to find module in specific path
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
520ac07c7bba maint: Cleanup environment_spec
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
b27f3cc0e5f0 maint: Fix Puppet::Node::Environment::Helper specs
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
dfa539ae4919 maint: Remove unused method requires
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
b967da2fe1f1 maint: Remove Module.modulepath
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (41)

Path

Size

lib/

puppet/

application/

face/

module/

module_tool/

applications/

node/

parser/

provider/

group/

package/

service/

user/

type/

util/

rdoc/

parser.rb

spec/

integration/

indirector/

file_content/

file_server_spec.rb

unit/

face/

module/

module_tool/

node/

parser/

ast/

asthash_spec.rb

property/

keyvalue_spec.rb

provider/

group/

package/

service/

user/

ssl/

certificate_factory_spec.rb

type/

file_spec.rb

host_spec.rb

util/

rdoc/

parser_spec.rb

rPUc17cc7a78a44

View Options

lib/puppet/application/module.rb

View Options

lib/puppet/face/module.rb

View Options

lib/puppet/face/module/list.rb

View Options

lib/puppet/face/module/uninstall.rb

View Options

lib/puppet/module.rb

View Options

lib/puppet/module_tool/applications.rb

View Options

lib/puppet/module_tool/applications/uninstaller.rb

View Options

lib/puppet/node/environment.rb

View Options

lib/puppet/parser/type_loader.rb

View Options

lib/puppet/provider/group/pw.rb

View Options

lib/puppet/provider/package/pip.rb

View Options

lib/puppet/provider/package/up2date.rb

View Options

lib/puppet/provider/service/redhat.rb

View Options

lib/puppet/provider/service/systemd.rb

View Options

lib/puppet/provider/user/pw.rb

View Options

lib/puppet/simple_graph.rb

View Options

lib/puppet/type/host.rb

View Options

lib/puppet/util/rdoc/parser.rb

View Options

spec/integration/indirector/file_content/file_server_spec.rb

View Options

spec/unit/face/module

View Options

spec/unit/face/module/build_spec.rb

View Options

spec/unit/face/module/changes_spec.rb

View Options

spec/unit/face/module/clean_spec.rb

View Options

spec/unit/face/module/generate_spec.rb

View Options

spec/unit/face/module/install_spec.rb

View Options

spec/unit/face/module/search_spec.rb

View Options

spec/unit/module_spec.rb

View Options

spec/unit/module_tool/uninstaller_spec.rb

View Options

spec/unit/node/environment_spec.rb

View Options

spec/unit/parser/ast/asthash_spec.rb

View Options

spec/unit/property/keyvalue_spec.rb

View Options

spec/unit/provider/group/pw_spec.rb

View Options

spec/unit/provider/package/pip_spec.rb

View Options

spec/unit/provider/package/up2date_spec.rb

View Options

spec/unit/provider/service/redhat_spec.rb

View Options

spec/unit/provider/service/systemd_spec.rb

View Options

spec/unit/provider/user/pw_spec.rb

View Options

spec/unit/ssl/certificate_factory_spec.rb

View Options

spec/unit/type/file_spec.rb

View Options

spec/unit/type/host_spec.rb

View Options

spec/unit/util/rdoc/parser_spec.rb

Merge branch '2.7.x'c17cc7a78a44UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (41)

rPUc17cc7a78a44

lib/puppet/application/module.rb

lib/puppet/face/module.rb

lib/puppet/face/module/list.rb

lib/puppet/face/module/uninstall.rb

lib/puppet/module.rb

lib/puppet/module_tool/applications.rb

lib/puppet/module_tool/applications/uninstaller.rb

lib/puppet/node/environment.rb

lib/puppet/parser/type_loader.rb

lib/puppet/provider/group/pw.rb

lib/puppet/provider/package/pip.rb

lib/puppet/provider/package/up2date.rb

lib/puppet/provider/service/redhat.rb

lib/puppet/provider/service/systemd.rb

lib/puppet/provider/user/pw.rb

lib/puppet/simple_graph.rb

lib/puppet/type/host.rb

lib/puppet/util/rdoc/parser.rb

spec/integration/indirector/file_content/file_server_spec.rb

spec/unit/face/module

spec/unit/face/module/build_spec.rb

spec/unit/face/module/changes_spec.rb

spec/unit/face/module/clean_spec.rb

spec/unit/face/module/generate_spec.rb

spec/unit/face/module/install_spec.rb

spec/unit/face/module/search_spec.rb

spec/unit/module_spec.rb

spec/unit/module_tool/uninstaller_spec.rb

spec/unit/node/environment_spec.rb

spec/unit/parser/ast/asthash_spec.rb

spec/unit/property/keyvalue_spec.rb

spec/unit/provider/group/pw_spec.rb

spec/unit/provider/package/pip_spec.rb

spec/unit/provider/package/up2date_spec.rb

spec/unit/provider/service/redhat_spec.rb

spec/unit/provider/service/systemd_spec.rb

spec/unit/provider/user/pw_spec.rb

spec/unit/ssl/certificate_factory_spec.rb

spec/unit/type/file_spec.rb

spec/unit/type/host_spec.rb

spec/unit/util/rdoc/parser_spec.rb

Merge branch '2.7.x'
c17cc7a78a44Unpublished
Actions