britney

Merge ~schopin/britney/+git/hints-ubuntu:bionic-r-bioc-rtracklayer into ~ubuntu-release/britney/+git/hints-ubuntu:bionic

  1. Git
  2. lp:~schopin/britney/+git/hints-ubuntu
  3. bionic-r-bioc-rtracklayer
  4. Merge into bionic
Proposed by Simon Chopin
Status: Merged
Merged at revision: bc6fc35f01366d71ad5ecb7df459fe6b3cd31b86
Proposed branch: ~schopin/britney/+git/hints-ubuntu:bionic-r-bioc-rtracklayer
Merge into: ~ubuntu-release/britney/+git/hints-ubuntu:bionic
Diff against target: 15 lines (+5/-0) (has conflicts)
1 file modified
ubuntu-sru (+5/-0)
Conflict in ubuntu-sru
Reviewer Review Type Date Requested Status
Ubuntu Release Team Pending
Review via email: mp+406727@code.launchpad.net

Description of the change

This blocks openssl/1.1.1-1ubuntu2.1~18.04.10

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubuntu-sru b/ubuntu-sru
2index 6e58f36..3be56c0 100644
3--- a/ubuntu-sru
4+++ b/ubuntu-sru
5@@ -216,5 +216,10 @@ force-reset-test postgis/2.4.3+dfsg-4/armhf
6 force-reset-test psqlodbc/1:10.01.0000-1/armhf
7 force-reset-test slony1-2/2.2.6-1/armhf
8
9+<<<<<<< ubuntu-sru
10 # regressed in -security, -updates
11 force-reset-test ruby2.5/2.5.1-1ubuntu1.10
12+=======
13+# Tests fail because of Debian bug #961138 in the testbed
14+force-reset-test r-bioc-rtracklayer/1.38.0-1build1
15+>>>>>>> ubuntu-sru

Subscribers

People subscribed via source and target branches