All --
Starting the testing branch dance again, this time with a process to
cherry-pick commits from 0.25.5rc2 (which is about to become 0.25.5 unless
something unexpected turns up). The list of commits was constructed by
finding all commits in 0.25.x that do not have analogs in master:
def commits_on(branch,format="%s")
`git checkout #{branch}`
`git log --pretty=format:#{format} 6e79cc00965a50c..`.split("\n")
end
sha1_on_25 = Hash[*commits_on('0.25.x','%h:-:%s').join(':-:').split(':-:')]
needed = commits_on('0.25.x') - commits_on('master')
needed.reverse.each { |s|
puts "!git cherry-pick #{sha1_on_25[s]} #= #{s}"
}
Not all of them come across cleanly, and those that fail are shown after
those that work. Some of these may not need to / ought not to, but this at
least narrows the list down to the point where we can look in more detail at
the questionable cases. One of them, changing "Reductive Labs" to "Puppet
Labs" was easier to just replace with a refactor:
commit "Renamed all references to Reductive Labs to Puppet Labs" do
commit_message %q{
Find and replace to the rescue...
}
replace_terms { like 'reductive'; with 'puppet' }
replace_terms { like 'Reductive'; with 'Puppet' }
end
Starting at 67bf142f6227db8f675726a104766b72c1e90141
testing (Branching off master) succeeded:
*
Cherry-picking commits from 0.25.5rc2
* b883272 Fixed puppetlast typo
* e93eab8 Fix #3155 - prevent error when using two matching regex in
cascade
* b28e21a Fixed changelog Rake task
* 7e1e76e Refactoring Configurer to enable the next feature
* 9fbb69f Adding support for only using cached catalogs
* 8c6c2d7 Adding :catalog_terminus setting
* 79d5e2e Fixes #3135 - darwin doesn't support 'mount -o remount'
* 513b0de Fixed #3443 - Typo in mount type
* 907ad33 Fail gracefully on packages that don't have the HOMEPAGE
variable set (e.g. dev-lang/php).
* 32a5cf9 Revert the guts of #2890
* f6b7913 Fixes #3419. OS X 10.6 Ruby doesn't set supplementary groups
* 17e6f28 Fix for #3101 (bug in MRI 1.8.7)
* 9605a5a Fixes #3460 - Makes Puppet FHS compliant by moving /var/puppet
to /var/lib/puppet
* 0a6cede Modify SuSE spec file for 0.25.x and correct shebang lines for
puppetd/puppetmasterd
* d1bd965 Updated version and CHANGELOG to 0.25.5rc1
* 7fbae99 Fixed #3532 - Typo in lib/puppet/ssl/host.rb
* 8309b91 Update man pages and partial doc fix to #3491
* 8af64dd Added YARD task
* 7e6f3ca Fixes #3295 - generate() now sets the working directory to the
directory containing the specified command.
* f9786c0 Fix #3540 - name methods correctly
* 0322203 Updated Rake tasks to no longer load puppet.rb
* 7db8513 Fix #3555 - fix state of purged lists
* 947cfe8 Partial fix to #2837 - changed warning message to debug
* a5b7509 Fixes #3653 - Changed default factpath value to better reflect
plugins in modules
* 5232705 Fixed stored configuration documentation
* 1210a5a conf/redhat: Add notifempty to logrotate config
* 2abd8c3 Fixed #3672 - Error message on duplicate fileserver mounts
incorrect
* c942cb1 Fixed #3655 - Puppet doesn't find installed packages with
portage provider
* 5b0fed1 Fix for #3556 Plussignment value melding
* 6059abf Fix for #3558 -- source file reading speedup
* 4a15966 Fix to the fix for #3295
* 9e5fbf2 Bug #3451: Don't leak the terminus class setting from
Puppet::Resource::Catalog's spec
* a6e8a51 Fix for #2910 -- Tidy/matches is too tricky to use
* 4f65fe4 Updated CHANGELOG for 0.25.5rc2
Failed: !git cherry-pick 56b5753 (Fix inefficient SimpleGraph#matching_edge)
-- I'm not sure if we ever established how this patch applies in master,
or if it's already there by other means
Failed: !git cherry-pick 978ab8a (fixing obsolete comment in puppetd)
Failed: !git cherry-pick f0e12e5 (Fix #3496 - suppress transaction debug
message)
Failed: !git cherry-pick ce233aa (Write ssh_authorized_keys as user)
Failed: !git cherry-pick 5258a0a (Fixing #3533 - Removing all transaction
cleanup)
Failed: !git cherry-pick 5a1a45c (Update Red Hat spec file for 0.25.5)
jesse:ticket/master/3551 (re-enable rake integration tests) succeeded:
* 4476ddb Fix #3551 rake spec fails to run integration specs
jesse:ticket/master/3554 (test problem) succeeded:
* a685c07 Fix #3554 Test case can overwrite sample data
8419 examples, 3 failures, 47 pending
2 more in unit/parser/parser.rb (2 total)
1 more in unit/provider/mount/parsed.rb (1 total)
567 tests, 5042 assertions, 6 failures, 4 errors
1 more in /ral/providers/user.rb (3 total)
luke:feature/master/3518-dot_format ('dot' formats) succeeded:
* 9f2d80e Adding #3518 - basic dot format support
8420 examples, 3 failures, 47 pending
567 tests, 5046 assertions, 6 failures, 3 errors
1 fewer in /ral/providers/user.rb (2 total)
reinh:tickets/master/3399 (zone type should handle exclusive IP stacks)
succeeded:
* 997d560 Fix for #3399 zone type should handle exclusive IP stacks
8437 examples, 3 failures, 47 pending
567 tests, 5042 assertions, 6 failures, 4 errors
1 more in /ral/providers/user.rb (3 total)
reinh:feature/master/zypper (zypper for OpenSuSE) succeeded:
* 46ae901 Fixes #1223 Add Zypper support for SuSE machines
8445 examples, 3 failures, 47 pending
567 tests, 5046 assertions, 6 failures, 3 errors
1 fewer in /ral/providers/user.rb (2 total)
masterzen:tickets/testing/3373 (File streaming to disk) succeeded:
* ff1a645 Add master side file content streaming
* 4c40079 Fix #3373 - Client side file streaming
8485 examples, 4 failures, 47 pending
1 more in unit/util/checksums.rb (1 total)
567 tests, 5042 assertions, 6 failures, 4 errors
1 more in /ral/providers/user.rb (3 total)
nigelkersten:feature/master/2836 (hold packages in dpkg) succeeded:
* 6b6f8a7 Fixes #2836. Add hold support to dpkg provider
8493 examples, 4 failures, 47 pending
567 tests, 5044 assertions, 6 failures, 3 errors
1 fewer in /ral/providers/user.rb (2 total)
ajf:feature/0.25.x/aixsrc (Add support for AIX service provider) succeeded:
* af66c90 Fixing #2864 Added support for AIX System Resource Controller
(SRC)...
8504 examples, 4 failures, 47 pending
567 tests, 5042 assertions, 6 failures, 4 errors
1 more in /ral/providers/user.rb (3 total)
MarkusQ:ticket/master/3107 (execute setuid (AIX)) succeeded:
* 66f8167 Fix for #3107 Changing users on AIX
8504 examples, 4 failures, 47 pending
567 tests, 5046 assertions, 6 failures, 3 errors
1 fewer in /ral/providers/user.rb (2 total)
amsibamsi:master (FreeBSD service provider) succeeded:
* 97c59d9 Rewrote FreeBSD service provider
* 3edf560 Re-included old BSD service provider, made new one default for
Free...
* 5fe5b58 Added proper status command
* 3c22703 Fix: the rcvar name is not necessarily the same as the service
name...
8504 examples, 4 failures, 47 pending
567 tests, 5040 assertions, 6 failures, 4 errors
1 more in /ral/providers/user.rb (3 total)
amrset:feature/master/3378 (pkgdmg flat pkg installer) succeeded:
* ec5f526 Added support for flat packages in the pkgdmg package
provider. Add...
8505 examples, 4 failures, 47 pending
567 tests, 5046 assertions, 6 failures, 3 errors
1 fewer in /ral/providers/user.rb (2 total)
masterzen:tickets/testing/3408 (Add compression support to puppet client)
succeeded:
* d62bb94 Fix #3408 - enable puppetd http compression
8545 examples, 4 failures, 47 pending
567 tests, 5025 assertions, 7 failures, 5 errors
1 more in /ral/providers/cron/crontab.rb (1 total)
1 more in /ral/providers/user.rb (3 total)
1 more in /ral/type/file.rb (2 total)
jes5199:ticket/master/3552 (single executable no parameter usage) succeeded:
* 5c010d1 Fix #3552 single executable should display usage
8552 examples, 4 failures, 47 pending
567 tests, 5029 assertions, 7 failures, 4 errors
1 fewer in /ral/providers/user.rb (2 total)
luke:tickets/master/3574-types_as_data (Resource type data should be
available via REST) succeeded:
* de5ae54 Adding indirector support to Resource Types
8568 examples, 4 failures, 47 pending
567 tests, 5027 assertions, 6 failures, 5 errors
1 fewer in /ral/providers/cron/crontab.rb (0 total)
1 more in /ral/providers/user.rb (3 total)
jamtur01:tickets/master/3582 (Provide database port puppet.conf) succeeded:
* 8eae26a Fixes #3582 - Adds dbport configuration option for specifying
datab...
8568 examples, 4 failures, 47 pending
567 tests, 5046 assertions, 6 failures, 3 errors
1 fewer in /ral/providers/user.rb (2 total)
1 fewer in /ral/type/file.rb (1 total)
jes5199:ticket/master/3656 (require statements fail with an error)
succeeded:
* 35b9c7a Fix #3656 JSON serialization of dependencies
8569 examples, 4 failures, 47 pending
567 tests, 5042 assertions, 6 failures, 4 errors
1 more in /ral/providers/user.rb (3 total)
markus:feature/master/3663 (list signed hosts) succeeded:
* 366c39b Fixes #3663 - It should be possible to list signed hosts only
8571 examples, 6 failures, 47 pending
1 more in unit/application/ca.rb (1 total)
1 more in unit/ssl/certificate_authority/interface.rb (1 total)
567 tests, 5046 assertions, 6 failures, 3 errors
1 fewer in /ral/providers/user.rb (2 total)
luke:tickets/master/3668-broken_class_autoloading (Auto-import
class/definition) succeeded:
* f013356 Fixing #3668 - fixed autoloading classes from modules
8608 examples, 6 failures, 46 pending
563 tests, 4988 assertions, 6 failures, 4 errors
1 more in /ral/providers/user.rb (3 total)
jes5199:ticket/master/3690 (error when exiting from puppetd --test)
succeeded:
* ca8036c Fix for #3690 failing to calculate error codes
8611 examples, 6 failures, 46 pending
563 tests, 4992 assertions, 6 failures, 3 errors
1 fewer in /ral/providers/user.rb (2 total)
markus:ticket/master/3702 (Source node in Log lines) succeeded:
* 2ae15ce Fixes #3702: the 'log' report now sends the host name as the
log so...
8611 examples, 6 failures, 46 pending
563 tests, 4988 assertions, 6 failures, 4 errors
1 more in /ral/providers/user.rb (3 total)
jes5199:tickets/master/subcommands (Remove metaprogramming in
Puppet::Application) succeeded:
* 5041976 Fix #3552 single executable should display usage
* f9cc58e feature #2276 Single Executable: "puppet master"
* a4f865b feature #2276 Single Executable: "puppet cert"
* 1fdeb9f feature #2276 Single Executable: "puppet kick"
* 032f8de feature #2276 Single Executable: "puppet describe"
* e94b9a5 feature #2276 Single Executable: legacy settings
* 14196c7 feature #2276 Single Executable: rdoc paths on ubuntu
* 19775ad feature #2276 Single Executable: help for apply
* 249bdcf feature #2276 Single Executable: help info
* 85edda1 feature #2276 Single Executable: subcommand method
* 6b8ab51 feature #2276 Single Executable: CommandLine can be
instantiated
* 95405f5 Refactor #3706 Reify eigenclasses of Applications
* 06ae2fe Feature #2276 Single Executable: Pass a commandline object to
the a...
* 6223e8d feature #2276 Single Executable: optparser should get
CommandLine#a...
* 44464ef Feature #2276 Single Executable: usage message
* 3a02983 Change the main spec to an apply spec (added by Markus)
8613 examples, 7 failures, 46 pending
1 more in integration/application/apply.rb (1 total)
563 tests, 4992 assertions, 6 failures, 4 errors
ran ruby ../refactor/dereductify.rb:
* b59fde6 Renamed all references to Reductive Labs to Puppet Labs
8613 examples, 7 failures, 46 pending
563 tests, 4996 assertions, 6 failures, 3 errors
1 fewer in /ral/providers/user.rb (2 total)
ran ruby ../refactor/refactor.rb:
* 740a9b8 Code smell: Miscellaneous oddity removal
* 38bcc88 Code smell: Inconsistent indentation and related formatting
issues
* 3c9d18e Code smell: Use {} for % notation delimiters wherever
practical
* 629d737 Code smell: English names for special globals rather than
line-noise
* 4dffd03 Code smell: Use string interpolation
* 2b2f299 Code smell: Line modifiers are preferred to one-line blocks.
* 4a5bc7f Code smell: Booleans are first class values.
* bb09711 Code smell: Avoid explicit returns
* bea61bd Code smell: Avoid unneeded blocks
* 408ed85 Code smell: Omit needless checks on defined
* 817eab3 Code smell: Use ||= for conditional initialization
* fe4ec81 Code smell: Use &&= for dependent initialization
* 2622579 Code smell: Don't restate results directly after assignment
* 504a23e Code smell: Avoid needless decorations
* 88ebd59 Code smell: Two space indentation
8610 examples, 7 failures, 46 pending
563 tests, 4995 assertions, 6 failures, 3 errors
ran ruby ../refactor/futures_setup.rb:
* fd4aabf Centralize & normalize the AST#each system
* 2b57649 Rename AST nodes as Expression nodes
* 5cc50ca Remove 'settor' flag on Expression nodes
* 970eb08 Expressions denote values, computation is just a means to this
end
* ddf69e4 Expression denotations should be cachable
* 7fe6daf Expression denotations should not depend on scope
* 0ac79f6 Remove unsetvar
8610 examples, 15 failures, 46 pending
1 more in unit/parser/expression/arithmetic_operator.rb (1 total)
3 more in unit/parser/expression/casestatement.rb (3 total)
1 more in unit/parser/expression/comparison_operator.rb (1 total)
2 more in unit/parser/expression/leaf.rb (2 total)
1 more in unit/parser/expression/resource.rb (1 total)
1 more in unit/parser/expression/resource_reference.rb (1 total)
1 more in unit/resource/type.rb (1 total)
563 tests, 4960 assertions, 22 failures, 6 errors
3 more in /language/expression.rb (3 total)
1 more in /language/expression/variable.rb (1 total)
9 more in /language/functions.rb (9 total)
2 more in /language/scope.rb (2 total)
3 more in /language/snippets.rb (3 total)
1 more in /ral/providers/user.rb (3 total)
-- Markus
-----------------------------------------------------------
The power of accurate observation is
commonly called cynicism by those
who have not got it. ~George Bernard Shaw
------------------------------------------------------------
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.