Commit Graph

17927 Commits

Author SHA1 Message Date
Takuto Ikuta bb04734eec Fix a typo 2016-08-25 13:31:51 +09:00
Takuto Ikuta ed96de4f79 Merge pull request #1 from grpc/master
merge
2016-08-25 13:29:01 +09:00
Nicolas Noble 19ea0cffd7 Merge pull request #7616 from markdroth/cq_verifier_cleanup
Clean up cq_verifier code and error messages.
2016-08-24 13:51:38 -07:00
Nicolas Noble 668bf881a9 Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x
Upmerge from v1.0.x
2016-08-23 14:59:39 -07:00
Nicolas "Pixel" Noble d25c1d2a6c Removing unused header. 2016-08-23 21:28:33 +02:00
Nicolas "Pixel" Noble 455c5d45f0 Untangling secure and unsecure. 2016-08-23 20:39:49 +02:00
Stanley Cheung 56d7044ed8 Merge pull request #7819 from stanley-cheung/php-update-composer
PHP: bump version (master)
2016-08-23 08:37:16 -07:00
Nicolas Noble 0e43d67602 Merge pull request #7832 from thunderboltsid/add-readme-for-gsoc-contribs
Add project overview for gsoc submission
2016-08-22 20:06:44 -07:00
kpayson64 1754624312 Merge pull request #7775 from vjpai/this
Remove this->
2016-08-22 19:44:11 -07:00
kpayson64 96c598f669 Merge pull request #7763 from thunderboltsid/add-pypy-to-dockerfile
Add PyPy 5.3.1 to dockerfile and template
2016-08-22 19:42:05 -07:00
Siddharth Shukla d13a780be0 Add project overview for gsoc submission 2016-08-23 03:26:50 +02:00
Stanley Cheung 557aa4e695 php: bump version 2016-08-22 08:51:47 -07:00
Craig Tiller daf4699652 Merge pull request #6732 from ctiller/consistent_client_count
Make client_channels be across all clients, not per-client
2016-08-22 08:34:38 -07:00
Nicolas Noble df48291ba0 Merge pull request #7718 from adelez/build_stats
Tool for collecting build statistics.
2016-08-19 17:03:46 -07:00
Nicolas "Pixel" Noble e3e17d3f6b Merge branch 'v1.0.x' of https://github.com/grpc/grpc 2016-08-20 01:45:32 +02:00
Nicolas Noble bbc20b59f8 Merge pull request #7783 from nicolasnoble/shipping-1.0
Bumping version to 1.0.1-pre1.
2016-08-18 21:16:07 -07:00
Nicolas Noble 2a69139aa7 Merge pull request #7787 from nicolasnoble/quick-fix-for-manylinux
Disabling check for SO_REUSEPORT in MANYLINUX; it'll always fail.
2016-08-18 17:55:10 -07:00
Nicolas "Pixel" Noble baa35fc50d Disabling check for SO_REUSEPORT in MANYLINUX; it'll always fail. 2016-08-19 02:20:11 +02:00
Nicolas Noble 6cfc80edaf Merge pull request #7762 from KindDragon/master
Fix CMake for windows (VS2015)
2016-08-18 16:53:43 -07:00
Nicolas Noble bfe947c4af Merge pull request #7784 from jcanizales/move-to-v1
Move Podspecs to v1
2016-08-18 16:06:22 -07:00
Nicolas Noble f906e55432 Merge pull request #7308 from ctiller/moovee
Prep for making GA video
2016-08-18 16:04:48 -07:00
Jorge Canizales 36031d50db Move user-agent version to 1.0.0
I can’t wait to get all of these automatically from a single source :)
2016-08-18 15:21:15 -07:00
Arkady Shapkin 407dc4f28b Merge pull request #1 from nicolasnoble/cmake-fixes
Generating project file.
2016-08-19 01:19:22 +03:00
Nicolas "Pixel" Noble 2069fbc951 Generating project file. 2016-08-18 23:29:56 +02:00
Jorge Canizales 4a18c67b77 Move Podspecs to v1 2016-08-18 13:26:25 -07:00
Nicolas "Pixel" Noble 35b8c51485 Bumping version to 1.0.1-pre1. 2016-08-18 21:57:20 +02:00
Nicolas Noble 90e4bd5fbb Merge pull request #7745 from nicolasnoble/no-more-pre
Removing pre2 flag.
2016-08-18 12:16:48 -07:00
Nicolas Noble 9882e9b3df Merge pull request #7776 from kpayson64/templatize_dependencies
Use templates for python version dependencies
2016-08-18 12:16:41 -07:00
Ken Payson 8348973de9 Use templates for python version dependencies
Also change grpcio-tools to be a runtime dependency of grpcio-tests,
grpcio-tools is run as part of the tests.
2016-08-18 11:27:47 -07:00
Nicolas Noble fedcf7d8ad Merge pull request #7752 from nicolasnoble/unsecure-should-be-unsecure
grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure.
2016-08-18 11:05:13 -07:00
Nicolas Noble bbdebaae28 Merge pull request #7744 from y-zeng/makefile-ga
Update required protobuf version to v3.0.0
2016-08-18 11:02:11 -07:00
Nicolas Noble fc8c12d48b Merge pull request #7754 from dgquintas/readme_beta_to_ga
s/Beta/1.0 in languages status table
2016-08-18 10:32:15 -07:00
Vijay Pai c4752d8857 Remove this-> 2016-08-18 10:06:38 -07:00
Nicolas Noble f4112fc06e Merge pull request #7741 from nicolasnoble/manual-upmerge
Manual upmerge from v1.0.x to master.
2016-08-18 10:00:18 -07:00
Mark D. Roth 9770206fc4 Merge pull request #7773 from markdroth/bytebuffer_alloc
Reduce allocations associated with src/cpp/util/byte_buffer.cc.
2016-08-18 09:25:10 -07:00
Mark D. Roth 2665bdd6d2 Reduce allocations associated with src/cpp/util/byte_buffer.cc. 2016-08-18 08:02:24 -07:00
Mark D. Roth 37c1c8fa58 Eliminated pointer to end of expectation list. 2016-08-18 07:05:11 -07:00
Arkadiy Shapkin 40beb37859 Fix CMake for Windows 2016-08-18 12:35:58 +03:00
kpayson64 146e374d53 Merge pull request #7768 from kpayson64/grpcio_tools35
Add Python3.5 grpcio-tools binaries for windows
2016-08-17 19:40:14 -07:00
makdharma 5c648dc537 Merge pull request #7766 from makdharma/cronet_e2e_take2
fixed compile warnings treated as errors
2016-08-17 17:09:02 -07:00
kpayson64 9429717fc3 Merge pull request #7735 from y-zeng/cli_main_fork
Improve gRPC CLI
2016-08-17 17:02:40 -07:00
kpayson64 b80d9c9626 Merge pull request #7594 from chedeti/grpc-thrift-v2
grpc thrift integration
2016-08-17 16:59:20 -07:00
Ken Payson 69ff5de496 Add Python3.5 grpcio-tools binaries 2016-08-17 15:31:16 -07:00
Makarand Dharmapurikar 7ca910372b changed from uint32_t to size_t 2016-08-17 15:18:38 -07:00
Makarand Dharmapurikar 3e4be9fc56 fixed compile warnings treated as errors 2016-08-17 14:59:26 -07:00
makdharma b731abf215 Merge pull request #7713 from makdharma/cronet_e2e_take2
Cronet e2e take2
2016-08-17 12:16:11 -07:00
siddharthshukla 5e3193ecf6 Add PyPy 5.3.1 to dockerfile and template 2016-08-17 19:48:26 +02:00
Stanley Cheung b70fdc7e23 Merge pull request #7679 from stanley-cheung/fix-jenkins-linux-image
Fix jenkins linux image in create script
2016-08-17 10:02:20 -07:00
Makarand Dharmapurikar d8004a86fa minor tweak 2016-08-17 10:01:36 -07:00
Makarand Dharmapurikar f8f8f5a2eb more review feedback addressed 2016-08-17 09:55:46 -07:00