[Python-modules-commits] [python-digitalocean] 16/19: Merge remote-tracking branch 'upstream/master' into request-timeouts

[Andrew Starr-Bochicchio]

This is an automated email from the git hooks/post-receive script.

asb pushed a commit to annotated tag 1.10.1
in repository python-digitalocean.

commit 9bece08c14ea912e8ff368ef2490b1f01678a154
Merge: b2da2e0 e9647c1
Author: Joro <acev at chessdom.com>
Date:   Tue Oct 18 17:59:56 2016 -0700

    Merge remote-tracking branch 'upstream/master' into request-timeouts

 README.md                                   |  25 +++++-
 digitalocean/Droplet.py                     |   4 +
 digitalocean/Manager.py                     |  17 ++--
 digitalocean/Tag.py                         |  85 ++++++++++++-------
 digitalocean/__init__.py                    |   3 +-
 digitalocean/baseapi.py                     |  11 ++-
 digitalocean/tests/data/droplets/bytag.json | 104 ++++++++++++++++++++++++
 digitalocean/tests/data/tags/resources.json |   8 ++
 digitalocean/tests/data/tags/single.json    |  11 +++
 digitalocean/tests/data/tags/updatetag.json | 101 +++++++++++++++++++++++
 digitalocean/tests/test_droplet.py          |   1 +
 digitalocean/tests/test_manager.py          |  39 ++++++++-
 digitalocean/tests/test_tag.py              | 122 ++++++++++++++++++++++++++++
 setup.py                                    |   2 +-
 14 files changed, 492 insertions(+), 41 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-digitalocean.git