Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-20 |
|\ | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other Conflicts: include/grpc/grpc.h | ||
| * | Merge pull request #2474 from nicolasnoble/lets-actually-build-32-bits | Jan Tattermusch | 2015-07-20 |
| |\ | | | | | | | Making sure we build 32 bits in Jenkins. | ||
| | * | Making sure that 32 bits is being built and run on Jenkins. | Nicolas "Pixel" Noble | 2015-07-21 |
| | | | |||
* | | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-20 |
|\| | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | missed a php depenedency in dockerfile | Stanley Cheung | 2015-07-20 |
| | | | |||
| * | | temp directory doesnt work when tests run in parallel | Stanley Cheung | 2015-07-19 |
| | | | |||
| * | | Merge pull request #2491 from stanley-cheung/add_homebrew_to_jenkins | Jan Tattermusch | 2015-07-19 |
| |\ \ | | | | | | | | | Support macos in jenkins run_distributions script | ||
| * \ \ | Merge branch 'decompression' of https://github.com/dgquintas/grpc into ↵ | Craig Tiller | 2015-07-19 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dgquintas-decompression Conflicts: Makefile vsprojects/Grpc.mak | ||
| | | * | | support macos in jenkins run_distributions script | Stanley Cheung | 2015-07-19 |
| | |/ / | |/| | | |||
* | | | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-17 |
|\ \ \ \ | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| | * \ \ | Merge with head and resolve conflict | yang-g | 2015-07-17 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge github.com:grpc/grpc into no-worries-i-can-wait | Craig Tiller | 2015-07-17 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||
| | * | | | rename script to run_distribution | Stanley Cheung | 2015-07-17 |
| | | | | | |||
| | * | | | Merge with head | yang-g | 2015-07-16 |
| | |\ \ \ | |||
| | * | | | | split iterator into its own file | yang-g | 2015-07-16 |
| | | | | | | |||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-16 |
| | | | | |\ | | | | |_|/ | | | |/| | | |||
* | | | | | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-16 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | | | Merge pull request #2460 from vjpai/exposed_pool | Craig Tiller | 2015-07-16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Make thread_pool.h a public header | ||
* | | | | | | | Added connectivity tests, fixed bugs | Craig Tiller | 2015-07-16 |
| | | | | | | | |||
| * | | | | | | Merge pull request #2389 from nicolasnoble/let-s-run-ruby-on-macos | Jan Tattermusch | 2015-07-16 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Setting up ruby environment for macos. | ||
| * \ \ \ \ \ \ | Merge pull request #2390 from nicolasnoble/we-have-both-kinds | Jan Tattermusch | 2015-07-15 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Enabling 32 bits downgrade of our environment. | ||
| | * | | | | | | | Enabling 32 bits downgrade of our environment. | Nicolas "Pixel" Noble | 2015-07-16 |
| | | | | | | | | | |||
| | | | * | | | | | Change name of thread_pool files to fixed_size_thread_pool when | vjpai | 2015-07-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate | ||
* | | | | | | | | | Client connectivity API | Craig Tiller | 2015-07-15 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial plumbing work; needs tests and more client_channel implementation. | ||
| | | | | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-15 |
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Makefile # include/grpc++/client_context.h # include/grpc++/server_context.h # src/cpp/client/client_context.cc # src/cpp/server/server_context.cc # vsprojects/Grpc.mak | ||
* | | | | | | | | Merge pull request #2383 from vjpai/lockfree-stack | Craig Tiller | 2015-07-15 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Lockfree stack | ||
* \ \ \ \ \ \ \ \ | Merge pull request #2408 from nicolasnoble/generate_projects-should-mkdir | Craig Tiller | 2015-07-15 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | generate_projects.py should make directories. | ||
| | | | | * | | | | | Make thread_pool.h a public header | Vijay Pai | 2015-07-15 |
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename ThreadPool -> FixedSizeThreadPool to allow for later introduction of DynamicSizeThreadPool | ||
| * | | | | | | | | generate_projects.py should make directories. | Nicolas "Pixel" Noble | 2015-07-14 |
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | That's necessary for generating Visual Studio project files that are in separate empty directories otherwise. | ||
* / | | | | | | | links interface and gRPC-on-wire implementation | Nathaniel Manista | 2015-07-13 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code branches out of the alpha/early_adopter code and begins building toward the beta API. | ||
| | | | | * | | Add oauth2_auth_token test case in interop test | yang-g | 2015-07-13 |
| | | | | | | | |||
| | | | * | | | Merge github.com:grpc/grpc into no-worries-i-can-wait | Craig Tiller | 2015-07-13 |
| | | | |\ \ \ | |||
| | | | * | | | | Introduce a clock type field onto gpr_timespec. | Craig Tiller | 2015-07-13 |
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Use it to validate that arithmetic on time types makes even some vague kind of sense. | ||
* | | | | | | | Filtering stdout for JUnit report in case of timeouts. | Nicolas "Pixel" Noble | 2015-07-12 |
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | We're not properly filtering stdout in case we're timeouting. This generates invalid XML output. | ||
* | | | | | | Merge pull request #2395 from nicolasnoble/tabs-are-evil | Craig Tiller | 2015-07-11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Swapping tabs for spaces in generate_projects.py | ||
| * | | | | | | Swapping tabs for spaces in generate_projects.py | Nicolas "Pixel" Noble | 2015-07-11 |
| | |/ / / / | |/| | | | | |||
* / | | | | | Disabling cython for now. | Nicolas "Pixel" Noble | 2015-07-11 |
|/ / / / / | |||
| * | | | | Merge branch 'master' into lockfree-stack | vjpai | 2015-07-10 |
| |\ \ \ \ | |/ / / / |/| | | | | |||
| | * | | | Setting up ruby environment for macos. | Nicolas "Pixel" Noble | 2015-07-11 |
| |/ / / |/| | | | |||
| * | | | Debug and add in generated build files | Vijay Pai | 2015-07-10 |
| | | | | |||
* | | | | Merge pull request #2387 from nicolasnoble/docker-is-a-freezer | Jan Tattermusch | 2015-07-10 |
|\ \ \ \ | | | | | | | | | | | Let's workaround #2140 a bit. | ||
* | | | | | fix chmod of script | Stanley Cheung | 2015-07-10 |
| | | | | | |||
* | | | | | Merge pull request #2367 from stanley-cheung/add_homebrew_to_jenkins | Jan Tattermusch | 2015-07-10 |
|\ \ \ \ \ | | | | | | | | | | | | | Add homebrew testing to jenkins | ||
* \ \ \ \ \ | Merge pull request #2380 from ctiller/slartiwhatfast | Vijay Pai | 2015-07-10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make naming a little more consistent | ||
| | | * | | | | Let's workaround #2140 a bit. | Nicolas "Pixel" Noble | 2015-07-11 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | Let's wait 4 seconds before removing the docker container, and let's make the removal a non-fatal condition of the jenkins script. | ||
* | | | | | | Merge pull request #2368 from ctiller/they-gave-me-a-badge | Nicolas Noble | 2015-07-10 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Add a version string and a function to retrieve it | ||
| | | * | | | jenkins linuxbrew: review changes | Stanley Cheung | 2015-07-10 |
| | | | | | | |||
| | | * | | | Add homebrew testing to jenkins | Stanley Cheung | 2015-07-10 |
| |_|/ / / |/| | | | | |||
| | | * | | Initial checkin commit for lockfree stack. | Vijay Pai | 2015-07-10 |
| | | | | | | | | | | | | | | | | | | | | Tests not yet included. | ||
| | * | | | Make naming a little more consistent | Craig Tiller | 2015-07-10 |
| | | | | |