Code

Down Integrate Internal Changes#6869

Code

Merged

rafi-kamal merged 5 commits intoprotocolbuffers:masterprotocolbuffers/protobuf:masterfrom rafi-kamal:201911111645rafi-kamal/protobuf:201911111645Copy head branch name to clipboardNov 12, 2019

+3,022-2,755

Commits

Commits on Nov 12, 2019

• Down Integrate Internal Changes

  rafi-kamal

  committed
  185eca1

  Copy full SHA for 185eca1

• Add proguard.pgcfg to EXTRA_DIST in Makefile.am

  rafi-kamal

  committed
  0abab85

  Copy full SHA for 0abab85

• Whitelist newly added conformance test failures for Ruby, C#, and PHP

  rafi-kamal

  committed
  6d593a9

  Copy full SHA for 6d593a9

• Simplify template exporting macros

  

  m0hamed

  authored and

  rafi-kamal

  committed
  479ec14

  Copy full SHA for 479ec14

• Remove java/lite/proguard.pgcfg from EXTRA_DIST since it's not part of

  Show description for ae6412a
  rafi-kamal

  committed
  ae6412a

  Copy full SHA for ae6412a