Skip to content
This repository
Browse code

Merge branch '1.5'

Conflicts:
	docs/changelog.rst
  • Loading branch information...
commit 655781cda5eef16ce236af2205cfddf3054e5088 2 parents d01ca02 + a026664
Jeff Forcier authored December 15, 2012
3  docs/changelog.rst
Source Rendered
@@ -25,6 +25,9 @@ would have also been included in the 1.2 line.
25 25
 Changelog
26 26
 =========
27 27
 
  28
+* :bug:`792` The newish `~fabric.context_managers.shell_env` context manager
  29
+  was incorrectly omitted from the ``fabric.api`` import endpoint. This has
  30
+  been remedied. Thanks to Vishal Rana for the catch.
28 31
 * :feature:`735` Add ``ok_ret_codes`` option to ``env`` to allow alternate
29 32
   return codes to be treated os "ok". Thanks to Andy Kraut for the pull request.
30 33
 * :bug:`775` Shell escaping was incorrectly applied to the value of ``$PATH``
2  fabric/api.py
@@ -7,7 +7,7 @@
7 7
 well when you're using setup.py to install e.g. ssh!
8 8
 """
9 9
 from fabric.context_managers import (cd, hide, settings, show, path, prefix,
10  
-    lcd, quiet, warn_only)
  10
+    lcd, quiet, warn_only, shell_env)
11 11
 from fabric.decorators import (hosts, roles, runs_once, with_settings, task, 
12 12
         serial, parallel)
13 13
 from fabric.operations import (require, prompt, put, get, run, sudo, local,

0 notes on commit 655781c

Please sign in to comment.
Something went wrong with that request. Please try again.