Code

Merge 3.2.x branch into master#2648

Code

Merged

TeBoring merged 36 commits intoprotocolbuffers:masterprotocolbuffers/protobuf:masterfrom TeBoring:masterTeBoring/protobuf:masterCopy head branch name to clipboardJan 31, 2017

+7,922-5,650

Commits

Commits on Dec 20, 2016

• Down-integrate internal changes to github.

  TeBoring

  committed
  199d82f

  Copy full SHA for 199d82f

• Down-integrate internal changes to github.

  TeBoring

  committed
  9cb253f

  Copy full SHA for 9cb253f

• Update conformance test failure list.

  TeBoring

  committed
  a9cdd80

  Copy full SHA for a9cdd80

Commits on Dec 21, 2016

• Explicitly import used class in nano test to avoid random test fail.

  TeBoring

  committed
  cf50240

  Copy full SHA for cf50240

• Update _GNUC_VER to use the correct implementation of atomic operation

  Show description for e02ff1a
  TeBoring

  committed
  e02ff1a

  Copy full SHA for e02ff1a

• maps_test.js: check whether Symbol is defined before using it (protocolbuffers#2524)

  Show description for c7cbf5f
  

  Adam Cozzette

  authored and

  TeBoring

  committed
  c7cbf5f

  Copy full SHA for c7cbf5f

• Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up

  

  acozzette

  authored and

  TeBoring

  committed
  f424c71

  Copy full SHA for f424c71

• Updated Makefile.am to fix out-of-tree builds

  

  acozzette

  authored and

  TeBoring

  committed
  2d8a544

  Copy full SHA for 2d8a544

• Added Bazel genrule for generating well_known_types_embed.cc

  Show description for 2f38ce1
  

  acozzette

  authored and

  TeBoring

  committed
  2f38ce1

  Copy full SHA for 2f38ce1

Commits on Dec 22, 2016

• Update _GNUC_VER to use the correct implementation of atomic operation on Mac.

  TeBoring

  committed
  117f771

  Copy full SHA for 117f771

Commits on Dec 28, 2016

• Add new js file in extra dist.

  TeBoring

  committed
  e230283

  Copy full SHA for e230283

• Bump version number to 3.2.0

  TeBoring

  committed
  f5cc1a5

  Copy full SHA for f5cc1a5

• Fixed issue with autoloading - Invalid paths (protocolbuffers#2538)

  

  NicklasWallgren

  authored and

  TeBoring

  committed
  da9fea1

  Copy full SHA for da9fea1

Commits on Dec 30, 2016

• Merge pull request protocolbuffers#2550 from TeBoring/3.2.x

  Show description for 911e84e
  xfxyjwf

  authored
  911e84e

  Copy full SHA for 911e84e

Commits on Jan 8, 2017

• PHP fix int64 decoding (protocolbuffers#2516)

  Show description for c871ce6
  

  Sufir

  authored and

  TeBoring

  committed
  c871ce6

  Copy full SHA for c871ce6

Commits on Jan 9, 2017

• Fix int64 decoding on 32-bit machines.

  TeBoring

  committed
  d1fde36

  Copy full SHA for d1fde36

• Fix warning in compiler/js/embed.cc

  Show description for a24ddc5
  

  jbrianceau

  authored and

  TeBoring

  committed
  a24ddc5

  Copy full SHA for a24ddc5

• Fix include in auto-generated well_known_types_embed.cc

  Show description for 46dee43
  

  jbrianceau

  authored and

  TeBoring

  committed
  46dee43

  Copy full SHA for 46dee43

• Fixed cross compilations with the Autotools build

  Show description for 77e434d
  

  acozzette

  authored and

  TeBoring

  committed
  77e434d

  Copy full SHA for 77e434d

• Minor fix for autocreated object repeated fields and maps.

  Show description for 64cbfab
  

  thomasvl

  authored and

  TeBoring

  committed
  64cbfab

  Copy full SHA for 64cbfab

• Fix generation of extending nested messages in JavaScript (protocolbuffers#2439)

  Show description for 83fb8c7
  

  MarcusLongmuir

  authored and

  TeBoring

  committed
  83fb8c7

  Copy full SHA for 83fb8c7

Commits on Jan 10, 2017

• Fix generated code when there is no namespace but there is enum definition.

  TeBoring

  committed
  e259b51

  Copy full SHA for e259b51

• Decoding unknown field should succeed.

  TeBoring

  committed
  60d4f8a

  Copy full SHA for 60d4f8a

• Add embed.cc in src/Makefile.am to fix dist check.

  TeBoring

  committed
  531ebd9

  Copy full SHA for 531ebd9

• Fixed "make distcheck" for the Autotools build

  Show description for 790fc93
  

  acozzette

  authored and

  TeBoring

  committed
  790fc93

  Copy full SHA for 790fc93

• Remove redundent embed.cc from src/Makefile.am

  TeBoring

  committed
  4447637

  Copy full SHA for 4447637

Commits on Jan 11, 2017

• Update version number to 3.2.0-rc.1 (protocolbuffers#2578)

  TeBoring

  authored
  5750146

  Copy full SHA for 5750146

Commits on Jan 12, 2017

• Change protoc-artifacts version to 3.2.0-rc.1

  TeBoring

  committed
  3e51b3d

  Copy full SHA for 3e51b3d

Commits on Jan 18, 2017

• Update version number to 3.2.0rc2

  TeBoring

  committed
  6eeb5c7

  Copy full SHA for 6eeb5c7

Commits on Jan 20, 2017

• Update change logs for 3.2.0 release.

  TeBoring

  committed
  b22c6b0

  Copy full SHA for b22c6b0

• Update php README

  TeBoring

  committed
  be83f46

  Copy full SHA for be83f46

Commits on Jan 23, 2017

• Update upb, fixes some bugs (including a hash table problem). (protocolbuffers#2611)

  Show description for d966879
  

  haberman

  authored and

  TeBoring

  committed
  d966879

  Copy full SHA for d966879

Commits on Jan 24, 2017

• Reverting deployment target to 7.0 (protocolbuffers#2618)

  Show description for d1f0939
  

  davidair

  authored and

  TeBoring

  committed
  d1f0939

  Copy full SHA for d1f0939

Commits on Jan 26, 2017

• Fix typo that breaks builds on big-endian (protocolbuffers#2632)

  

  opoplawski

  authored and

  TeBoring

  committed
  2c8346a

  Copy full SHA for 2c8346a

Commits on Jan 27, 2017

• Bump version number to 3.2.0

  TeBoring

  committed
  593e917

  Copy full SHA for 593e917

Commits on Jan 31, 2017

• Merge 3.2.x branch into master.

  TeBoring

  committed
  1d02c51

  Copy full SHA for 1d02c51