diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:42:05 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:42:05 -0700 |
| commit | 9e8c60a8b73fd96393b08d690c7197e62aae623e (patch) | |
| tree | 999c0ffc0511fcdf4d6e5ebe8045bd6495a96772 /spec/fixtures/master_config | |
| parent | c8c7afc7a00aaeeddea6514d9fe9508513e53a73 (diff) | |
| download | puppet-stdlib-9e8c60a8b73fd96393b08d690c7197e62aae623e.tar.gz puppet-stdlib-9e8c60a8b73fd96393b08d690c7197e62aae623e.tar.bz2 | |
Revert "Merge branch '2.5.x' into 3.0.x"
This reverts commit c8c7afc7a00aaeeddea6514d9fe9508513e53a73, reversing
changes made to 03ec16e291a70ac5ac412be36ae3b86a771b98af.
This was a mistake on my part. 2.5 is a minor release and minor
releases should never be merged into patch level branches. 2.5.x should
have been merged into 3.1.x instead.
Diffstat (limited to 'spec/fixtures/master_config')
0 files changed, 0 insertions, 0 deletions