Permalink
Commits on Sep 19, 2011
  1. Fixed 'with_settings' decorator so that it preserves the function doc…

    spookylukey committed Sep 19, 2011
    …string (and other attributes)
Commits on Sep 2, 2011
  1. Merge branch '1.2'

    bitprophet committed Sep 2, 2011
  2. Merge branch '1.1' into 1.2

    bitprophet committed Sep 2, 2011
    Conflicts:
    	docs/changelog.rst
  3. Merge branch '1.0' into 1.1

    bitprophet committed Sep 2, 2011
    Conflicts:
    	docs/changelog.rst
Commits on Sep 1, 2011
  1. Merge branch '1.2'

    bitprophet committed Sep 1, 2011
    Conflicts:
    	fabric/version.py
  2. Cut 1.2.2

    bitprophet committed Sep 1, 2011
  3. Merge branch '1.1' into 1.2

    bitprophet committed Sep 1, 2011
    Conflicts:
    	fabric/version.py
  4. Cut 1.1.4

    bitprophet committed Sep 1, 2011
  5. Merge branch '1.0' into 1.1

    bitprophet committed Sep 1, 2011
    Conflicts:
    	fabric/version.py
  6. Cut 1.0.4

    bitprophet committed Sep 1, 2011
  7. Merge branch '1.2'

    bitprophet committed Sep 1, 2011
  8. Merge branch '1.1' into 1.2

    bitprophet committed Sep 1, 2011
    Conflicts:
    	docs/changelog.rst
  9. Merge branch '1.0' into 1.1

    bitprophet committed Sep 1, 2011
    Conflicts:
    	docs/changelog.rst
  10. Merge branch '1.2'

    bitprophet committed Sep 1, 2011
  11. Merge branch '1.2'

    bitprophet committed Sep 1, 2011
  12. Merge branch '1.1' into 1.2

    bitprophet committed Sep 1, 2011
  13. Merge branch '1.2'

    bitprophet committed Sep 1, 2011
  14. Merge branch '1.1' into 1.2

    bitprophet committed Sep 1, 2011
Commits on Aug 31, 2011
  1. Merge branch '1.2'

    bitprophet committed Aug 31, 2011
  2. Merge branch '1.1' into 1.2

    bitprophet committed Aug 31, 2011
  3. Docs and tests re #373

    bitprophet committed Aug 31, 2011
  4. Actually, don't look for excude_hosts kwarg when determining how to m…

    bitprophet committed Aug 31, 2011
    …erge host lists -- doesn't make much sense.
  5. Formatting

    bitprophet committed Aug 31, 2011
  6. Merge branch '1.2'

    bitprophet committed Aug 31, 2011
  7. Merge branch '1.1' into 1.2

    bitprophet committed Aug 31, 2011
    Conflicts:
    	docs/changelog.rst
    	fabric/version.py