summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 11:20:50 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 11:20:50 -0700
commit2885d314b61055d20d85d36a68214f7d9e1e6ac6 (patch)
tree0fd999558dcbee57234c04873c85812088991d58 /CHANGELOG
parent7d8df4b99829d2afe1b13d667bb2e0fbd0374412 (diff)
Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""
This reverts commit 8fc00ea5b6b39b220ebc6391489915dbeeb364ab. I really wish we could get this right. Without this patch there is no branch that contains backwards-comaptible new functionality relative to the current 3.0.1. There are only branches that contain backwards-incompatible functionality relative to 3.0.1. This is a problem because I need to do a release of stdlib that contains backwards compatible facts but does not contain any breaking changes. This patch fixes the problem by establishing the 3.1.x branch. This branch will then revert the backwards incompatible changes from the 3.1.x branch and revert the revets in the 4.x and master branches. I'll review our merge process, but it seems wrong that there is no place to separate out incompatible from compatible changes when working beyond the most recent patch release.
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions