Masood Malekghassemi
|
f01f6577f8
|
Merge pull request #5246 from nicolasnoble/upmerge-from-0.13
Upmerge from 0.13
|
9 years ago |
Nicolas "Pixel" Noble
|
f083013bd7
|
Merge remote-tracking branch 'google/release-0_13' into upmerge-from-0.13
Conflicts:
Makefile
build.yaml
package.json
setup.py
src/core/surface/version.c
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/build_packages.bat
src/python/grpcio/grpc_version.py
src/ruby/lib/grpc/version.rb
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal
|
9 years ago |
Masood Malekghassemi
|
44753c39e1
|
Merge pull request #5237 from nicolasnoble/flagging-release-as-0_13_1-pre1
Flagging 0.13.1-pre1.
|
9 years ago |
Masood Malekghassemi
|
99a4e9e867
|
Merge pull request #5230 from soltanmm/doc
Update Python doc
|
9 years ago |
Nicolas "Pixel" Noble
|
6910ce8e01
|
Flagging 0.13.1-pre1.
|
9 years ago |
Jan Tattermusch
|
78e04bbd09
|
Merge pull request #5236 from nicolasnoble/tagging_release-0_13_0
Flagging the release.
|
9 years ago |
Jan Tattermusch
|
aba92601c1
|
Merge pull request #5234 from soltanmm/testfix
Fix Python unit tests
|
9 years ago |
Nicolas "Pixel" Noble
|
7a925f7f5e
|
Flagging the release.
|
9 years ago |
Vijay Pai
|
2d5e4dcaff
|
Merge pull request #5233 from ctiller/knobbly
Small tweak to make some customer code compile
|
9 years ago |
Craig Tiller
|
10a4cc74a1
|
Merge pull request #5183 from nicolasnoble/fixing-no-tag
Fixing the absence of 'tag' in the version.
|
9 years ago |
Michael Lumish
|
79859988d1
|
Merge pull request #5235 from vjpai/nodejs
Rename node qps worker to prevent confusion
|
9 years ago |
vjpai
|
f74a67b6d5
|
Rename to reduce confusion
|
9 years ago |
Masood Malekghassemi
|
dfab11919e
|
Update Python doc
|
9 years ago |
Masood Malekghassemi
|
603b076855
|
Fix Python unit tests
|
9 years ago |
Craig Tiller
|
d4f2604b53
|
Small tweak to make some customer code compile
|
9 years ago |
Jan Tattermusch
|
02459edaaa
|
Merge pull request #5223 from murgatroid99/node_mac_artifact_build_fix
Node Mac artifact build fix
|
9 years ago |
Kailash Sethuraman
|
ae33720bd9
|
Merge pull request #5228 from soltanmm/tepid
Use precompiled extensions only
|
9 years ago |
murgatroid99
|
9406dcbfcc
|
Run Node distrib tests on Mac against only one Node version
|
9 years ago |
Masood Malekghassemi
|
f747409f6f
|
Use precompiled extensions only
|
9 years ago |
murgatroid99
|
9ab6d0c425
|
Ensure we use local node-pre-gyp in Node install hook
|
9 years ago |
murgatroid99
|
35f07fc931
|
Properly handle rm -rf result on Mac
|
9 years ago |
Craig Tiller
|
017f84ead8
|
Merge pull request #5078 from ctiller/compatibility_mode
Make binary compatibility not the default
|
9 years ago |
Craig Tiller
|
f456b92099
|
Fix Python
|
9 years ago |
David G. Quintas
|
5b026a4a48
|
Merge pull request #5053 from ctiller/bad_metadata
Properly handle "." in metadata
|
9 years ago |
adelez
|
2ba7885f5c
|
Merge pull request #5118 from jtattermusch/gce_scripts
Script to automatically create a Jenkins linux worker.
|
9 years ago |
Craig Tiller
|
38af6122dd
|
Fix copyright
|
9 years ago |
Craig Tiller
|
a7d41147ea
|
Merge github.com:grpc/grpc into bad_metadata
|
9 years ago |
murgatroid99
|
166214f9f6
|
Don't fail distrib test if a static server is running
|
9 years ago |
murgatroid99
|
7ca0dcc843
|
Don't have artifact build depend on global node-pre-gyp
|
9 years ago |
Kailash Sethuraman
|
9b0f81b508
|
Merge pull request #5220 from soltanmm/cherries
Truncate Python target triple for custom bdists
|
9 years ago |
Masood Malekghassemi
|
b14ea1de58
|
Revert Ruby version specialization
|
9 years ago |
Masood Malekghassemi
|
cd4358460d
|
Bump Python version
|
9 years ago |
Masood Malekghassemi
|
dd6ee7af7e
|
Truncate Python target triple
|
9 years ago |
Kailash Sethuraman
|
bf53a74b3f
|
Merge pull request #4926 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
|
9 years ago |
Jan Tattermusch
|
edf12a7b75
|
Merge pull request #5217 from murgatroid99/node_finish_disabling_0.10_tests
Make a couple of fixes to distribution build and tests
|
9 years ago |
David G. Quintas
|
3f19f42771
|
Merge pull request #5052 from ctiller/compress
Fix race condition in transport API
|
9 years ago |
murgatroid99
|
71b42cde46
|
Ensure that node-pre-gyp is properly bundled
|
9 years ago |
murgatroid99
|
32f64d580a
|
Disable Node Mac 0.10 distrib test
|
9 years ago |
David G. Quintas
|
a3bc1e5890
|
Merge pull request #5214 from jtattermusch/fedora_overlay_fun
Fix fedora21 distribtests for python and ruby
|
9 years ago |
Jan Tattermusch
|
c9b3e834cc
|
Merge pull request #5215 from murgatroid99/node_jessie_x86_fix
Fix node distrib test on Debian Jessie x86
|
9 years ago |
murgatroid99
|
802393b549
|
Fix node distrib test on Debian Jessie x86
|
9 years ago |
Jan Tattermusch
|
c1e86744c6
|
fix fedora21 distribtests
|
9 years ago |
Michael Lumish
|
a63300581d
|
Merge pull request #5208 from jtattermusch/fix_python_centos6_release
Backport: Fix python centos6 distribtest in release-0_13
|
9 years ago |
Jan Tattermusch
|
cf36536a30
|
Merge pull request #5190 from murgatroid99/node_windows_tests
Make Node tests run on Windows
|
9 years ago |
Craig Tiller
|
3470054993
|
Merge pull request #5211 from grpc/revert-4038-grpclb_api
Revert "Proto API for LB request/responses"
|
9 years ago |
Craig Tiller
|
c35e2c582f
|
Revert "Proto API for LB request/responses"
|
9 years ago |
Craig Tiller
|
c3602dc1cf
|
Merge pull request #4038 from dgquintas/grpclb_api
Proto API for LB request/responses
|
9 years ago |
David G. Quintas
|
2afed4ca44
|
Merge pull request #5079 from nicolasnoble/underscores_are_the_root_of_all_evil
Removing underscores in CENSUS_API, GRPC_API and GPR_API.
|
9 years ago |
Nathaniel Manista
|
0d7a6ec862
|
Merge pull request #5210 from soltanmm/hack
Reorder Python artifact commands.
|
9 years ago |
Masood Malekghassemi
|
2bbffcf18f
|
Reorder Python artifact commands
|
9 years ago |