Commit Graph

278 Commits

Author SHA1 Message Date
Ken Payson 029090628d Upgrade protobuf to 3.3.0 2017-05-08 12:18:12 -07:00
kpayson64 4589a2ebf9 Merge pull request #10688 from kpayson64/fix_php_interop
Fix PHP interop tests
2017-04-19 10:37:27 -07:00
Ken Payson b702ce2117 Fix PHP interop tests 2017-04-18 14:29:57 -07:00
David Garcia Quintas 9e1acc0796 master to 1.4.0-dev 2017-04-13 16:30:15 -07:00
yang-g 66d40c63f7 Fix BUILD dependency, copyright and cmake 2017-04-12 10:18:10 -07:00
Ken Payson 975b5103e5 Fix build on Alpine linux + add portability tests 2017-04-06 13:39:35 -07:00
Craig Tiller 9eb0fdec00 Reorganize ext tree
- filters live under filters
- lb_policy, resolver implementations (being part of client_channel) live under client_channel
2017-03-31 16:59:30 -07:00
Makarand Dharmapurikar a0649dde0e Merge branch 'master' of https://github.com/grpc/grpc into grpcz_client 2017-03-27 09:18:21 -07:00
Yuchen Zeng f466ae116e Merge pull request #7771 from y-zeng/cares_buildin
Async DNS resolver with pre-configured c-ares
2017-03-24 14:52:04 -07:00
Makarand Dharmapurikar 3c7e460de6 added copyright exception for census.proto 2017-03-24 13:36:24 -07:00
Nicolas "Pixel" Noble e44a50ffd7 Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0 2017-03-24 00:54:47 +01:00
Alexander Polcyn 3e30832cca bump v1.2.x branch to 1.2.1-pre1 2017-03-20 17:00:45 -07:00
David Garcia Quintas 69e5a28635 Going for 1.2.0 2017-03-20 12:51:17 -07:00
Yuchen Zeng 9bc0d8200e Merge remote-tracking branch 'upstream/master' into cares_bazel_rule 2017-03-17 16:00:17 -07:00
Yuchen Zeng 2c977084c8 Merge remote-tracking branch 'upstream/master' into cares_bazel_rule 2017-03-17 15:57:23 -07:00
Ken Payson 12ca7d319c Bump 1.2.x version to pre-2 2017-03-16 11:01:06 -07:00
kpayson64 32f32ea0b2 Merge pull request #9990 from kpayson64/fill_in_fields
Add package details to grpcio/grpcio-tools
2017-03-10 15:35:55 -08:00
David G. Quintas 169c553e0d Merge pull request #10078 from dgquintas/master_to_1.3.0
Bumped version to 1.3.0-dev
2017-03-10 14:09:27 -08:00
Ken Payson 78354300bf Add package details to gRPC Packages 2017-03-10 10:47:45 -08:00
Nathaniel Manista ad62c29126 Merge pull request #9965 from nathanielmanistaatgoogle/yapf
Add test behavior to yapf_code.sh.
2017-03-10 10:22:07 -08:00
Nathaniel Manista 9f1e5ab3c9 Add test behavior to yapf_code.sh
With this change yapf_code no longer changes the code under test when
executed from within the sanity tests.
2017-03-10 00:12:24 +00:00
David Garcia Quintas 904e7f53ae Introducing 1.2.0-pre1 2017-03-09 15:02:19 -08:00
David Garcia Quintas 74cec10619 Bumped version to 1.3.0-dev 2017-03-09 15:00:26 -08:00
Mehrdad Afshari 9b3c73d1cd Updated protobuf dependency for python to 3.2.0 2017-03-07 22:10:15 +00:00
Jan Tattermusch 3b7bcc3eb0 fix grpcio_tools build on windows 2017-03-07 13:00:20 +01:00
Mehrdad Afshari 065d924436 Updated python scripts to work with protobuf 3.2.0
Since the build script of python grpcio-tools package
is very much entangled with the build system of protobuf,
and protobuf build scripts added a build step that
compiles js/embed.cc to create a preprocessor binary
that takes some .js files and generates a single
well_known_types_embed.cc which then gets linked to the
rest of protobuf source tree.

The generated code seems to be used only by the JS
portion of protoc, so is not expected to affect
our python build.  Since we did not want to replicate
the entire build process of protobuf, we decided to
pre-generate the well_known_types_embed.cc and keep
it in our repo and then substitute the js/embed.cc
compiler file with it.
2017-03-07 13:00:19 +01:00
Jan Tattermusch 5cf218e641 regenerate protoc_lib_deps.py 2017-03-07 13:00:19 +01:00
Jan Tattermusch 6820c8c746 fix bazel_deps.sh 2017-03-07 13:00:19 +01:00
Michael Lumish 63852c933b Merge pull request #9694 from nicolasnoble/upmerge_from_1_1_x
Upmerge from 1.1.x
2017-02-23 14:39:37 -08:00
yang-g 55c6ebfd7a Merge branch 'master' into health 2017-02-17 09:55:03 -08:00
Nathaniel Manista b3a1ec2111 Output diff on failed yapf sanity 2017-02-15 23:07:40 +00:00
Nicolas "Pixel" Noble e00d63f3ea Merge remote-tracking branch 'google/v1.1.x' 2017-02-13 23:37:17 +01:00
Mehrdad Afshari 1a967c31c3 Added Pylint to sanity tests
Pylint is only enabled for "grpcio/grpc" package,
and various specific checks that currently fail are disabled,
each with a respective TODO item in the .pylintrc file.
2017-02-13 11:38:17 -08:00
Alexander Polcyn d490a9e7c3 build fixes for ruby on mac 2017-02-09 09:10:51 -08:00
Yuchen Zeng f44e781d01 Merge remote-tracking branch 'upstream/master' into cares_bazel_rule 2017-02-08 20:15:20 -08:00
yang-g 13a537bcae merge with head 2017-02-07 13:13:20 -08:00
murgatroid99 2b3e12ceee Update version to 1.1.2 2017-02-06 17:42:07 -08:00
Ken Payson 0f5e3a87c2 Ran Yapf code, pinned version 2017-02-06 10:42:45 -08:00
Ken Payson 2fa5f2f978 Re-run yapf code, and pin version 2017-02-06 10:27:09 -08:00
Yuchen Zeng 86d2115553 Merge remote-tracking branch 'upstream/master' into cares_bazel_rule 2017-02-01 16:12:08 -08:00
murgatroid99 e15b5a42af Bump version to 1.1.1 2017-01-31 16:23:54 -08:00
Craig Tiller 5cad46e218 Bump master version numbers 2017-01-30 15:32:24 -08:00
Nicolas "Pixel" Noble 4dcb7862bf Flagging version 1.1.0. 2017-01-30 23:28:06 +01:00
yang-g a7198021a6 merge with head 2017-01-26 13:23:52 -08:00
Yuchen Zeng e38698e5bd Merge remote-tracking branch 'upstream/master' into cares_bazel_rule 2017-01-23 17:19:53 -08:00
Nicolas "Pixel" Noble da83b376eb Changing versions from -dev to -pre1 on the release branch. 2017-01-23 23:52:35 +01:00
Masood Malekghassemi aa7089a549 Be more verbose when generating Python documentation 2017-01-20 18:55:09 -05:00
Yuchen Zeng e02cbebd02 Merge remote-tracking branch 'upstream/master' into cares_buildin 2017-01-19 16:33:30 -08:00
Yuchen Zeng 04ec4701e3 Merge remote-tracking branch 'upstream/master' into cares_buildin 2017-01-18 18:49:07 -08:00
Nathaniel Manista 00ac6288fd pyformat_code.sh → yapf_code.sh
This should have been a part of 06dea573da.
2017-01-17 23:40:38 +00:00