diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-20 08:26:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-20 08:26:36 +0000 |
| commit | 9e60cdf27cd5f7143e42599ae109cf819ba1d463 (patch) | |
| tree | 056c59898bce26592096459b10e4b3e191155ddc | |
| parent | 00d37c53ca719e59d432d2cffef3df11de429394 (diff) | |
| parent | 47dfee9ce67088d3e4e7f6505801ce70ecd65f45 (diff) | |
| download | kolla-9e60cdf27cd5f7143e42599ae109cf819ba1d463.tar.gz kolla-9e60cdf27cd5f7143e42599ae109cf819ba1d463.zip | |
Merge "base/ubuntu: fix comment about Canonical UCA"
| -rw-r--r-- | docker/base/sources.list.ubuntu | 4 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu.aarch64 | 4 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu.ppc64le | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 59f9ebf27..fab757f25 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -8,8 +8,8 @@ deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe m # Backports have a lower priority and must be explicitly installed to be used deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse -# We need to add the queens repo for the updated packages they provide. The main -# ones are qemu, libvirt, and openvswitch. +# We need to add the repo for the updated packages they provide. The main ones +# are qemu, libvirt, and openvswitch. deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/queens main # MariaDB 10.0 repo diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64 index 39d3e895f..dc76db0dc 100644 --- a/docker/base/sources.list.ubuntu.aarch64 +++ b/docker/base/sources.list.ubuntu.aarch64 @@ -6,6 +6,6 @@ deb http://ports.ubuntu.com/ xenial-security main restricted universe multiverse # Backports have a lower priority and must be explicitly installed to be used deb http://ports.ubuntu.com/ xenial-backports main restricted universe multiverse -# We need to add the pike repo for the updated packages they provide. The main -# ones are qemu, libvirt, and openvswitch. +# We need to add the repo for the updated packages they provide. The main ones +# are qemu, libvirt, and openvswitch. deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/queens main diff --git a/docker/base/sources.list.ubuntu.ppc64le b/docker/base/sources.list.ubuntu.ppc64le index 810e2b237..dab6bcdec 100644 --- a/docker/base/sources.list.ubuntu.ppc64le +++ b/docker/base/sources.list.ubuntu.ppc64le @@ -6,8 +6,8 @@ deb http://ports.ubuntu.com/ xenial-security main restricted universe multiverse # Backports have a lower priority and must be explicitly installed to be used deb http://ports.ubuntu.com/ xenial-backports main restricted universe multiverse -# We need to add the pike repo for the updated packages they provide. The main -# ones are qemu, libvirt, and openvswitch. +# We need to add the repo for the updated packages they provide. The main ones +# are qemu, libvirt, and openvswitch. deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/queens main # Mariadb |