Merge branch '1.4'

This commit is contained in:
Matthias Radestock committed 2016-01-29 15:25:50 +00:00
commit b2c9802aa2
3 files changed
+10 -4

No files matched your search

+1 -1
View File
@@ -176,7 +176,7 @@ proxy_start_container_with_dns() {
rm_containers() {
host=$1
shift
[ $# -eq 0 ] || docker_on $host rm -f "$@" >/dev/null
[ $# -eq 0 ] || docker_on $host rm -f -v "$@" >/dev/null
}
container_ip() {