merge-2.7.x-branch
0ca15fd4a80aUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x' into feature/master/merge-2.7.x-branch

Details

Provenance

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

Parents

rPUb79be3bc80a4: Merge pull request #334 from daniel-pittman/feature/2.7.x/merge-2.6.x-branch
rPU9381cc5d8477: Merge pull request #222 from…

Branches

Unknown

Tags

Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU0ca15fd4a80a: Merge branch '2.7.x' into feature/master/merge-2.7.x-branch (authored by Daniel Pittman <daniel@puppetlabs.com>).Jan 14 2012, 12:52 AM

Merged Changes

b79be3bc80a4 Merge pull request #334 from daniel-pittman/feature/2.7.x/merge-2.6.x-branch
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
69dfb34ede9d (#5246) Fix spec test expectations in 2.7.x branch
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
3aed4960c336 Merge branch '2.6.x' into 2.7.x
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
f4f4158f673b Merge pull request #331 from joshcooper/ticket/2.7.x/11929-serve-files-in…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
e1f2f373e119 (#11929) Always serve files in binary mode
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
2ac94f94b9af Merge pull request #230 from daniel-pittman/feature/2.7.x/symbolic-modes-for…
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
24f2a65d9be1 (#2927) Support symbolic file modes.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
48726b662d2f Finer-grained protocol for property `insync?`.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
d3a33af4afc8 Whitespace damage cleanup on property.rb
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
1eddaeb206f9 Merge pull request #217 from domcleal/tickets/2.7.x/10807
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
e081c81001a4 Merge pull request #297 from nicklewis/ticket/2.7.x/11641
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
4033a587d5cc Merge pull request #330 from pcarlisle/8341_facts_load_once
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
c58bfbc64f9f (#8341) Only load facts once per puppet run
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
134e826084aa Merge pull request #320 from joshcooper/ticket/2.7.x/11847-relocatable-puppet…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
ab0242505c63 Merge pull request #328 from glarizza/bug/2.7.x/3419_osx_groups
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
2b0d3b8ad98a (#3419) Fix OS X Ruby supplementary group handling
Author
Gary Larizza <gary@puppetlabs.com>
Browse Repository
No Builds
No Audits
2a99004fb945 Merge pull request #327 from ripienaar/bug/2.6.x/5246
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
276d590b9b98 Merge pull request #325 from glarizza/bug/2.7.x/4855_osx_group_failure
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
483a1d93a5e5 Merge branch 'tickets/2.7.x/11888' into 2.7.x
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
2ca9f9da9baa (#11888) Switch up2date,systemd,redhat providers to osfamily fact
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
e0e31d571f38 (#5246) Puppetd does not remove it's pidfile when it exits
Author
R.I.Pienaar <rip@devco.net>
Browse Repository
No Builds
No Audits
90bdef6893d5 (#4855) Fix group resource in OS X
Author
Gary Larizza <gary@puppetlabs.com>
Browse Repository
No Builds
No Audits
c6667c50d3b4 Merge pull request #324 from glarizza/bug/2.7.x/2273_launchd_dashw
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
bc6c6428c7ae Merge pull request #318 from glarizza/bug/2.7.x/11202_apple_rake
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
6c14a28e933c Build a Rake task for building Apple Packages
Author
Gary Larizza <gary@puppetlabs.com>
Browse Repository
No Builds
No Audits
5ec5657a1e82 Merge pull request #127 from adrienthebo/ticket/2.7.x/8341…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
450da6afb246 Merge pull request #92 from duritong/tickets/2.7.x/1886
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
d5bef5ea4514 (#2773) Use launchctl load -w in launchd provider
Author
Gary Larizza <gary@puppetlabs.com>
Browse Repository
No Builds
No Audits
1cb2b6a5a361 Merge branch 'ticket/2.7.x/11714-envpuppet' into 2.7.x
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
5accc69fb145 (#11714) Use `%~dp0` to resolve bat file's install directory
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
fe795377f547 Merge pull request #323 from glarizza/bug/2.7.x/fix_launchd_spec
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
c865a80899c9 Clean up launchd spec tests
Author
Gary Larizza <gary@puppetlabs.com>
Browse Repository
No Builds
No Audits
24af732ef95f (#11714) Add envpuppet batch file to run Puppet from source on Windows
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
7edaed5f04aa (#11847) Don't hard code ruby install paths in Windows batch files
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
ca7328323ab9 (#11641) Properly track blockers when generating additional resources
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
4f1f7e4a9d33 (#10807) Use SMF's svcadm -s option to wait for errors
Author
Dominic Cleal <dcleal@redhat.com>
Browse Repository
No Builds
No Audits
747ffd2bca30 (#8341) Remove duplicate loading of facter files.
Author
Adrien Thebo <adrien@puppetlabs.com>
Browse Repository
No Builds
No Audits
c88d22b44ba4 Fix tests for #1886 with ActiveRecord 3.x
Author
Peter Meier <peter.meier@immerda.ch>
Browse Repository
No Builds
No Audits
723cd922c6d2 Revert "(Maint.) Disable cleaning of storeconfigs."
Author
Peter Meier <peter.meier@immerda.ch>
Browse Repository
No Builds
No Audits

Changes (43)

Path

Size

README_DEVELOPER.md

acceptance/

tests/

resource/

tidy/

should_remove_old_files.rb

ext/

envpuppet.bat

install.rb

lib/

puppet/

application/

agent.rb

configurer/

fact_handler.rb

face/

node/

clean.rb

file_serving/

content.rb

indirector/

facts/

facter.rb

property.rb

provider/

nameservice/

package/

service/

type/

file/

util/

symbolic_file_mode.rb

spec/

integration/

indirector/

direct_file_server_spec.rb

file_content/

file_server_spec.rb

unit/

application/

configurer/

face/

file_serving/

indirector/

facts/

facter_spec.rb

provider/

nameservice/

directoryservice_spec.rb

package/

service/

type/

file/

mode_spec.rb

util/

suidmanager_spec.rb

symbolic_file_mode_spec.rb

tasks/

rake/

apple.rake

templates

prototype.plist.erb

rPU0ca15fd4a80a

View Options

README_DEVELOPER.md

View Options

acceptance/tests/resource/tidy/should_remove_old_files.rb

View Options

ext/envpuppet.bat

View Options

install.rb

View Options

lib/puppet/application/agent.rb

View Options

lib/puppet/configurer/fact_handler.rb

View Options

lib/puppet/face/node/clean.rb

View Options

lib/puppet/file_serving/content.rb

View Options

lib/puppet/indirector/facts/facter.rb

View Options

lib/puppet/property.rb

View Options

lib/puppet/provider/nameservice/directoryservice.rb

View Options

lib/puppet/provider/package/up2date.rb

View Options

lib/puppet/provider/service/launchd.rb

View Options

lib/puppet/provider/service/redhat.rb

View Options

lib/puppet/provider/service/smf.rb

View Options

lib/puppet/provider/service/systemd.rb

View Options

lib/puppet/transaction.rb

View Options

lib/puppet/type/file.rb

View Options

lib/puppet/type/file/ensure.rb

View Options

lib/puppet/type/file/mode.rb

View Options

lib/puppet/util/suidmanager.rb

View Options

lib/puppet/util/symbolic_file_mode.rb

View Options

spec/integration/indirector/direct_file_server_spec.rb

View Options

spec/integration/indirector/file_content/file_server_spec.rb

View Options

spec/unit/application/agent_spec.rb

View Options

spec/unit/configurer/fact_handler_spec.rb

View Options

spec/unit/face/node_spec.rb

View Options

spec/unit/file_serving/content_spec.rb

View Options

spec/unit/indirector/facts/facter_spec.rb

View Options

spec/unit/provider/nameservice/directoryservice_spec.rb

View Options

spec/unit/provider/package/up2date_spec.rb

View Options

spec/unit/provider/service/launchd_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/transaction_spec.rb

View Options

spec/unit/type/file/mode_spec.rb

View Options

spec/unit/util/suidmanager_spec.rb

View Options

spec/unit/util/symbolic_file_mode_spec.rb

View Options

tasks/rake/apple.rake

View Options

tasks/rake/templates/prototype.plist.erb

Merge branch '2.7.x' into feature/master/merge-2.7.x-branch0ca15fd4a80aUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (43)

rPU0ca15fd4a80a

README_DEVELOPER.md

acceptance/tests/resource/tidy/should_remove_old_files.rb

ext/envpuppet.bat

install.rb

lib/puppet/application/agent.rb

lib/puppet/configurer/fact_handler.rb

lib/puppet/face/node/clean.rb

lib/puppet/file_serving/content.rb

lib/puppet/indirector/facts/facter.rb

lib/puppet/property.rb

lib/puppet/provider/nameservice/directoryservice.rb

lib/puppet/provider/package/up2date.rb

lib/puppet/provider/service/launchd.rb

lib/puppet/provider/service/redhat.rb

lib/puppet/provider/service/smf.rb

lib/puppet/provider/service/systemd.rb

lib/puppet/transaction.rb

lib/puppet/type/file.rb

lib/puppet/type/file/ensure.rb

lib/puppet/type/file/mode.rb

lib/puppet/util/suidmanager.rb

lib/puppet/util/symbolic_file_mode.rb

spec/integration/indirector/direct_file_server_spec.rb

spec/integration/indirector/file_content/file_server_spec.rb

spec/unit/application/agent_spec.rb

spec/unit/configurer/fact_handler_spec.rb

spec/unit/face/node_spec.rb

spec/unit/file_serving/content_spec.rb

spec/unit/indirector/facts/facter_spec.rb

spec/unit/provider/nameservice/directoryservice_spec.rb

spec/unit/provider/package/up2date_spec.rb

spec/unit/provider/service/launchd_spec.rb

spec/unit/provider/service/redhat_spec.rb

spec/unit/provider/service/smf_spec.rb

spec/unit/provider/service/systemd_spec.rb

spec/unit/transaction_spec.rb

spec/unit/type/file/mode_spec.rb

spec/unit/util/suidmanager_spec.rb

spec/unit/util/symbolic_file_mode_spec.rb

tasks/rake/apple.rake

tasks/rake/templates/prototype.plist.erb

Merge branch '2.7.x' into feature/master/merge-2.7.x-branch
0ca15fd4a80aUnpublished
Actions