Skip to content

Commit

Permalink
Merge branch '1.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
bitprophet committed Dec 24, 2013
2 parents 0df912a + aa8bae0 commit 271e6d9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dev-requirements.txt
Expand Up @@ -10,4 +10,4 @@ nose
Fudge < 1.0
# Documentation generation
Sphinx >= 0.6
releases >= 0.3.1
releases >= 0.4
4 changes: 4 additions & 0 deletions docs/changelog.rst
Expand Up @@ -4,6 +4,10 @@
Changelog
=========

* :release:`1.8.1 <2013-12-24>`
* :release:`1.7.1 <2013-12-24>`
* :release:`1.6.4 <2013-12-24>` 956, 957
* :release:`1.5.5 <2013-12-24>` 956, 957
* :bug:`956` Fix pty size detection when running inside Emacs. Thanks to
`@akitada` for catch & patch.
* :bug:`957` Fix bug preventing use of :ref:`env.gateway <gateway>` with
Expand Down
2 changes: 1 addition & 1 deletion fabric/version.py
Expand Up @@ -9,7 +9,7 @@
from os.path import abspath, dirname


VERSION = (1, 8, 0, 'final', 0)
VERSION = (1, 8, 1, 'final', 0)


def git_sha():
Expand Down

0 comments on commit 271e6d9

Please sign in to comment.