From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 20 Jan 2019 07:10:19 +0000 (+0000)
Subject: Merge version 184-1+rpi1 and 185-1 to produce 185-1+rpi1
X-Git-Tag: archive/raspbian/185-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3567fc9fc44273c0d3247d8fc715ecf0267cabc5;p=cockpit.git

Merge version 184-1+rpi1 and 185-1 to produce 185-1+rpi1
---

3567fc9fc44273c0d3247d8fc715ecf0267cabc5
diff --cc debian/changelog
index d1e88d5,0d37320..54c3fd1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- cockpit (184-1+rpi1) buster-staging; urgency=medium
++cockpit (185-1+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 184-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 19 Jan 2019 15:11:56 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 19 Jan 2019 15:11:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 20 Jan 2019 07:10:19 +0000
++
+ cockpit (185-1) unstable; urgency=medium
+ 
+   * New upstream release:
+     - Responsive dialogs on network, kdump and users page
+     - Kubernetes containers included in docker graphs
+ 
+  -- Martin Pitt <mpitt@debian.org>  Thu, 17 Jan 2019 07:43:10 +0000
  
  cockpit (184-1) unstable; urgency=medium