From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 7 Jul 2019 14:50:07 +0000 (+0100)
Subject: Merge version 18.09.1+dfsg1-7+rpi1 and 18.09.1+dfsg1-7.1 to produce 18.09.1+dfsg1... 
X-Git-Tag: archive/raspbian/18.09.1+dfsg1-7.1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=67ea86a9db0ac9d71bd698f982b4c944e2b4b7a1;p=docker.io.git

Merge version 18.09.1+dfsg1-7+rpi1 and 18.09.1+dfsg1-7.1 to produce 18.09.1+dfsg1-7.1+rpi1
---

67ea86a9db0ac9d71bd698f982b4c944e2b4b7a1
diff --cc debian/changelog
index dd65ca12,c4e1ce89..dc417016
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- docker.io (18.09.1+dfsg1-7+rpi1) buster-staging; urgency=medium
++docker.io (18.09.1+dfsg1-7.1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 18.06.1+dfsg1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 26 Jan 2019 01:54:38 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Jun 2019 15:50:08 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Jul 2019 14:50:07 +0000
++
+ docker.io (18.09.1+dfsg1-7.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+ 
+   [ Hideki Yamane ]
+   * upstream site moved to mobyproject.org
+ 
+   [ Arnaud Rebillout ]
+   * Add patch for CVE-2018-15664 (Closes: #929662).
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Sun, 23 Jun 2019 01:25:10 +0800
  
  docker.io (18.09.1+dfsg1-7) unstable; urgency=medium