diff options
author | Anthon van der Neut <anthon@mnt.org> | 2017-06-24 07:35:25 +0200 |
---|---|---|
committer | Anthon van der Neut <anthon@mnt.org> | 2017-06-24 07:35:25 +0200 |
commit | 18eb2359b05e737520ee7adbadd528812a4378aa (patch) | |
tree | fd5dc77a2c80201adf6c8963e7b6586ac2283136 | |
parent | 325d9d4f536aad2f1ee2f0cd74d61791b3561fac (diff) | |
download | ruamel.yaml-18eb2359b05e737520ee7adbadd528812a4378aa.tar.gz |
fix issue #130: regression in nested merges0.15.11
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | README.rst | 2 | ||||
-rw-r--r-- | __init__.py | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +[0, 15, 11]: 2017-06-24 + - fix for issue 130, regression in nested merge keys (reported by + `David Fee <https://bitbucket.org/dfee/>`_) + [0, 15, 10]: 2017-06-24 - fix for issue 130, regression in nested merge keys (reported by `David Fee <https://bitbucket.org/dfee/>`_) @@ -32,7 +32,7 @@ ChangeLog .. should insert NEXT: at the beginning of line for next key -0.15.10 (2017-06-24): +0.15.11 (2017-06-24): - fix for issue 130, regression in nested merge keys (reported by `David Fee <https://bitbucket.org/dfee/>`_) diff --git a/__init__.py b/__init__.py index ee4a146..23364ef 100644 --- a/__init__.py +++ b/__init__.py @@ -7,8 +7,8 @@ if False: # MYPY _package_data = dict( full_package_name='ruamel.yaml', - version_info=(0, 15, 10), - __version__='0.15.10', + version_info=(0, 15, 11), + __version__='0.15.11', author='Anthon van der Neut', author_email='a.van.der.neut@ruamel.eu', description='ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order', # NOQA |