diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-04 11:44:41 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-04 11:53:15 -0700 |
| commit | d43f7996b93c394df0bd0994ae7298fb35ad2c5e (patch) | |
| tree | 6b57693d1cfdb43ae964abfe25e9ef4cbcfb6fbc /conf/suse/ruby-env.patch | |
| parent | ce9a6f97ab1784d8bd60eae8b60272c9875b1f84 (diff) | |
| parent | 99c1019e1d3402ec8e476dc859d5aaef82ec4f69 (diff) | |
| download | puppet-d43f7996b93c394df0bd0994ae7298fb35ad2c5e.tar.gz puppet-d43f7996b93c394df0bd0994ae7298fb35ad2c5e.tar.xz puppet-d43f7996b93c394df0bd0994ae7298fb35ad2c5e.zip | |
Partial merge to 2.6.2rc1 : Merge commit '99c1019' into next
This conflict was a little too complicated for diff to figure out, but
the resolution is actually fairly mechanical.
Some unit tests changed because they were mocking unnecessarily.
Manually Resolved Conflicts:
lib/puppet/util/rdoc/parser.rb
spec/unit/util/rdoc/parser_spec.rb
Diffstat (limited to 'conf/suse/ruby-env.patch')
0 files changed, 0 insertions, 0 deletions