diff options
| author | Feng Xiao <xiaofeng@google.com> | 2016-09-23 17:57:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 17:57:41 -0700 |
| commit | 87d61e44fac56b5d2a47975813413aec6f6df05a (patch) | |
| tree | 43223b6c29a37589be271232369f8a4b698e0bb6 /jenkins/docker/Dockerfile | |
| parent | 907a075d7eb83ddfa49c51c77b0292fe4fcafff6 (diff) | |
| parent | 5248f61a3482e54bd8cc3d39a9e80ed5752d57a5 (diff) | |
| download | protobuf-87d61e44fac56b5d2a47975813413aec6f6df05a.tar.gz protobuf-87d61e44fac56b5d2a47975813413aec6f6df05a.tar.bz2 protobuf-87d61e44fac56b5d2a47975813413aec6f6df05a.zip | |
Merge pull request #2175 from xfxyjwf/fix_json
Fix VS test failures.
Diffstat (limited to 'jenkins/docker/Dockerfile')
| -rw-r--r-- | jenkins/docker/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index 989e505b..9c2a834d 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -115,7 +115,7 @@ RUN cd /tmp && \ cd protobuf && \ ./autogen.sh && \ ./configure && \ - make -j7 && \ + make -j4 && \ cd java && \ $MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO && \ cd ../javanano && \ |