diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-03 02:53:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-03 02:53:00 +0000 |
| commit | 6fa8261a5c005245639de1734ae073418619ca0d (patch) | |
| tree | a20c352ebc2af43be27241b35ae425a1a3775e91 /docker/base | |
| parent | 86a99c463422d3dcbf6849153a4cadd892ed3247 (diff) | |
| parent | 2c342143883894525ef670bf196edb8566eab71c (diff) | |
| download | kolla-6fa8261a5c005245639de1734ae073418619ca0d.tar.gz kolla-6fa8261a5c005245639de1734ae073418619ca0d.zip | |
Merge "Remove unecessary blank lines"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/kolla_bashrc | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 22181ff9c..5cf3633c0 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -3,7 +3,6 @@ MAINTAINER {{ maintainer }} LABEL kolla_version="{{ kolla_version }}" - {{ include_header }} ENV KOLLA_BASE_DISTRO {{ base_distro }} @@ -210,7 +209,6 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 199369E540 && rm -rf /usr/lib/python2.7/site-packages \ && ln -s dist-packages /usr/lib/python2.7/site-packages - {% endif %} COPY set_configs.py /usr/local/bin/kolla_set_configs diff --git a/docker/base/kolla_bashrc b/docker/base/kolla_bashrc index c797e51a9..09b19cc06 100644 --- a/docker/base/kolla_bashrc +++ b/docker/base/kolla_bashrc @@ -1,4 +1,3 @@ - #### Custom data added by Kolla _KBOLD="\[$(tput bold)\]" _KRESET="\[$(tput sgr0)\]" |