Merge pull request #18141 from tback/master

Auto commit by PR queue bot

Merge pull request #18141 from tback/master
0e3f9625 · k8s-merge-robot · dca6f5ac · c022bd06 · 0e3f9625
Commit 0e3f9625 authored Dec 06, 2015 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

Dockerfile examples/redis/image/Dockerfile +0 -1

No files found.
--- a/examples/redis/image/Dockerfile
+++ b/examples/redis/image/Dockerfile
@@ -5,7 +5,6 @@ RUN apt-get install -yy -q python
 COPY redis-master.conf /redis-master/redis.conf
 COPY redis-slave.conf /redis-slave/redis.conf
 COPY run.sh /run.sh
-COPY sentinel.py /sentinel.py

 CMD [ "/run.sh" ]
 ENTRYPOINT [ "sh", "-c" ]