9 files changed, 36 insertions, 34 deletions
diff --git a/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu b/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu
index 16ff229c59..79cf1844f2 100644
--- a/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu
+++ b/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu
@@ -5,7 +5,15 @@ MAINTAINER Jan Prach <jendap@google.com>
 # Copy and run the install scripts.
 COPY install/*.sh /install/
 RUN /install/install_bootstrap_deb_packages.sh
-RUN echo "deb http://http.debian.net/debian jessie-backports main" | tee -a /etc/apt/sources.list
+RUN echo "deb http://http.debian.net/debian jessie-backports main" | \
+    tee -a /etc/apt/sources.list
+# Workaround bug in Jessie backport repository deb packages
+# http://serverfault.com/questions/830636/cannot-install-openjdk-8-jre-headless-on-debian-jessie
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends -t jessie-backports \
+        openjdk-8-jre-headless ca-certificates-java && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 RUN /install/install_deb_packages.sh
 RUN /install/install_pip_packages.sh
 RUN /install/install_bazel.sh
diff --git a/tensorflow/tools/ci_build/ci_parameterized_build.sh b/tensorflow/tools/ci_build/ci_parameterized_build.sh
index c2ad03bc6f..7aadfd280e 100755
--- a/tensorflow/tools/ci_build/ci_parameterized_build.sh
+++ b/tensorflow/tools/ci_build/ci_parameterized_build.sh
@@ -117,8 +117,7 @@ DOCKER_MAIN_CMD="${CI_BUILD_DIR}/ci_build.sh"
 NO_DOCKER_MAIN_CMD="${CI_BUILD_DIR}/builds/configured"
 
 # Additional option flags to apply when Docker is unavailable (e.g., on Mac)
-NO_DOCKER_OPT_FLAG="--linkopt=-headerpad_max_install_names "\
-"--genrule_strategy=standalone"
+NO_DOCKER_OPT_FLAG="--genrule_strategy=standalone"
 
 DO_DOCKER=1
 
diff --git a/tensorflow/tools/ci_build/update_version.sh b/tensorflow/tools/ci_build/update_version.sh
index da8b956c2a..cde0ab7909 100755
--- a/tensorflow/tools/ci_build/update_version.sh
+++ b/tensorflow/tools/ci_build/update_version.sh
@@ -85,16 +85,6 @@ check_existence file "${SETUP_PY}"
 
 sed -i -e "s/^\_VERSION = [\'\"].*[\'\"]/\_VERSION = \'${MAJOR}.${MINOR}.${PATCH}\'/g" "${SETUP_PY}"
 
-# Update os_setup.md
-OS_SETUP="${TF_SRC_DIR}/g3doc/get_started/os_setup.md"
-check_existence file "${OS_SETUP}"
-
-sed -i -r -e "s/(.*pip[0-9]* install .*tensorflow-)([0-9]+\.[0-9]+\.[[:alnum:]]+)(-.*\.whl)/\1${MAJOR}.${MINOR}.${PIP_PATCH}\3/g" "${OS_SETUP}"
-sed -i -r -e "s/(.*pip[0-9]* install .*tensorflow_gpu-)([0-9]+\.[0-9]+\.[[:alnum:]]+)(-.*\.whl)/\1${MAJOR}.${MINOR}.${PIP_PATCH}\3/g" "${OS_SETUP}"
-sed -i -r -e "s/(.*export TF_BINARY_URL.*tensorflow-)([0-9]+\.[0-9]+\.[[:alnum:]]+)(-.*\.whl)/\1${MAJOR}.${MINOR}.${PIP_PATCH}\3/g" "${OS_SETUP}"
-sed -i -r -e "s/(.*export TF_BINARY_URL.*tensorflow_gpu-)([0-9]+\.[0-9]+\.[[:alnum:]]+)(-.*\.whl)/\1${MAJOR}.${MINOR}.${PIP_PATCH}\3/g" "${OS_SETUP}"
-sed -i -r -e "s/(.*\`)([0-9]+\.[0-9]+\.[[:alnum:]-]+)(-gpu.*)/\1${MAJOR}.${MINOR}.${PATCH}\3/g" "${OS_SETUP}"
-
 
 # Update README.md
 README_MD="./README.md"
diff --git a/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh b/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
index 7bab520f61..9d59a6eb51 100755
--- a/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
+++ b/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
@@ -76,14 +76,12 @@ zip -j ${DIR}/libtensorflow_jni-cpu-windows-$(uname -m).zip \
 rm -f ${DIR}/tensorflow_jni.dll
 
 # Zip up the .dll, LICENSE and include files for the C library.
+mkdir -p ${DIR}/include/tensorflow/c
+mkdir -p ${DIR}/lib
+cp bazel-bin/tensorflow/libtensorflow.so ${DIR}/lib/tensorflow.dll
+cp tensorflow/c/c_api.h ${DIR}/include/tensorflow/c
+cp bazel-genfiles/tensorflow/tools/lib_package/include/tensorflow/c/LICENSE ${DIR}/include/tensorflow/c
 cd ${DIR}
-mkdir -p include/tensorflow/c
-mkdir -p lib
-cp bazel-bin/tensorflow/libtensorflow.so lib/tensorflow.dll
-cp tensorflow/c/c_api.h include/tensorflow/c
-cp ../bazel-genfiles/tensorflow/tools/lib_package/include/tensorflow/c/LICENSE include/tensorflow/c
-zip libtensorflow-cpu-windows-$(uname -m).zip lib/* include/*
-# Zip up the .dll, LICENSE and header files for the C library.
 zip -j libtensorflow-cpu-windows-$(uname -m).zip \
   lib/tensorflow.dll \
   include/c/c_api.h \
diff --git a/tensorflow/tools/dist_test/local_test.sh b/tensorflow/tools/dist_test/local_test.sh
index f9f37ff0e1..f536beef54 100755
--- a/tensorflow/tools/dist_test/local_test.sh
+++ b/tensorflow/tools/dist_test/local_test.sh
@@ -151,6 +151,8 @@ rm -rf "${BUILD_DIR}"
 # Run docker image for test.
 docker run ${DOCKER_IMG_NAME} \
     /var/tf_dist_test/scripts/dist_mnist_test.sh \
-    --ps_hosts "localhost:2000,localhost:2001" \
-    --worker_hosts "localhost:3000,localhost:3001" \
+    --ps_hosts $(seq -f "localhost:%g" -s "," \
+                 2000 $((2000 + ${NUM_PARAMETER_SERVERS} - 1))) \
+    --worker_hosts $(seq -f "localhost:%g" -s "," \
+                     3000 $((3000 + ${NUM_WORKERS} - 1))) \
     --num_gpus 0 ${SYNC_REPLICAS_FLAG}
diff --git a/tensorflow/tools/docker/README.md b/tensorflow/tools/docker/README.md
index 77fd8fc0d4..3e45ae362c 100644
--- a/tensorflow/tools/docker/README.md
+++ b/tensorflow/tools/docker/README.md
@@ -10,16 +10,16 @@ General installation instructions are
 quick links here:
 
 * [OSX](https://www.docker.com/products/docker#/mac)
-* [ubuntu](https://docs.docker.com/engine/installation/linux/ubuntulinux/)
+* [Ubuntu](https://docs.docker.com/engine/installation/linux/ubuntulinux/)
 
 ## Which containers exist?
 
-We currently maintain three Docker container images:
+We currently maintain two Docker container images:
 
 * `gcr.io/tensorflow/tensorflow` - TensorFlow with all dependencies - CPU only!
 
 * `gcr.io/tensorflow/tensorflow:latest-gpu` - TensorFlow with all dependencies
-  and support for Nvidia Cuda
+  and support for NVidia CUDA
 
 Note: We also publish the same containers into
 [Docker Hub](https://hub.docker.com/r/tensorflow/tensorflow/tags/).
@@ -37,9 +37,9 @@ For GPU support install NVidia drivers (ideally latest) and
     $ nvidia-docker run -it -p 8888:8888 gcr.io/tensorflow/tensorflow:latest-gpu
 
 
-Note: If you would have a problem running nvidia-docker you may try the old way
-we have used. But it is not recomended. If you find a bug in nvidia-docker report
-it there please and try using the nvidia-docker as described above.
+Note: If you would have a problem running nvidia-docker you may try the old method
+we have used. But it is not recommended. If you find a bug in nvidia-docker, please report
+it there and try using nvidia-docker as described above.
 
     $ export CUDA_SO=$(\ls /usr/lib/x86_64-linux-gnu/libcuda.* | xargs -I{} echo '-v {}:{}')
     $ export DEVICES=$(\ls /dev/nvidia* | xargs -I{} echo '--device {}:{}')
@@ -49,7 +49,7 @@ it there please and try using the nvidia-docker as described above.
 ## More containers
 
 See all available [tags](https://hub.docker.com/r/tensorflow/tensorflow/tags/)
-for additional containers like release candidates or nighlty builds.
+for additional containers, such as release candidates or nightly builds.
 
 
 ## Rebuilding the containers
diff --git a/tensorflow/tools/docs/parser.py b/tensorflow/tools/docs/parser.py
index 51f6adac1e..901b3db22b 100644
--- a/tensorflow/tools/docs/parser.py
+++ b/tensorflow/tools/docs/parser.py
@@ -586,7 +586,7 @@ def _generate_signature(func, reverse_index):
               '_ops.GraphKeys': 'tf.GraphKeys',
               'init_ops.zeros_initializer': 'tf.zeros_initializer',
               'init_ops.ones_initializer': 'tf.ones_initializer',
-              'saver_pb2.SaverDef': 'tf.SaverDef',
+              'saver_pb2.SaverDef': 'tf.train.SaverDef',
           }
           full_name_re = '^%s(.%s)+' % (IDENTIFIER_RE, IDENTIFIER_RE)
           match = re.match(full_name_re, default_text)
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index 6a3f66b0fa..a8b4fbf414 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -3,7 +3,11 @@
 
 package(default_visibility = ["//visibility:private"])
 
-load("//tensorflow:tensorflow.bzl", "transitive_hdrs")
+load(
+    "//tensorflow:tensorflow.bzl",
+    "if_not_windows",
+    "transitive_hdrs",
+)
 load("//third_party/mkl:build_defs.bzl", "if_mkl")
 load("//tensorflow/core:platform/default/build_config_root.bzl", "tf_additional_license_deps")
 
@@ -93,13 +97,14 @@ filegroup(
         "@libxsmm_archive//:LICENSE",
         "@local_config_sycl//sycl:LICENSE.text",
         "@nanopb_git//:LICENSE.txt",
-        "@nccl_archive//:LICENSE.txt",
         "@png_archive//:LICENSE",
         "@protobuf//:LICENSE",
         "@six_archive//:LICENSE",
         "@org_pocoo_werkzeug//:LICENSE",
         "@zlib_archive//:zlib.h",
-    ] + tf_additional_license_deps(),
+    ] + if_not_windows([
+        "@nccl_archive//:LICENSE.txt",
+    ]) + tf_additional_license_deps(),
 )
 
 sh_binary(
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 9b229704d6..c7ca83f282 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -29,7 +29,7 @@ from setuptools.dist import Distribution
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '1.0.0'
+_VERSION = '1.0.1'
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.11.0',