TensorFlow: Upstream a batch of changes to git.

Changes:

- Some changes to make our ability to handle external contributions
  simpler (e.g., adding some markers, adding empty __init__.py files).

- Fixing documentation of SummaryWriter.add_summary().

- Some input validation changes for queues/barriers.

- Fixing the ptb tutorial (thanks to @kentonl for reporting),
  fixes, github issue 52.

- Some documentation suggestions for dealing with a few install
  problems.

- Speed improvements to conv2d gradient kernels on CPU.

- More documentation fixes for the website.  Thanks to @makky3939 and
  @keonkim for reports.

- Changes / fixes to the Docker files.

- Changes build_pip_package to not create an sdist.

- Adds tensorboard example script.

Base CL: 107445267

1 files changed, 3 insertions, 1 deletions

diff --git a/tensorflow/python/ops/op_def_library_test.py b/tensorflow/python/ops/op_def_library_test.py
index 72de4586a3..ed2341b2bc 100644
--- a/tensorflow/python/ops/op_def_library_test.py
+++ b/tensorflow/python/ops/op_def_library_test.py
@@ -201,7 +201,9 @@ class OpDefLibraryTest(test_util.TensorFlowTestCase):
 
     with self.assertRaises(TypeError) as cm:
       self._lib.apply_op("Simple", a=[self.Tensor(types.int32)])
-    self.assertStartsWith(cm.exception.message, "Expected int32, got")
+    self.assertStartsWith(
+        cm.exception.message,
+        "Expected int32, got list containing Tensors instead.")
 
   def testReservedInput(self):
     self._add_op("name: 'ReservedInput' "