Merge branch 'master' into multiprocessing-lib

* master: (94 commits) Cut 1.2.2 Cut 1.1.4 Cut 1.0.4 Allow the settings contextmanager to set new env keys. Fixes fabric#252 Fix import typo in task usage docs. Fixes fabric#393 Flip "listing commands" flag in main.py if `--shortlist` is given. Update changelog re fabric#373. Fixes fabric#373. Docs and tests re fabric#373 Reference exclude_hosts kwarg when merging decorator-driven host lists Actually, don't look for excude_hosts kwarg when determining how to merge host lists -- doesn't make much sense. Add cli-kwarg test for host exclusion, re fabric#373 There is no function-attr anywhere for exclude_hosts, so don't check for one. Merge hosts at CLI-kwarg level if exclude_hosts kwarg is present. Actually exclude hosts when merging host lists. Formatting Check stdout instead of stdin for tty-ness when sizing up local terminal. Formatting Dev version Dev version Dev version ... Conflicts: fabric/decorators.py fabric/tasks.py tests/test_decorators.py
ramonvanalteren · Sep 2, 2011 · b41a5c7 · b41a5c7
2 parents 37cc14d + b17ad7c
commit b41a5c7
Show file tree

Hide file tree

Showing 48 changed files with 1,855 additions and 1,159 deletions.
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
@@ -14,6 +14,7 @@
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
 </script>
+
 {% endblock %}
 
 

diff --git a/docs/_templates/page.html b/docs/_templates/page.html
@@ -0,0 +1,10 @@
+{% extends "!page.html" %}
+{% block extrahead %}
+{{ super() }}
+<style type="text/css">
+    span.changelog-support {color: #4070A0;}
+    span.changelog-bug {color: #A04040;}
+    span.changelog-feature {color: #40A056;}
+    a.changelog-release {font-weight: bold;}
+</style>
+{% endblock %}
diff --git a/docs/changelog.rst b/docs/changelog.rst
diff --git a/docs/changes/0.9.1.rst b/docs/changes/0.9.1.rst
diff --git a/docs/changes/0.9.2.rst b/docs/changes/0.9.2.rst
diff --git a/docs/changes/0.9.3.rst b/docs/changes/0.9.3.rst
diff --git a/docs/changes/0.9.4.rst b/docs/changes/0.9.4.rst
diff --git a/docs/changes/0.9.5.rst b/docs/changes/0.9.5.rst
diff --git a/docs/changes/0.9.6.rst b/docs/changes/0.9.6.rst
diff --git a/docs/changes/0.9.7.rst b/docs/changes/0.9.7.rst