Commit ed2d6181 authored by Patrick Nguyen's avatar Patrick Nguyen
Browse files

Merge commit for internal changes

Conflicts:
	RELEASE.md
	configure.py
	tensorflow/contrib/cmake/external/zlib.cmake
	tensorflow/contrib/cmake/python_modules.txt
	tensorflow/contrib/cmake/tests/cuda/compatibility_test.c
	tensorflow/contrib/cmake/tests/cuda/compatibility_test.cc
	tensorflow/contrib/data/python/ops/dataset_ops.py
	tensorflow/contrib/gan/python/eval/python/summaries_test.py
	tensorflow/contrib/layers/python/layers/layers.py
	tensorflow/contrib/layers/python/layers/layers_test.py
	tensorflow/contrib/tpu/profiler/pip_package/setup.py
	tensorflow/core/public/version.h
	tensorflow/docs_src/install/install_c.md
	tensorflow/docs_src/install/install_go.md
	tensorflow/docs_src/install/install_java.md
	tensorflow/docs_src/install/install_linux.md
	tensorflow/docs_src/install/install_mac.md
	tensorflow/docs_src/install/install_sources.md
	tensorflow/examples/image_retraining/retrain.py
	tensorflow/python/framework/test_util.py
	tensorflow/python/keras/_impl/keras/layers/lstm_test.py
	tensorflow/python/layers/utils.py
	tensorflow/python/ops/bitwise_ops_test.py
	tensorflow/python/ops/distributions/beta.py
	tensorflow/python/ops/image_ops_test.py
	tensorflow/python/ops/losses/losses_impl.py
	tensorflow/tools/pip_package/setup.py
parents a4f14781 943a21fc
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment