[Python-modules-commits] [python-digitalocean] 13/19: Merge branch 'master' into feature/146-pagination

[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 681a6828ab4e5c9bc98860584603a306b73b9e84
Merge: 6d774c1 dca2143
Author: Lorenzo Setale <koalalorenzo at users.noreply.github.com>
Date:   Tue Oct 11 20:05:25 2016 +0200

    Merge branch 'master' into feature/146-pagination

 DESCRIPTION.rst                             | 190 ++++++++++++++++++++++++++++
 README.md                                   |  46 +++++--
 digitalocean/Account.py                     |   2 +-
 digitalocean/Action.py                      |   2 +-
 digitalocean/Domain.py                      |   2 +-
 digitalocean/Droplet.py                     |   6 +-
 digitalocean/FloatingIP.py                  |   2 +-
 digitalocean/Image.py                       |   5 +-
 digitalocean/Kernel.py                      |   2 +-
 digitalocean/Manager.py                     |  11 +-
 digitalocean/Metadata.py                    |   5 +-
 digitalocean/Record.py                      |   2 +-
 digitalocean/Region.py                      |   2 +-
 digitalocean/SSHKey.py                      |   2 +-
 digitalocean/Tag.py                         | 146 +++++++++++++++++++++
 digitalocean/Volume.py                      |   5 +-
 digitalocean/__init__.py                    |   1 +
 digitalocean/baseapi.py                     |  34 ++++-
 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                                    |   4 +-
 26 files changed, 816 insertions(+), 39 deletions(-)


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