diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-03 13:04:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-03 13:04:29 +0000 |
| commit | 0f002cfff7900317d2eb089a9d2f4afe4a5469fe (patch) | |
| tree | d2ced6f972fd7dd0256ea0b5e9a0d7d7b4da51e8 /docker | |
| parent | 682b60b86111b9697ab4b7ac0fd0bd84d8757119 (diff) | |
| parent | 23b1a8c03a2765627fb8b0c602a99c5d5dfc63c1 (diff) | |
| download | kolla-0f002cfff7900317d2eb089a9d2f4afe4a5469fe.tar.gz kolla-0f002cfff7900317d2eb089a9d2f4afe4a5469fe.zip | |
Merge "Fix some words spellings"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/sources.list | 2 | ||||
| -rw-r--r-- | docker/dind/start.sh | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-agents/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/ip_wrapper.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/base/sources.list b/docker/base/sources.list index a57d337a0..d63541f02 100644 --- a/docker/base/sources.list +++ b/docker/base/sources.list @@ -3,7 +3,7 @@ deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse -# Backports have a lower priority and must be explictly installed to be used +# Backports have a lower priority and must be explicitly installed to be used deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse # We need to add the Liberty repo for the updated packages they provide. The main diff --git a/docker/dind/start.sh b/docker/dind/start.sh index 61a4b09e9..56e733409 100644 --- a/docker/dind/start.sh +++ b/docker/dind/start.sh @@ -3,7 +3,7 @@ set -o errexit set -o nounset -# External processes will be occuring and we must wait for them +# External processes will be occurring and we must wait for them while [[ ! -e "/kolla_dind_ready" ]]; do sleep 1 done diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index 8b90871bd..ce4b7202d 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -44,7 +44,7 @@ COPY config-sudoers.sh /var/lib/kolla/ COPY start.sh / -# We will remove this line in Docker 1.10 when namespace propogation works +# We will remove this line in Docker 1.10 when namespace propagation works VOLUME /run/netns CMD ["/start.sh"] diff --git a/docker/neutron/neutron-base/ip_wrapper.py b/docker/neutron/neutron-base/ip_wrapper.py index 33177d03e..b7c77c3d1 100644 --- a/docker/neutron/neutron-base/ip_wrapper.py +++ b/docker/neutron/neutron-base/ip_wrapper.py @@ -40,7 +40,7 @@ def host_mnt_exec(cmd): except Exception as e: print( - "An error has occured with a component that Kolla manages." + "An error has occurred with a component that Kolla manages." " Please file a bug") print("Error: ", e) |