britney

Merge ~rbalint/britney/+git/hints-ubuntu:groovy into ~ubuntu-release/britney/+git/hints-ubuntu:groovy

  1. Git
  2. lp:~rbalint/britney/+git/hints-ubuntu
  3. groovy
  4. Merge into groovy
Proposed by Balint Reczey
Status: Merged
Merged at revision: 91061adb767ca77114df565e1f2ac8b2e3a7b693
Proposed branch: ~rbalint/britney/+git/hints-ubuntu:groovy
Merge into: ~ubuntu-release/britney/+git/hints-ubuntu:groovy
Diff against target: 18 lines (+8/-0) (has conflicts)
1 file modified
ubuntu-sru (+8/-0)
Conflict in ubuntu-sru
Reviewer Review Type Date Requested Status
Ubuntu Release Team Pending
Review via email: mp+401228@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

This was the focal version of apt-clone so didn't end up working but I'll fix it.

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 73d6309..cab7ea7 100644
3--- a/ubuntu-sru
4+++ b/ubuntu-sru
5@@ -35,5 +35,13 @@ force-badtest golang-github-docker-go-connections/0.4.0-1
6 # this now reliably fails in the release pocket
7 force-reset-test pandas/1.0.5+dfsg-3
8
9+<<<<<<< ubuntu-sru
10 # Test needs updating as precise is now EoL
11 force-badtest update-manager/1:20.10.6
12+=======
13+# online test input data changed LP: #1921917
14+force-reset-test pandas/0.25.3+dfsg-7
15+
16+# failure come and go in the release pocket LP: #1902830
17+force-badtest apt-clone/0.4.1ubuntu3
18+>>>>>>> ubuntu-sru

Subscribers

People subscribed via source and target branches