diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst index 1f515898..eca89c5e 100644 --- a/doc/source/changelog.rst +++ b/doc/source/changelog.rst @@ -5,6 +5,7 @@ ChangeLog ========= ========== ======================================================== Version Date Changes ========= ========== ======================================================== +1.4 2014-10-xx * Add rudimentary debug logging * Prevent interpolate() from overwriting merged values 1.3 2014-03-01 * Salt: pillar data from previous pillars are now available to reclass parameter interpolation diff --git a/reclass/version.py b/reclass/version.py index ec805f92..f9a3e43b 100644 --- a/reclass/version.py +++ b/reclass/version.py @@ -8,7 +8,7 @@ # RECLASS_NAME = 'reclass' DESCRIPTION = 'merge data by recursive descent down an ancestry hierarchy' -VERSION = '1.3' +VERSION = '1.4' AUTHOR = 'martin f. krafft' AUTHOR_EMAIL = 'reclass@pobox.madduck.net' COPYRIGHT = 'Copyright © 2007–14 ' + AUTHOR