Merge pull request #22632 from jsafrane/devel/fix-nfs-image

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-09 12:51:44 -08:00
commit 3081c10a40
4 changed files with 4 additions and 4 deletions

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TAG = 0.2 TAG = 0.3
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
all: push all: push

View File

@ -34,6 +34,6 @@ trap stop TERM
start "$@" start "$@"
while true; do while true; do
read sleep 5
done done

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TAG = 0.4 TAG = 0.5
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
all: push all: push

View File

@ -58,5 +58,5 @@ start "$@"
# Ugly hack to do nothing and wait for SIGTERM # Ugly hack to do nothing and wait for SIGTERM
while true; do while true; do
read sleep 5
done done