[Python-modules-commits] [python-docker] 02/03: merge patched into master

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository python-docker.

commit a3291dd0a900d9829beb6fb433c1f513612fb640
Merge: 8e0fb86 07e7d1c
Author: Ondřej Nový <novy at ondrej.org>
Date:   Tue Mar 29 21:49:58 2016 +0200

    merge patched into master

 debian/.git-dpm                                       |  4 ++--
 ...cker-API-version-to-1.20-for-Docker-1.8.3-co.patch | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 docker/constants.py                                   |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 87ae18b,0000000..b56647d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 91cb802b9ddffb1351959b1c3797adc525595ea5
- 91cb802b9ddffb1351959b1c3797adc525595ea5
++07e7d1cfb5d89ae7d71d9c4b18e2a64ad47658e5
++07e7d1cfb5d89ae7d71d9c4b18e2a64ad47658e5
 +63875477fa2e0a529fcf52e36a3f9cb3db861000
 +63875477fa2e0a529fcf52e36a3f9cb3db861000
 +python-docker_1.7.2.orig.tar.gz
 +bc4f33cac9d6ad13c41ac7ff3e76de30fef8c4cf
 +68199
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch
index 0000000,0000000..fca3ee3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch
@@@ -1,0 -1,0 +1,19 @@@
++From 07e7d1cfb5d89ae7d71d9c4b18e2a64ad47658e5 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <novy at ondrej.org>
++Date: Tue, 29 Mar 2016 21:48:58 +0200
++Subject: Lower Docker API version to 1.20 for Docker 1.8.3 compatibility
++
++---
++ docker/constants.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docker/constants.py b/docker/constants.py
++index 0627ba0..3647a3b 100644
++--- a/docker/constants.py
+++++ b/docker/constants.py
++@@ -1,4 +1,4 @@
++-DEFAULT_DOCKER_API_VERSION = '1.21'
+++DEFAULT_DOCKER_API_VERSION = '1.20'
++ DEFAULT_TIMEOUT_SECONDS = 60
++ STREAM_HEADER_SIZE_BYTES = 8
++ CONTAINER_LIMITS_KEYS = [
diff --cc debian/patches/series
index f499a22,0000000..8dda60b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +requirements.patch
++0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch

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