Release 1.2.6 (#378)

pex-tool · Apr 7, 2017 · 3a53b26 · 3a53b26
1 parent 4a35669
commit 3a53b26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+1.2.6
+-----
+
+* Fix for Ambiguous Resolvable bug in transitive dependency resolution (#367)
+  `#367 <https://github.com/pantsbuild/pex/pull/367>`_
+
 1.2.5
 -----
 

diff --git a/pex/version.py b/pex/version.py
@@ -1,7 +1,7 @@
 # Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-__version__ = '1.2.5'
+__version__ = '1.2.6'
 
 # NB: If we upgrade to setuptools>=34 pex's bootstrap code in `PEXBuilder` will need an update to
 # include the `packaging` package in the `.bootstrap/` code since we use