summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-09-15releasing version 3.3.0-1debian/3.3.0-1Stig Sandbeck Mathisen1-2/+2
2013-09-15Update changelogStig Sandbeck Mathisen1-0/+8
2013-09-15Use "puppet master" to retrieve configuration for puppetmaster-passengerStig Sandbeck Mathisen1-9/+9
Closes: #722614
2013-09-15Invert order of testsStig Sandbeck Mathisen1-4/+4
Closes: #721772 These tests are separate, and should be run within a framework that restores the testbed between tests. The "breaks-testbed" keyword for autopkgtest looked promising, but didn't work as expected.
2013-09-15Improve systemd packaging, use dh-systemdStig Sandbeck Mathisen5-7/+3
Closes: #714202 Thanks: Michael Stapelberg
2013-09-15Drop "duplicate-resource" patch included in current upstream versionStig Sandbeck Mathisen2-52/+0
2013-09-15Update changelogStig Sandbeck Mathisen1-0/+6
2013-09-15Merge tag 'upstream/3.3.0'Stig Sandbeck Mathisen574-8062/+20376
Upstream version 3.3.0
2013-09-15Imported Upstream version 3.3.0upstream/3.3.0Stig Sandbeck Mathisen574-8062/+20376
2013-09-12(packaging) Update PUPPETVERSION for 3.3.0Moses Mendoza1-1/+1
2013-09-09(packaging) Update PUPPETVERSION for 3.3.0-rc3Moses Mendoza1-1/+1
2013-09-09Merge pull request #1885 from ferventcoder/stablePatrick Carlisle1-0/+1
(maint) ignore Gemfile.local
2013-09-09(maint) ignore Gemfile.localRob Reynolds1-0/+1
2013-09-08Move dependency on ruby-hiera from puppetmaster-common to puppet-commonStig Sandbeck Mathisen1-1/+1
- "puppet apply" gets really unhappy when hiera is missing, so this is not only used by the puppet master, but is also required for standalone puppet.
2013-09-07Update dependenciesStig Sandbeck Mathisen1-4/+1
- remove "rdoc", it is a virtual package provided by "ruby" - remove version on the "sysv-rc" dependency, there is no sysv-rc that old in debian anymore.
2013-09-07Remove unused headers from debian/controlStig Sandbeck Mathisen1-2/+0
- used by gem2deb, which we no longer use for packaging
2013-09-05Merge pull request #1879 from ↵Ethan J. Brown6-21/+96
zaphod42/issue/stable/22383-mount-no-longer-allows-true-for-atboot (#22383) Allow all boolean values for atboot
2013-09-05(#22383) Allow all boolean values for atbootAndrew Parker6-21/+96
The previous restrictions placed on the atboot property for mount caused some previously valid manifests to begin to fail. The problem stems from the fact that atboot is only used on solaris, but can always be specified by users. It used to be able to be nearly anything, but only yes and no meant anything on solaris. This fixes the problem by expanding the allowed values to include all of the "boolean" values as expressed in the Puppet::[Parameter|Property]::Boolean type and using a munge method to convert the boolean to the correct yes or no value.
2013-09-05Merge branch 'ticket/stable/22258-create-new-console' into stableJosh Cooper1-1/+1
* ticket/stable/22258-create-new-console: (#22258) Create new console for each puppet run
2013-09-05(#22258) Create new console for each puppet runEric Badger1-1/+1
Powershell apparently has some issue trying to share the Windows service's console when running under ruby.exe (as opposed to rubyw.exe). This patch causes the service to create a new console for each puppet child it kicks off, which resolves the issue.
2013-09-05Merge pull request #1876 from nfagerlund/330-setting-descriptionsAndrew Parker1-9/+22
Docs: Clarify descriptions of "ordering" and "report_serialization_format" settings
2013-09-05Merge pull request #1870 from ↵kylo4-8/+40
joshcooper/ticket/stable/22375-filebucket-serialization (#22375) File bucket serialization
2013-09-05Docs: Clarify descriptions of "ordering" and "report_serialization_format" ↵Nick Fagerlund1-9/+22
settings
2013-09-04Merge pull request #1874 from kylog/issue/21427-fixupAndrew Parker2-2/+2
(#21427) make supported_formats return an array of symbols
2013-09-04(#21427) make supported_formats return an array of symbolsKylo Ginsberg2-2/+2
Prior to this commit, supported_formats was returning an array of strings, which violated the contract for FormatHandler's most_suitable_format_for method. This commit fixes supported_formats to return an array of symbols.
2013-09-04Merge branch 'issue/stable/21427-select-report-serialization-format' into stableJosh Cooper4-14/+83
* issue/stable/21427-select-report-serialization-format: (#21427) Handle loss of precision during YAML serialization (#21427) Make report format selectable
2013-09-04(#21427) Handle loss of precision during YAML serializationJosh Cooper1-5/+24
Previously, when round-tripping a report using YAML, the Puppet::Resource::Status#time object could lose precision (depending on the ruby version and platform), so it did not match the expected value. For example, the expected value was: "time"=>"2013-09-04T17:01:38.510604415+00:00" But the round-tripped value was: "time"=>"2013-09-04T17:01:38.510604000+00:00" This commit changes the test to explicitly compare status fields, and handles the `time` field specially to avoid loss of precision during YAML serialization.
2013-09-04(#21427) Make report format selectableAndrew Parker4-9/+59
Without making agents able to select the format to serialize reports, a newer agent would be unable to submit reports to an older master. Although we ask users to upgrade masters first, that is not often done in practice. In order to allow those kinds of setups to work, this makes the report format selectable. Puppet 3.2.2 and later support reports as pson, so only older, insecure masters need to have the agent's change this new setting.
2013-09-03(#22375) Don't echo the backed up file to the callerJosh Cooper2-1/+9
Previously, when the agent backed up a file to the master, the master would inadvertently echo the file back to the agent in the body of the HTTP response. This is because the terminus' save method returned the file contents as the 'result', and when invoked via REST, the {webrick,rack} REST handlers automatically write the result into the response body. Also puppet masters prior to 3.3 did not respect the Accept HTTP header (#21427), so the master would always YAML encode the response, which for binary content, large files, etc could result errors like the following on the master: Error: Stack overflow in regexp matcher: /\A(?: # ?: non-capturing group (grouping with no back references) [\x09\x0A\x0D\x20-\x7E] # ASCII | [\xC2-\xDF][\x80-\xBF] # non-overlong 2-byte | \xE0[\xA0-\xBF][\x80-\xBF] # excluding overlongs | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} # straight 3-byte | \xED[\x80-\x9F][\x80-\xBF] # excluding surrogates | \xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3 | [\xF1-\xF3][\x80-\xBF]{3} # planes 4-15 | \xF4[\x80-\x8F][\x80-\xBF]{2} # plane 16 )*\z/mxn This commit changes the Puppet::FileBucketFile::File terminus to return a new model instance whose content is empty. This is a change from previously when we were returning a string, but I think it's clearer that the result needs to be serializable using one of the Accept content-types that the client specified, e.g. `:s`. Originally filed as #8229
2013-09-03(#22375) Prefer raw-like serialization formatJosh Cooper2-7/+31
Previously, agents would backup files using PSON serialization, which is not reliable for binary content, and incredibly inefficient due to the applying a regexp to the entire in-memory file content. Ideally, I would like to switch the Puppet::FileBucket::File class to just use the `:raw` serialization format as is done for Puppet::FileServing::Content. But this cannot be done in a minor series without breaking compatibility between newer 3.x agents talking to older 3.x masters. However, we can achieve the same effect by using the `:s` serialization format, and we don't have the same compatibility problem because the `from_s` method has been defined since 2.6.0 in commit e5a78009f. If a newer master receives a file bucket request from an older agent that sends a PSON encoded file, then the master will generate a deprecation warning to update the agent. Originally filed as #8229.
2013-09-03Merge pull request #1863 from ↵Patrick Carlisle2-7/+23
zaphod42/issue/stable/22358-improper-handling-of-accept-headers (#22358) Interpret */* as anything is accepted
2013-09-01releasing version 3.2.4-2debian/3.2.4-2Stig Sandbeck Mathisen1-0/+8
2013-09-01Add empty /usr/share/puppet/modules to puppet-common for puppet modulesStig Sandbeck Mathisen1-0/+1
2013-08-30(#22358) Interpret */* as anything is acceptedAndrew Parker2-7/+23
The changes to how we process Accept headers left out the case of being asked for anything (*/*), which the puppet dashboard will do. This expands */* to mean the client accepts any format the the requested endpoint can support. In addition, this also adds logic to ignore quality specifiers.
2013-08-29Merge pull request #1763 from djmitche/bug19056Adrien Thebo2-3/+39
(#19056) strip trailing space while parsing AIX password file
2013-08-29(#19056) strip trailing space while parsing AIX password fileDustin J. Mitchell2-3/+39
2013-08-29Merge pull request #1844 from melissaanne/maint/stable/re-141_rm-eol-f17Adrien Thebo1-1/+1
(Bug #22237) Remove EOL Fedora 17
2013-08-29(packaging) Update PUPPETVERSION for 3.3.0-rc2Moses Mendoza1-1/+1
2013-08-28Merge pull request #1860 from ↵Josh Partlow1-1/+1
jpartlow/issue/stable/22319-constrain-integration-spec-on-windows (#22319) Constrain settings watchedfile integration on windows
2013-08-28(#22319) Constrain settings watchedfile integration on windowsJosh Partlow1-1/+1
File.ctime provides creation time on Windows, and shows no change in WatchedFile. But we have no long running processes in Windows, so we would not be reloading configs, and this test can be skipped.
2013-08-28Include patch from upstream to prevent duplicate nagios_ resourcesStig Sandbeck Mathisen2-0/+52
Closes: #721132
2013-08-28Refresh apache2-passenger-template patchStig Sandbeck Mathisen1-1/+1
Git-Dch: Ignore
2013-08-28Merge branch 'master' into stable to prepare for 3.3.0.Kylo Ginsberg8-31/+124
2013-08-28Merge pull request #1857 from ↵kylo3-54/+90
jpartlow/issue/stable/22319-puppet-settings-misuses-watchedfile (#22319) Correct Puppet::Setting's use of WatchedFile
2013-08-28Merge pull request #1855 from ↵kylo4-0/+76
zaphod42/issue/master/22229-ensure-generated-resources-contained (#22229) Ensure generated resources contained
2013-08-28(#22319) Correct Puppet::Setting's use of WatchedFileJosh Partlow3-54/+90
WatchedFile was introduced after 3.2.0 as a new method of checking for changes to file. Puppet::Settings was calling a non-existent method on the new WatchedFile, and would cause a daemonized Puppet to abort if one of its watched configuration files was changed. This is a minor change to call #to_str instead.
2013-08-27(#22229) Provide way of getting the containerAndrew Parker4-8/+26
The catalog tracks the relationship between the container and the contained resource but did not provide any clear way to query for the containment information. This adds a new method #container_of(resource) that will return the container of the given resource, when one exists. This removes some duplication around understanding what the container is.
2013-08-27(#22229) Ensure generated resources containedAndrew Parker2-0/+52
The generated resources were left out in the cold with respect to containers: they had none at all. This changes that to make sure that the generated resources (via #generate and #eval_generate) have the same container as the resource that generated them.
2013-08-27(Maint) Mark AdditionalResourceGenerator as privateAndrew Parker1-0/+6
2013-08-26Merge pull request #1845 from kylog/issue/22250-reports-inconsistentAndrew Parker3-30/+47
(#22250) ensure a failed resource status always has an event