puppet.git
aceb0a8a0156Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' of ssh://github.com/puppetlabs/puppet.git

Details

Provenance

Henrik Lindberg <henrik.lindberg@cloudsmith.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU5ec9cc2747b4: Merge branch 'pr/2829'
rPU2a4b0a79e37b: (maint) Remove duplicated logging of error.

Branches

Unknown

Tags

Unknown

Event Timeline

Henrik Lindberg <henrik.lindberg@cloudsmith.com> committed rPUaceb0a8a0156: Merge branch 'master' of ssh://github.com/puppetlabs/puppet.git (authored by Henrik Lindberg <henrik.lindberg@cloudsmith.com>).Jul 4 2014, 12:49 AM

Merged Changes

5ec9cc2747b4 Merge branch 'pr/2829'
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
65da4799abfc Merge remote-tracking branch 'rob/ticket/master/PUP-1281-colors-specs'
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
8ac08ee8e13c Merge pull request #2836 from zaphod42/issue/master/pup-500-define-collection…
Author
Henrik Lindberg <henrik.lindberg@puppetlabs.com>
Browse Repository
No Builds
No Audits
56aeead31bd1 Merge branch 'pr/2839'
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
35b1abc1b5aa Revert "(PUP-392) update win32-eventlog"
Author
Rob Reynolds <ferventcoder@gmail.com>
Browse Repository
No Builds
No Audits
0be97170097e (PUP-391) Ruby 2 exception type changed to EISDIR
Author
Ethan J. Brown <Iristyle@github>
Browse Repository
No Builds
No Audits
676768645f13 (PUP-391) Fix Rdoc 4+ specs on Windows Ruby 2 x64
Author
Ethan J. Brown <Iristyle@github>
Browse Repository
No Builds
No Audits
6b5032db0520 (PUP-1281) Ensure don't override stdout/stderr (windows/ruby2)
Author
Rob Reynolds <ferventcoder@gmail.com>
Browse Repository
No Builds
No Audits
0bc115f51a11 (PUP-391) Use FFI.errno instead of GetLastError
Author
Ethan J. Brown <Iristyle@github>
Browse Repository
No Builds
No Audits
51e91f7e7463 (PUP-391) Remove unused file19windows.rb variable
Author
Ethan J. Brown <Iristyle@github>
Browse Repository
No Builds
No Audits
fb2638a49af3 (PUP-391) Fix INVALID_FILE_ATTRIBUTES on x64
Author
Ethan J. Brown <Iristyle@github>
Browse Repository
No Builds
No Audits
b6c701550291 Merge branch 'pr/2830'
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
635d7d8571c5 (PUP-1177) Use Puppet::FileSystem.chmod
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
d703b848d642 (PUP-392) Upgrade win32-dir to 0.4.9
Author
Rob Reynolds <ferventcoder@gmail.com>
Browse Repository
No Builds
No Audits
b5a395bdfbb8 Merge branch 'pr/2828'
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
784c3d17c4d3 (PUP-1283) Relax win32-service constraint
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
ae5f19ea84bc Merge pull request #2756 from ffrank/ticket/master/PUP-1177-sshkey-mode-600
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
9bff6f37de2c Merge pull request #2797 from beergeek/fix_auth_proxy_issue
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
0d70fc4c501b (PUP-392) Upgrade win32-process
Author
Rob Reynolds <ferventcoder@gmail.com>
Browse Repository
No Builds
No Audits
cffa48679b20 (PUP-392) update win32-eventlog
Author
Rob Reynolds <ferventcoder@gmail.com>
Browse Repository
No Builds
No Audits
5a5e685bf835 (PUP-1283) Upgrade win32-service gem
Author
Rob Reynolds <ferventcoder@gmail.com>
Browse Repository
No Builds
No Audits
2a7783d5e4b8 (PUP-500) Add coverage for +> on collection
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
f623be473147 (PUP-500) Increase coverage of collection queries
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
037b55eacbe7 (PUP-500) Test realize for realz
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
1190c46388b5 (PUP-500) Translate acceptance tests to spec
Author
Andrew Parker <andy@puppetlabs.com>
Browse Repository
No Builds
No Audits
83aff4f12d1f (PUP-2869) Puppet should support HTTP proxy authentication
Author
beergeek <brett.gray@puppetlabs.com>
Browse Repository
No Builds
No Audits
ec8ef28318bb (PUP-1177) restore :ram FileType compatibility
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits
90c48ef0c28f (PUP-1177) update ParsedFile provider unit tests
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits
8610d606e162 (PUP-1177) make sure ssh_known_hosts is not created with mode 0600
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits
ba04ab4ca446 (maint) move the file mode tests to the files spec module
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits
19bc6919a83e (PUP-1177) allow parsedfile providers to choose a default mode
Author
Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Browse Repository
No Builds
No Audits

Changes (26)

Path

Size

acceptance/

tests/

apply/

virtual/

should_realize.rb

should_realize_many.rb

should_realize_query.rb

ext/

project_data.yaml

lib/

puppet/

file_system/

forge/

provider/

sshkey/

util/

windows/

spec/

integration/

parser/

collector_spec.rb

type/

nagios_spec.rb

sshkey_spec.rb

util/

windows/

security_spec.rb

lib/

puppet_spec/

files.rb

unit/

forge/

repository_spec.rb

parser/

functions/

provider/

util/

rPUaceb0a8a0156

View Options

acceptance/tests/apply/virtual

View Options

acceptance/tests/apply/virtual/should_realize.rb

View Options

acceptance/tests/apply/virtual/should_realize_many.rb

View Options

acceptance/tests/apply/virtual/should_realize_query.rb

View Options

ext/project_data.yaml

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/file_system/file19windows.rb

View Options

lib/puppet/forge/repository.rb

View Options

lib/puppet/provider/parsedfile.rb

View Options

lib/puppet/provider/sshkey/parsed.rb

View Options

lib/puppet/util/filetype.rb

View Options

lib/puppet/util/http_proxy.rb

View Options

lib/puppet/util/pidlock.rb

View Options

lib/puppet/util/rdoc.rb

View Options

lib/puppet/util/windows/error.rb

View Options

lib/puppet/util/windows/file.rb

View Options

spec/integration/parser/collector_spec.rb

View Options

spec/integration/type/nagios_spec.rb

View Options

spec/integration/type/sshkey_spec.rb

View Options

spec/integration/util/windows/security_spec.rb

View Options

spec/lib/puppet_spec/files.rb

View Options

spec/unit/forge/repository_spec.rb

View Options

spec/unit/parser/functions/realize_spec.rb

View Options

spec/unit/provider/parsedfile_spec.rb

View Options

spec/unit/util/colors_spec.rb

View Options

spec/unit/util/http_proxy_spec.rb

Merge branch 'master' of ssh://github.com/puppetlabs/puppet.gitaceb0a8a0156UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (26)

rPUaceb0a8a0156

acceptance/tests/apply/virtual

acceptance/tests/apply/virtual/should_realize.rb

acceptance/tests/apply/virtual/should_realize_many.rb

acceptance/tests/apply/virtual/should_realize_query.rb

ext/project_data.yaml

lib/puppet/defaults.rb

lib/puppet/file_system/file19windows.rb

lib/puppet/forge/repository.rb

lib/puppet/provider/parsedfile.rb

lib/puppet/provider/sshkey/parsed.rb

lib/puppet/util/filetype.rb

lib/puppet/util/http_proxy.rb

lib/puppet/util/pidlock.rb

lib/puppet/util/rdoc.rb

lib/puppet/util/windows/error.rb

lib/puppet/util/windows/file.rb

spec/integration/parser/collector_spec.rb

spec/integration/type/nagios_spec.rb

spec/integration/type/sshkey_spec.rb

spec/integration/util/windows/security_spec.rb

spec/lib/puppet_spec/files.rb

spec/unit/forge/repository_spec.rb

spec/unit/parser/functions/realize_spec.rb

spec/unit/provider/parsedfile_spec.rb

spec/unit/util/colors_spec.rb

spec/unit/util/http_proxy_spec.rb

Merge branch 'master' of ssh://github.com/puppetlabs/puppet.git
aceb0a8a0156Unpublished
Actions