~cjwatson/launchpad:merge-db-stable

Branch merges

Propose for merging

Merged into launchpad:master

Colin Watson (community): Approve on 2023-09-28

Diff: 16 lines (+10/-0)

1 file modified

database/schema/patch-2211-23-0.sql (+10/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2023-08-15

Diff: 20 lines (+14/-0)

1 file modified

database/schema/patch-2211-21-0.sql (+14/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2023-07-20

Diff: 22 lines (+16/-0)

1 file modified

database/schema/patch-2211-20-0.sql (+16/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2023-02-08

Diff: 16 lines (+10/-0)

1 file modified

database/schema/patch-2211-15-1.sql (+10/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-11-25

Diff: 25 lines (+19/-0)

1 file modified

database/schema/patch-2211-13-0.sql (+19/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-11-24

Diff: 219 lines (+129/-13)

5 files modified

database/sampledata/current-dev.sql (+4/-4)
database/sampledata/current.sql (+4/-4)
database/schema/comments.sql (+5/-5)
database/schema/patch-2211-01-0.sql (+112/-0)
database/schema/security.cfg (+4/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-10-14

Diff: 77 lines (+29/-20)

3 files modified

database/sampledata/current-dev.sql (+10/-10)
database/sampledata/current.sql (+10/-10)
database/schema/patch-2211-09-0.sql (+9/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-10-07

Diff: 20 lines (+14/-0)

1 file modified

database/schema/patch-2211-10-0.sql (+14/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-10-03

Diff: 18 lines (+12/-0)

1 file modified

database/schema/patch-2211-00-1.sql (+12/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-09-15

Diff: 18 lines (+12/-0)

1 file modified

database/schema/patch-2211-05-0.sql (+12/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-08-05

Diff: 15 lines (+9/-0)

1 file modified

database/schema/patch-2211-03-0.sql (+9/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-07-15

Diff: 13162 lines (+5706/-2829)

5 files modified

database/schema/Makefile (+3/-4)
database/schema/comments.sql (+1/-1)
database/schema/launchpad-2211-00-0.sql (+5637/-2824)
database/schema/newbaseline.py (+59/-0)
database/schema/patch-2211-00-0.sql (+6/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-07-14

Diff: 856 lines (+797/-2)

4 files modified

database/schema/Makefile (+1/-1)
database/schema/full-update.py (+1/-0)
database/schema/patch-2210-46-0.sql (+765/-0)
database/schema/upgrade.py (+30/-1)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-06-23

Diff: 15 lines (+9/-0)

1 file modified

database/schema/patch-2210-44-3.sql (+9/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-04-11

Diff: 16 lines (+10/-0)

1 file modified

database/schema/patch-2210-40-1.sql (+10/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-04-11

Diff: 18 lines (+12/-0)

1 file modified

database/schema/patch-2210-44-2.sql (+12/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-04-08

Diff: 24 lines (+18/-0)

1 file modified

database/schema/patch-2210-37-1.sql (+18/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-04-08

Diff: 97 lines (+73/-0)

2 files modified

database/schema/patch-2210-42-0.sql (+69/-0)
database/schema/security.cfg (+4/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-04-01

Diff: 139 lines (+133/-0)

1 file modified

database/schema/patch-2210-44-0.sql (+133/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-03-23

Diff: 146 lines (+140/-0)

1 file modified

database/schema/patch-2210-06-1.sql (+140/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-02-09

Diff: 40 lines (+34/-0)

1 file modified

database/schema/patch-2210-41-0.sql (+34/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-02-02

Diff: 36 lines (+30/-0)

1 file modified

database/schema/patch-2210-39-2.sql (+30/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-02-01

Diff: 145 lines (+86/-0)

2 files modified

database/schema/patch-2210-40-0.sql (+78/-0)
database/schema/security.cfg (+8/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2022-01-31

Diff: 69 lines (+63/-0)

1 file modified

database/schema/patch-2210-39-0.sql (+63/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-10-25

Diff: 16 lines (+10/-0)

1 file modified

database/schema/patch-2210-34-1.sql (+10/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-10-06

Diff: 68 lines (+44/-0)

2 files modified

database/schema/patch-2210-36-0.sql (+42/-0)
database/schema/security.cfg (+2/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-10-01

Diff: 69 lines (+38/-0)

2 files modified

database/schema/patch-2210-33-2.sql (+33/-0)
database/schema/security.cfg (+5/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-08-18

Diff: 17 lines (+11/-0)

1 file modified

database/schema/patch-2210-35-0.sql (+11/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-08-09

Diff: 21 lines (+15/-0)

1 file modified

database/schema/patch-2210-34-0.sql (+15/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-06-16

Diff: 325 lines (+234/-0)

3 files modified

database/schema/patch-2210-33-0.sql (+203/-0)
database/schema/security.cfg (+27/-0)
lib/lp/registry/personmerge.py (+4/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-05-20

Diff: 29 lines (+23/-0)

1 file modified

database/schema/patch-2210-30-1.sql (+23/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-05-19

Diff: 15 lines (+9/-0)

1 file modified

database/schema/patch-2210-32-0.sql (+9/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-04-20

Diff: 488 lines (+482/-0)

1 file modified

database/schema/patch-2210-22-0.sql (+482/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-04-01

Diff: 27 lines (+21/-0)

1 file modified

database/schema/patch-2210-30-0.sql (+21/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-03-18

Diff: 15 lines (+9/-0)

1 file modified

database/schema/patch-2210-27-0.sql (+9/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2021-02-12

Diff: 21 lines (+15/-0)

1 file modified

database/schema/patch-2210-25-0.sql (+15/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-11-20

Diff: 17 lines (+11/-0)

1 file modified

database/schema/patch-2210-23-0.sql (+11/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-09-23

Diff: 509 lines (+162/-134)

6 files modified

database/sampledata/current-dev.sql (+68/-68)
database/sampledata/current.sql (+61/-61)
database/schema/comments.sql (+0/-5)
database/schema/patch-2210-19-0.sql (+13/-0)
database/schema/patch-2210-20-0.sql (+10/-0)
database/schema/patch-2210-20-1.sql (+10/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-08-03

Diff: 16 lines (+10/-0)

1 file modified

database/schema/patch-2210-18-0.sql (+10/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-05-04

Diff: 18 lines (+12/-0)

1 file modified

database/schema/patch-2210-15-1.sql (+12/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-04-20

Diff: 71 lines (+48/-0)

3 files modified

database/schema/patch-2210-13-0.sql (+25/-0)
database/schema/patch-2210-15-0.sql (+22/-0)
database/schema/security.cfg (+1/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-04-10

Diff: 106 lines (+62/-0)

3 files modified

database/schema/patch-2210-09-0.sql (+13/-0)
database/schema/patch-2210-12-0.sql (+45/-0)
database/schema/security.cfg (+4/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-04-09

Diff: 21 lines (+15/-0)

1 file modified

database/schema/patch-2210-14-0.sql (+15/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-03-31

Diff: 123 lines (+69/-0)

3 files modified

database/schema/patch-2210-08-6.sql (+38/-0)
database/schema/patch-2210-08-7.sql (+22/-0)
database/schema/security.cfg (+9/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-03-25

Diff: 25 lines (+19/-0)

1 file modified

database/schema/patch-2210-11-1.sql (+19/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-03-18

Diff: 20 lines (+14/-0)

1 file modified

database/schema/patch-2210-10-1.sql (+14/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-03-16

Diff: 12 lines (+6/-0)

1 file modified

database/schema/patch-2210-08-5.sql (+6/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-03-04

Diff: 12 lines (+6/-0)

1 file modified

database/schema/patch-2210-08-4.sql (+6/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-03-02

Diff: 21 lines (+15/-0)

1 file modified

database/schema/patch-2210-03-0.sql (+15/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-02-25

Diff: 256 lines (+226/-9)

2 files modified

database/schema/patch-2210-06-0.sql (+224/-0)
database/schema/security.cfg (+2/-9)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-02-08

Diff: 226 lines (+160/-3)

3 files modified

database/schema/patch-2210-08-3.sql (+139/-0)
database/schema/security.cfg (+17/-3)
lib/lp/registry/personmerge.py (+4/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-02-05

Diff: 73 lines (+30/-1)

2 files modified

database/schema/patch-2210-11-0.sql (+25/-0)
database/schema/security.cfg (+5/-1)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-01-24

Diff: 20 lines (+14/-0)

1 file modified

database/schema/patch-2210-10-0.sql (+14/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-01-22

Diff: 83 lines (+77/-0)

1 file modified

database/schema/patch-2210-08-2.sql (+77/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2020-01-22

Diff: 45 lines (+39/-0)

1 file modified

database/schema/patch-2210-08-1.sql (+39/-0)

api

Merged into launchpad:master

Colin Watson (community): Approve on 2019-10-16

Diff: 112 lines (+81/-0)

2 files modified

database/schema/patch-2210-08-0.sql (+74/-0)
database/schema/security.cfg (+7/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

4ac07ec... by Ines Almeida on 2023-09-27

Add pro_enable field to Snap table

Merged from https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/452119

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

d646b64... by Patch Queue Manager <email address hidden> on 2023-09-27

Automatic merge from stable up to b905637e2817

5a86fd8... by Patch Queue Manager <email address hidden> on 2023-09-26

Automatic merge from stable up to 8fb7c4e90c36

b905637... by Colin Watson on 2023-09-26

Allow stagingsetup to work remotely

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/451925

8fb7c4e... by Colin Watson on 2023-09-26

Remove script-monitor

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/451918

43769eb... by Ines Almeida on 2023-09-26

Merge branch 'master' into db-devel

This merge is needed in an attempt for the tests in the buildbot to not fail as often (there is a test fix merged into master, and a few other changes that could potentially help with the tests)

Merged from https://code.launchpad.net/~launchpad/launchpad/+git/launchpad/+merge/452145

26867ae... by Ines Almeida on 2023-09-26

Address MP comments

b05306e... by Ines Almeida on 2023-09-26

Increase timeout of signing tests from 30 to 45 seconds

Some tests are consistently failing during builds with a timeout error, even though they don't seem stuck - they just might take a few seconds longer. This will help make the builder more stable.

Merged from https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/452093

765a698... by Colin Watson on 2023-09-26

charm: Build PPA publisher/uploader with binary wheels

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/452116

f852081... by Ines Almeida on 2023-09-26

Add pro_enable field to Snap table