commit e2ed2e8f038a2360b3d191c181e57fd0375d2a5f
author Kun Zhang <zhangkun@google.com> Wed Jan 27 08:26:19 2016 -0800
committer Kun Zhang <zhangkun@google.com> Wed Jan 27 23:32:01 2016 -0800
tree 8c3df67e2ae7eb628b1738d7e25b55ac14ab3617
parent b7c4e18dcd00c8099ba6869d8e87d5825c50990a

Upgrade to protobuf-3.0.0-beta-2 and protobuf-nano-3.0.0-alpha-5

Update option name that disables protobuf tests.

compiler/Dockerfile

diff --git a/compiler/Dockerfile b/compiler/Dockerfile
index 1c4bb49..759afbf 100644
--- a/compiler/Dockerfile
+++ b/compiler/Dockerfile
@@ -2,7 +2,7 @@
 
 RUN scl enable devtoolset-1.1 'bash -c "cd /protobuf && \
     git fetch && \
-    git checkout v3.0.0-beta-1 && \
+    git checkout v3.0.0-beta-2 && \
     ./autogen.sh && \
     CXXFLAGS=-m32 ./configure --disable-shared --prefix=/protobuf-32 -j$(nproc) && \
     make clean && make && make install"'

compiler/README.md

diff --git a/compiler/README.md b/compiler/README.md
index ce89ca5..e78c08d 100644
--- a/compiler/README.md
+++ b/compiler/README.md
@@ -13,7 +13,7 @@
 
 * Linux, Mac OS X with Clang, or Windows with MSYS2
 * Java 7 or up
-* [Protobuf](https://github.com/google/protobuf) 3.0.0-beta-1 or up
+* [Protobuf](https://github.com/google/protobuf) 3.0.0-beta-2 or up
 
 ## Compiling and testing the codegen
 Change to the `compiler` directory: