This is an automated email from the ASF dual-hosted git repository. jking pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/thrift.git
commit e2109b914cefcf53f454586008a78cf19bbe8018 Merge: bf51a9f ab494bc Author: James E. King III <[email protected]> AuthorDate: Sun Dec 30 22:41:49 2018 -0500 Merge pull request #1653 from jeking3/consume-0.12.0 THRIFT-4689: Consume the 0.12.0 release branch changes into master CHANGES | 252 ++++++++++++++++++++- Thrift-swift3.podspec | 12 +- Thrift.podspec | 10 +- appveyor.yml | 4 +- bower.json | 1 + build/cmake/DefineCMakeDefaults.cmake | 2 +- composer.json | 8 +- configure.ac | 2 +- contrib/fb303/py/setup.py | 6 +- contrib/thrift-maven-plugin/pom.xml | 2 +- contrib/thrift.spec | 2 +- contrib/vagrant/centos-6.5/README.md | 2 +- contrib/zeromq/csharp/ThriftZMQ.csproj | 4 +- debian/changelog | 26 ++- doap.rdf | 10 + lib/cocoa/src/Thrift.h | 2 +- .../ThriftMSBuildTask/Properties/AssemblyInfo.cs | 4 +- .../ThriftMSBuildTask/ThriftMSBuildTask.csproj | 4 +- lib/csharp/src/Properties/AssemblyInfo.cs | 4 +- lib/csharp/src/Thrift.csproj | 4 +- .../test/Multiplex/Client/MultiplexClient.csproj | 4 +- .../test/Multiplex/Server/MultiplexServer.csproj | 4 +- .../test/ThriftMVCTest/Properties/AssemblyInfo.cs | 4 +- lib/d/src/thrift/base.d | 2 +- lib/dart/{LICENSE_HEADER => LICENSE} | 0 lib/dart/pubspec.yaml | 2 +- lib/delphi/src/Thrift.pas | 2 +- lib/erl/src/thrift.app.src | 2 +- lib/go/thrift/serializer_types_test.go | 2 +- lib/haxe/README.md | 6 +- lib/haxe/haxelib.json | 2 +- lib/hs/thrift.cabal | 2 +- lib/java/gradle.properties | 2 +- lib/js/src/thrift.js | 2 +- lib/lua/THttpTransport.lua | 2 +- lib/lua/Thrift.lua | 2 +- lib/netcore/Thrift/Properties/AssemblyInfo.cs | 4 +- .../Transports/Client/THttpClientTransport.cs | 4 +- lib/ocaml/_oasis | 2 +- lib/perl/lib/Thrift.pm | 2 +- lib/py/setup.py | 4 +- lib/rb/thrift.gemspec | 4 +- lib/st/package.xml | 2 +- package-lock.json | 2 +- package.json | 2 +- sonar-project.properties | 2 +- test/csharp/ThriftTest.csproj | 4 +- test/dart/test_client/pubspec.yaml | 2 +- test/erl/src/thrift_test.app.src | 2 +- tutorial/dart/client/pubspec.yaml | 2 +- tutorial/dart/console_client/pubspec.yaml | 2 +- tutorial/dart/server/pubspec.yaml | 2 +- tutorial/delphi/DelphiClient/DelphiClient.dproj | 4 +- tutorial/delphi/DelphiServer/DelphiServer.dproj | 4 +- tutorial/hs/ThriftTutorial.cabal | 2 +- tutorial/ocaml/_oasis | 2 +- 56 files changed, 367 insertions(+), 88 deletions(-)
