Merge ~cjwatson/launchpad:merge-db-stable into launchpad:master

[Colin Watson]

Merge db-stable 16105df1dd (Add allow_internet to OCIRecipe)

[Colin Watson (cjwatson)]

Deployed to the production database today.

review: Approve

diff --git a/database/schema/patch-2210-18-0.sql b/database/schema/patch-2210-18-0.sql
new file mode 100644
index 0000000..bf2dc28
--- /dev/null
+++ b/database/schema/patch-2210-18-0.sql
@@ -0,0 +1,10 @@
+-- Copyright 2020 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+ALTER TABLE OCIRecipe ADD COLUMN allow_internet boolean DEFAULT true NOT NULL;
+
+COMMENT ON COLUMN OCIRecipe.allow_internet IS 'If True, builds of this OCIRecipe may allow access to external network resources.';
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2210, 18, 0);