Merge branch 'debian' of https://github.com/google/mtail into debian

google · Nov 6, 2018 · c3b7eb5 · c3b7eb5
2 parents a28e49b + a17c061
commit c3b7eb5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -6,6 +6,7 @@ mtail (3.0.0~rc16-2) UNRELEASED; urgency=medium
   * debuan/control: Add myself as uploader.
   * debian/rules: No longer generate vm/parser.y, it's provided upstream.
   * debian/rules: Add regression tests.
+  * Remove unnecessary patch merged upstream 01-Avoid_test_timeout.patch.
 
  -- Jamie Wilkinson <jaq@debian.org>  Mon, 05 Nov 2018 16:04:09 -0800
 

diff --git a/debian/patches/01-Avoid_test_timeout.patch b/debian/patches/01-Avoid_test_timeout.patch
diff --git a/debian/patches/series b/debian/patches/series
@@ -1 +1 @@
-01-Avoid_test_timeout.patch
+