Merge branch '2.7rc'
2ba3c446f818Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7rc'

Details

Provenance

Matthaus Litteken <matthaus@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU5a3f24d8f31d: Updated CHANGELOG for 2.7.4rc1
rPU86f47191cc4d: Revert "Fixes #8119 - Write to a temporary file and move when storing reports."

Branches

Unknown

Tags

Unknown

Event Timeline

Matthaus Litteken <matthaus@puppetlabs.com> committed rPU2ba3c446f818: Merge branch '2.7rc' (authored by Matthaus Litteken <matthaus@puppetlabs.com>).Sep 10 2011, 12:03 AM

Merged Changes

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

5a3f24d8f31d Updated CHANGELOG for 2.7.4rc1
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
1422fc38fe3e Merge branch 'feature/master/7999-systemd-services' into 2.7.x
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
307d14de9813 Merge branch '2.7rc' into 2.7.x
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
2f7380b6ade1 Merge branch '2.7.x' of github.com:puppetlabs/puppet into feature/master/7999…
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
04519a78eba8 Revert "Merge pull request #100 from glarizza/tickets/2.7.x/9192_launchd_fix"
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
769f2b20a687 Revert "Merge pull request #99 from nigelkersten/tickets/2.7.x/9143-make…
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
88f1ef54dc08 Merge pull request #99 from nigelkersten/tickets/2.7.x/9143-make…
Author
Nigel Kersten <nigel@puppetlabs.com>
Browse Repository
No Builds
No Audits
2828d22daef9 Merge pull request #100 from glarizza/tickets/2.7.x/9192_launchd_fix
Author
Nigel Kersten <nigel@puppetlabs.com>
Browse Repository
No Builds
No Audits
ff13d8d9fd7f Add comment explaining helper method
Author
Gary Larizza <gary@puppetlabs.com>
Browse Repository
No Builds
No Audits
74cffa087aa3 Merge pull request #98 from daniel-pittman/feature/2.7.x/9051-storeconfig…
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
40f64e9d0215 Add has_macosx_plist_overrides? method
Author
Gary Larizza <gary@puppetlabs.com>
Browse Repository
No Builds
No Audits
670d30c245db Fix ActiveRecord handling of symbols in query interpolation.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
51b0c002d4f1 Fixes #9143, allows macauthorization provider to work on OS X Lion 10.7
Author
Nigel Kersten <nigel@puppetlabs.com>
Browse Repository
No Builds
No Audits
a04051a48c24 (#9051) Move complex collect expression error into terminus.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
b4ea0862b130 Merge pull request #90 from nicklewis/fix-pidlock-removal-failure
Author
joshcooper <josh+github@puppetlabs.com>
Browse Repository
No Builds
No Audits
f7e526b86a01 (#8413) Only try to catch Process::Error if it's defined
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
2af580256d2b Merge pull request #74 from nicklewis/ticket/2.7.x/8413
Author
joshcooper <josh+github@puppetlabs.com>
Browse Repository
No Builds
No Audits
cfc6b7505f05 Merge pull request #86 from daniel-pittman/feature/2.7.x/9051-storeconfig…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
2c9628659b7a Debug order-dependent test failures in CI / ActiveRecord.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
a0fabbcade73 Merge pull request #81 from daniel-pittman/feature/2.7.x/9051-storeconfig…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
38070d5b2a8a Don't toggle storeconfigs back and forth.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
1b3cc0aa8ce2 Merge pull request #79 from daniel-pittman/feature/2.7.x/9051-storeconfig…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
cf602431b532 One character typo, entire code path broken...
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
40dc39ce3fa1 More protection against accidentally using sqlite3
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
900c5916d5e0 Merge pull request #78 from daniel-pittman/feature/2.7.x/9051-storeconfig…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
f89874994619 Save and restore indirector configuration around all tests.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
e3073ac15389 (#9051) More storeconfigs test cleanup.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
28c91040dd06 Merge pull request #77 from daniel-pittman/feature/2.7.x/9051-storeconfig…
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
51461de41ea3 (#9051) Protect SQLite tests from running without gem.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
94609b11f934 Merge branch '2.7.x' into feature/2.7.x/9051-storeconfig-backend-should-be…
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
bdad190519e3 Merge branch 'feature/2.7.x/9051-storeconfig-backend-should-be-configurable'…
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
29c7bf2ce5d6 Merge pull request #75 from joshcooper/ticket/2.7.x/8662-elevated-priv-check…
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
bb0380f9eccf (#8662) Don't rely on error message to detect UAC capable platform
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
61a809a4ccab Merge pull request #62 from nicklewis/ticket/2.7.x/8489
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
73ea15bc1816 Merge pull request #64 from jhelwig/tickets/2.7.x/8412-install-msi-on-windows…
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
7a36265fe79e Merge pull request #63 from nicklewis/ticket/2.7.x/9174
Author
joshcooper <josh+github@puppetlabs.com>
Browse Repository
No Builds
No Audits
2ab563408159 (#8413) Properly clean up stale pidfile on Windows
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
cc958e1019e3 (#8412) Add MSI package provider for use with Windows
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
878ea2543270 (#8412) Add optional type-level validation of the source parameter
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
dad075d090e7 Correct grammar in parameter comment
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
4168a4c64282 Clean up formatting & whitespace in Puppet::Type
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
fd1d4b9af4d8 (#9051) de-ActiveRecord-ify Collection expressions.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
78e33cc873f1 (#9051) Port query tests into the indirection.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
65580e75dba1 (#9051) Implement the `resource` terminus for StoreConfigs.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
89aaa51e4824 (#9051) Make generic tagging imported resource origins.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
d5b295d67c78 (#9051) Whitespace cleanup for puppet/parser/collector
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
611c466e235a (#9051) Dead code elimination in the compiler terminus.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
6e0ff6a77e00 (#9051) Get the compiler out of the ActiveRecord business.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
4d51680d59aa (#9051) Implement the StoreConfigs indirection itself.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
d0357c8404ad (#9051) Add configuration around StoreConfigs indirection.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (92)

Path

Size

CHANGELOG

install.rb

lib/

puppet.rb

puppet/

application/

doc.rb

queue.rb

defaults.rb

indirector/

catalog/

facts/

node/

resource/

parameter/

parser/

ast/

provider/

	exec.rb/
	exec/


	posix.rb

exec/

package/

service/

rails/

type/

util/

spec/

integration/

parser/

provider/

lib/

puppet_spec/

files.rb

shared_behaviours/

path_parameters.rb

store_configs_terminus.rb

spec_helper.rb

unit/

application/

queue_spec.rb

face/

node_spec.rb

indirector/

catalog/

compiler_spec.rb

store_configs_spec.rb

facts/

inventory_active_record_spec.rb

store_configs_spec.rb

node/

store_configs_spec.rb

resource/

active_record_spec.rb

store_configs_spec.rb

parser/

ast/

collexpr_spec.rb

collector_spec.rb

provider/

exec/

package/

service/

type/

util/

test/

util/

utiltest.rb

rPU2ba3c446f818

View Options

CHANGELOG

View Options

install.rb

View Options

lib/puppet.rb

View Options

lib/puppet/application/doc.rb

View Options

lib/puppet/application/queue.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/indirector/catalog/compiler.rb

View Options

lib/puppet/indirector/catalog/store_configs.rb

View Options

lib/puppet/indirector/facts/store_configs.rb

View Options

lib/puppet/indirector/node/store_configs.rb

View Options

lib/puppet/indirector/resource/active_record.rb

View Options

lib/puppet/indirector/resource/store_configs.rb

View Options

lib/puppet/indirector/store_configs.rb

View Options

lib/puppet/parameter.rb

View Options

lib/puppet/parameter/path.rb

View Options

lib/puppet/parser/ast/collection.rb

View Options

lib/puppet/parser/ast/collexpr.rb

View Options

lib/puppet/parser/collector.rb

View Options

lib/puppet/parser/resource.rb

View Options

lib/puppet/provider/exec.rb

View Options

lib/puppet/provider/exec/posix.rb

View Options

lib/puppet/provider/exec/windows.rb

View Options

lib/puppet/provider/package.rb

View Options

lib/puppet/provider/package/appdmg.rb

View Options

lib/puppet/provider/package/apple.rb

View Options

lib/puppet/provider/package/apt.rb

View Options

lib/puppet/provider/package/aptitude.rb

View Options

lib/puppet/provider/package/aptrpm.rb

View Options

lib/puppet/provider/package/blastwave.rb

View Options

lib/puppet/provider/package/dpkg.rb

View Options

lib/puppet/provider/package/fink.rb

View Options

lib/puppet/provider/package/freebsd.rb

View Options

lib/puppet/provider/package/gem.rb

View Options

lib/puppet/provider/package/hpux.rb

View Options

lib/puppet/provider/package/macports.rb

View Options

lib/puppet/provider/package/msi.rb

View Options

lib/puppet/provider/package/openbsd.rb

View Options

lib/puppet/provider/package/pip.rb

View Options

lib/puppet/provider/package/pkg.rb

View Options

lib/puppet/provider/package/pkgdmg.rb

View Options

lib/puppet/provider/package/pkgutil.rb

View Options

lib/puppet/provider/package/ports.rb

View Options

lib/puppet/provider/package/portupgrade.rb

View Options

lib/puppet/provider/package/rpm.rb

View Options

lib/puppet/provider/package/sun.rb

View Options

lib/puppet/provider/package/sunfreeware.rb

View Options

lib/puppet/provider/package/up2date.rb

View Options

lib/puppet/provider/package/urpmi.rb

View Options

lib/puppet/provider/package/yum.rb

View Options

lib/puppet/provider/service/systemd.rb

View Options

lib/puppet/rails/resource.rb

View Options

lib/puppet/type.rb

View Options

lib/puppet/type/exec.rb

View Options

lib/puppet/type/package.rb

View Options

lib/puppet/type/service.rb

View Options

lib/puppet/util.rb

View Options

lib/puppet/util/pidlock.rb

View Options

lib/puppet/util/suidmanager.rb

View Options

spec/integration/defaults_spec.rb

View Options

spec/integration/parser/parser_spec.rb

View Options

spec/integration/provider/package_spec.rb

View Options

spec/integration/util_spec.rb

View Options

spec/lib/puppet_spec/files.rb

View Options

spec/shared_behaviours/path_parameters.rb

View Options

spec/shared_behaviours/store_configs_terminus.rb

View Options

spec/spec_helper.rb

View Options

spec/unit/application/queue_spec.rb

View Options

spec/unit/face/node_spec.rb

View Options

spec/unit/indirector/catalog/compiler_spec.rb

View Options

spec/unit/indirector/catalog/store_configs_spec.rb

View Options

spec/unit/indirector/facts/inventory_active_record_spec.rb

View Options

spec/unit/indirector/facts/store_configs_spec.rb

View Options

spec/unit/indirector/node/store_configs_spec.rb

View Options

spec/unit/indirector/resource/active_record_spec.rb

View Options

spec/unit/indirector/resource/store_configs_spec.rb

View Options

spec/unit/indirector/store_configs_spec.rb

View Options

spec/unit/parser/ast/collexpr_spec.rb

View Options

spec/unit/parser/collector_spec.rb

View Options

spec/unit/provider/exec/posix_spec.rb

View Options

spec/unit/provider/exec/windows_spec.rb

View Options

spec/unit/provider/package/msi_spec.rb

View Options

spec/unit/provider/service/redhat_spec.rb

View Options

spec/unit/provider/service/smf_spec.rb

View Options

spec/unit/provider/service/systemd_spec.rb

View Options

spec/unit/resource_spec.rb

View Options

spec/unit/type/exec_spec.rb

View Options

spec/unit/type/package_spec.rb

View Options

spec/unit/type/service_spec.rb

View Options

spec/unit/type_spec.rb

View Options

spec/unit/util/suidmanager_spec.rb

View Options

spec/unit/util_spec.rb

View Options

Merge branch '2.7rc'2ba3c446f818UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (92)

rPU2ba3c446f818

CHANGELOG

install.rb

lib/puppet.rb

lib/puppet/application/doc.rb

lib/puppet/application/queue.rb

lib/puppet/defaults.rb

lib/puppet/indirector/catalog/compiler.rb

lib/puppet/indirector/catalog/store_configs.rb

lib/puppet/indirector/facts/store_configs.rb

lib/puppet/indirector/node/store_configs.rb

lib/puppet/indirector/resource/active_record.rb

lib/puppet/indirector/resource/store_configs.rb

lib/puppet/indirector/store_configs.rb

lib/puppet/parameter.rb

lib/puppet/parameter/path.rb

lib/puppet/parser/ast/collection.rb

lib/puppet/parser/ast/collexpr.rb

lib/puppet/parser/collector.rb

lib/puppet/parser/resource.rb

lib/puppet/provider/exec.rb

lib/puppet/provider/exec/posix.rb

lib/puppet/provider/exec/windows.rb

lib/puppet/provider/package.rb

lib/puppet/provider/package/appdmg.rb

lib/puppet/provider/package/apple.rb

lib/puppet/provider/package/apt.rb

lib/puppet/provider/package/aptitude.rb

lib/puppet/provider/package/aptrpm.rb

lib/puppet/provider/package/blastwave.rb

lib/puppet/provider/package/dpkg.rb

lib/puppet/provider/package/fink.rb

lib/puppet/provider/package/freebsd.rb

lib/puppet/provider/package/gem.rb

lib/puppet/provider/package/hpux.rb

lib/puppet/provider/package/macports.rb

lib/puppet/provider/package/msi.rb

lib/puppet/provider/package/openbsd.rb

lib/puppet/provider/package/pip.rb

lib/puppet/provider/package/pkg.rb

lib/puppet/provider/package/pkgdmg.rb

lib/puppet/provider/package/pkgutil.rb

lib/puppet/provider/package/ports.rb

lib/puppet/provider/package/portupgrade.rb

lib/puppet/provider/package/rpm.rb

lib/puppet/provider/package/sun.rb

lib/puppet/provider/package/sunfreeware.rb

lib/puppet/provider/package/up2date.rb

lib/puppet/provider/package/urpmi.rb

lib/puppet/provider/package/yum.rb

lib/puppet/provider/service/systemd.rb

lib/puppet/rails/resource.rb

lib/puppet/type.rb

lib/puppet/type/exec.rb

lib/puppet/type/package.rb

lib/puppet/type/service.rb

lib/puppet/util.rb

lib/puppet/util/pidlock.rb

lib/puppet/util/suidmanager.rb

spec/integration/defaults_spec.rb

spec/integration/parser/parser_spec.rb

spec/integration/provider/package_spec.rb

spec/integration/util_spec.rb

spec/lib/puppet_spec/files.rb

spec/shared_behaviours/path_parameters.rb

spec/shared_behaviours/store_configs_terminus.rb

spec/spec_helper.rb

spec/unit/application/queue_spec.rb

spec/unit/face/node_spec.rb

spec/unit/indirector/catalog/compiler_spec.rb

spec/unit/indirector/catalog/store_configs_spec.rb

spec/unit/indirector/facts/inventory_active_record_spec.rb

spec/unit/indirector/facts/store_configs_spec.rb

Merge branch '2.7rc'
2ba3c446f818Unpublished
Actions