[Python-modules-commits] [elasticsearch-curator] 02/03: Merge tag 'upstream/3.5.1'

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository elasticsearch-curator.

commit 6eaebb8cdec3bc1d82991ba20182fd87eb318cc4
Merge: 673ead7 31090ca
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Mon Mar 21 22:57:53 2016 +0200

    Merge tag 'upstream/3.5.1'
    
    Upstream version 3.5.1
    
    # gpg: Signature made Δευ 21 Μάρ 2016 10:57:49 μμ EET
    # gpg:                using RSA key 0xDBADC9EBEEA7C60E
    # gpg: Good signature from "Apollon Oikonomopoulos <apoikos at dmesg.gr>"
    # gpg:                 aka "Apollon Oikonomopoulos <apoikos at gmail.com>"
    # gpg:                 aka "Apollon Oikonomopoulos <apoikos at debian.org>"

 CONTRIBUTORS                             |  4 ++++
 curator/_version.py                      |  2 +-
 curator/api/filter.py                    |  7 +++---
 curator/api/seal.py                      | 19 ++++++++-------
 curator/api/snapshot.py                  |  4 ++--
 curator/cli/cli.py                       | 22 +++++++++++++++++-
 curator/cli/es_repo_mgr.py               |  6 +++--
 curator/cli/snapshot.py                  | 10 ++++++++
 curator/cli/utils.py                     | 12 +++++++---
 docs/Changelog.rst                       | 28 ++++++++++++++++++++++
 docs/asciidoc/flags/client-cert.asciidoc | 35 ++++++++++++++++++++++++++++
 docs/asciidoc/flags/client-key.asciidoc  | 33 ++++++++++++++++++++++++++
 docs/asciidoc/flags/help.asciidoc        | 32 ++++++++++++++-----------
 docs/asciidoc/flags/index.asciidoc       |  4 ++++
 docs/asciidoc/index.asciidoc             |  6 ++---
 docs/asciidoc/misc/installation.asciidoc | 29 ++++++++++++++++-------
 requirements.txt                         |  2 +-
 setup.py                                 |  3 +--
 test/integration/test_cli_commands.py    | 16 +++++++++++++
 test/integration/test_cli_utils.py       | 40 ++++++++++++++++++++++++++++++++
 test/unit/test_api_commands.py           | 11 ++++++++-
 test/unit/test_api_filter.py             |  2 +-
 test/unit/test_cli_utils.py              | 14 +++++++++++
 23 files changed, 290 insertions(+), 51 deletions(-)


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