Commit Graph

12305 Commits

Author SHA1 Message Date
Craig Tiller f73429901a Merge github.com:grpc/grpc into sceq 2016-02-09 16:32:51 -08:00
Jan Tattermusch bfe240ea07 Merge pull request #5168 from nathanielmanistaatgoogle/drop-interop-tests-make-install-certs
Drop Python interop tests' "make install-certs"
2016-02-09 15:41:54 -08:00
Nathaniel Manista 11a694486a Drop Python interop tests' "make install-certs" 2016-02-09 23:19:06 +00:00
Jan Tattermusch ab02713c58 Merge pull request #5066 from chrisdunelm/dnx_Profilers
Fix Profilers for coreclr
2016-02-09 15:10:30 -08:00
Nathaniel Manista ecf8327b3d Merge pull request #5100 from nathanielmanistaatgoogle/python-grpc_set_ssl_roots_override_callback
grpc_set_ssl_roots_override_callback for Python.
2016-02-09 13:26:56 -08:00
Nathaniel Manista fa6cad701c grpc_set_ssl_roots_override_callback for Python 2016-02-09 19:02:56 +00:00
Jan Tattermusch 2dbaca8adc Merge pull request #5121 from jtattermusch/refactor_dockerfiles
Refactor dockerfiles
2016-02-08 17:43:54 -08:00
Jan Tattermusch 9b721f8711 addressing comments 2016-02-08 17:23:02 -08:00
Jan Tattermusch 8763501cf0 cleanup sanity docker image 2016-02-08 17:23:02 -08:00
Jan Tattermusch 1978e26119 regenerated dockerfiles 2016-02-08 17:23:02 -08:00
Jan Tattermusch 80043e988f polish C# dependencies 2016-02-08 17:23:02 -08:00
Jan Tattermusch ebeb86c0e9 remove trailing whitespaces 2016-02-08 17:23:01 -08:00
Jan Tattermusch d40a0100ed remove unneeded dockerfiles 2016-02-08 17:23:01 -08:00
Jan Tattermusch e70b3c5d5a use per-language dockerfiles 2016-02-08 17:23:01 -08:00
Jan Tattermusch 5ed57567b8 rvm use is not necessary 2016-02-08 17:23:01 -08:00
Jan Tattermusch ef8cf30cc4 add generated dockerfiles 2016-02-08 17:23:01 -08:00
Jan Tattermusch a810876732 dockerfile refactoring 2016-02-08 17:23:01 -08:00
Jan Tattermusch 0618f272c0 Merge pull request #5144 from nicolasnoble/master-is-14
Flagging master's version properly.
2016-02-08 17:22:01 -08:00
Nicolas "Pixel" Noble 1935c3655c Flagging master as 0.14.0-dev. 2016-02-09 01:54:56 +01:00
Nicolas "Pixel" Noble 6f24e761f0 Merge remote-tracking branch 'google/release-0_13' into master-is-14 2016-02-09 01:53:41 +01:00
Nicolas Noble 359e4b11c4 Merge pull request #5146 from jtattermusch/fix_csharp_environment_test
Fix csharp environment test
2016-02-08 16:45:53 -08:00
Jan Tattermusch fe0c4a84fa C# assembly version and current version 2016-02-08 16:39:55 -08:00
Michael Lumish 32454cfbfc Merge pull request #5130 from murgatroid99/node_mac_distrib_test
Enable Node distrib tests on Mac
2016-02-08 16:31:56 -08:00
Jan Tattermusch 6819ee73a6 fix GrpcEnvironmentTest 2016-02-08 16:28:32 -08:00
Nicolas Noble bb32cee0ba Merge pull request #5142 from jtattermusch/csharp_fix_assemblyversion
Fix C# build
2016-02-08 16:23:27 -08:00
Jan Tattermusch d980047a04 fix C# build 2016-02-08 16:22:23 -08:00
Nicolas Noble 6d65bc3930 Merge pull request #5141 from murgatroid99/node_package_version_template_0.13
Make Node's package.json use the version from build.yaml
2016-02-08 16:07:16 -08:00
murgatroid99 b0162c48bd Make Node's package.json use the version from build.yaml 2016-02-08 16:06:12 -08:00
Craig Tiller 283536bed8 Merge pull request #5140 from nicolasnoble/13-is-pre1
Flagging 0.13 as pre1.
2016-02-08 15:53:32 -08:00
Craig Tiller ad7d11dc96 Merge pull request #5138 from jtattermusch/fix_python_centos6
Fix python centos6 distribtest
2016-02-08 15:51:21 -08:00
Nicolas "Pixel" Noble cda4bad582 Flagging 0.13 as pre1. 2016-02-09 00:44:23 +01:00
Jan Tattermusch 3b3dcb20ec fix python centos6 distribtest 2016-02-08 15:43:38 -08:00
Craig Tiller 64914ae6b5 Merge pull request #5128 from yang-g/inherit_from_grpc_library
Add missing base class
2016-02-08 15:14:29 -08:00
Nicolas Noble 824a0903a5 Merge pull request #5129 from ctiller/version_number
build.yaml centric versioning
2016-02-08 15:12:47 -08:00
Nicolas Noble e2c7671170 Merge pull request #5099 from vjpai/cpp_races
Move internals of many C++ Async classes to ref-counted struct
2016-02-08 15:11:24 -08:00
Craig Tiller 719a9a085c Ummmm 2016-02-08 15:06:54 -08:00
yang-g a1fc8fb95f Merge remote-tracking branch 'upstream/master' into inherit_from_grpc_library 2016-02-08 15:00:32 -08:00
Nathaniel Manista 757c157d86 Merge pull request #5134 from soltanmm/cleaners
Clean-up Python linux-binary installation.
2016-02-08 14:57:59 -08:00
murgatroid99 135ebafab2 Removed macos from the docker_suffix list 2016-02-08 14:52:30 -08:00
Masood Malekghassemi 35afe4afaf Fall back to building if GCS cannot be reached 2016-02-08 14:51:31 -08:00
Masood Malekghassemi 6598ce16db Move os.environ to module-level 2016-02-08 14:51:04 -08:00
David G. Quintas d397b7a628 Merge pull request #5133 from ctiller/includes
Fix include hygiene
2016-02-08 14:46:34 -08:00
murgatroid99 456cbaee76 Fixed node mac distrib tests 2016-02-08 14:45:45 -08:00
Vijay Pai 6d98638c3c Merge pull request #5131 from ctiller/sanitize-again
Fix sanity
2016-02-08 14:44:26 -08:00
Craig Tiller ee6a1dcea6 Fix include hygiene 2016-02-08 14:41:45 -08:00
Masood Malekghassemi 842122675b Merge pull request #5127 from soltanmm/fuu
Fix GCS URL for Python
2016-02-08 14:40:27 -08:00
Craig Tiller 42b7b3056a Merge pull request #5132 from jtattermusch/fix_python_opensuse
Fix python opensuse distribtest
2016-02-08 14:37:30 -08:00
Craig Tiller 3b93efbabc Fix copyright 2016-02-08 14:28:13 -08:00
Jan Tattermusch 1431e70c77 fix python opensuse distribtest 2016-02-08 14:23:34 -08:00
Craig Tiller 45551e0c99 Fix sanity 2016-02-08 14:22:40 -08:00