Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Plumbing transport_op changes through | 2015-06-25 | |
| | |||
* | Merge branch 'oops-i-split-it-again' into tis-but-thy-name | 2015-06-25 | |
|\ | |||
* \ | Merge github.com:grpc/grpc into tis-but-thy-name | 2015-06-25 | |
|\ \ | |||
| | * | Merge github.com:grpc/grpc into oops-i-split-it-again | 2015-06-25 | |
| | |\ | | |/ | |/| | |||
* | | | Refactoring progress towards integrating client configs | 2015-06-25 | |
| | | | |||
* | | | Implementation work for client_config | 2015-06-24 | |
| | | | | | | | | | | | | | | | - uri parsing - dns resolution | ||
| * | | Merge pull request #2185 from ctiller/it-hides-them | 2015-06-24 | |
| |\ \ | | | | | | | | | Move some code out of src/ into tools/ | ||
* | \ \ | Merge github.com:grpc/grpc into that-which-we-call-a-rose | 2015-06-24 | |
|\ \ \ \ | | | | | | | | | | | | | | | | Introduce resolver_factory | ||
| | | | * | Merge github.com:grpc/grpc into oops-i-split-it-again | 2015-06-24 | |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | * | | | Make it less likely a build.json change triggers a merge conflict | 2015-06-23 | |
| |/ / / | |||
* | | | | Merge github.com:grpc/grpc into that-which-we-call-a-rose | 2015-06-23 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec tools/doxygen/Doxyfile.core.internal | ||
* | | | | Flesh out things and make them compile | 2015-06-23 | |
| | | | | |||
| | * | | Move some code out of src/ into tools/ | 2015-06-23 | |
| |/ / | | | | | | | | | | It shouldn't count towards coverage | ||
| * | | Fix doxyfile for real | 2015-06-23 | |
| | | | |||
| * | | clang-format messed up Doxyfile.c++, restored | 2015-06-23 | |
| | | | |||
| * | | Add missing headers to build.json | 2015-06-23 | |
| | | | |||
| * | | Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs | 2015-06-23 | |
| |\ \ | | | | | | | | | Remove Protobuf dependency for C++ | ||
| | | * | Merge github.com:grpc/grpc into oops-i-split-it-again | 2015-06-23 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #2175 from yang-g/constness | 2015-06-23 | |
| |\ \ \ | | | | | | | | | | | Add const to ByteBuffer methods and add tests | ||
| | * | | | Add const to ByteBuffer methods and add tests | 2015-06-22 | |
| | | | | | |||
| * | | | | Merge pull request #2168 from ctiller/dont-do-nothing-infinite-times | 2015-06-22 | |
| |\ \ \ \ | | | | | | | | | | | | | Dont do nothing for eternity | ||
| * \ \ \ \ | Merge pull request #2154 from jcanizales/fix-build-json | 2015-06-22 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Add pollset_set.h to build.json | ||
| | | * | | | Dont do nothing for eternity | 2015-06-22 | |
| |_|/ / / |/| | | | | |||
| | | * | | Merge github.com:grpc/grpc into one-shouldnt-depend-on-protobufs | 2015-06-22 | |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| * | | | | Merge branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix | 2015-06-22 | |
| |\ \ \ \ | |/ / / / |/| | | | | |||
| | * | | | Add pollset_set.h to build.json | 2015-06-20 | |
| |/ / / |/| | | | |||
* | | | | Ensure tests are built during run_tests runs | 2015-06-19 | |
| | | | | | | | | | | | | | | | | | | | | The issue remains that we don't test our tools, but at least we test that they compile. | ||
| | * | | Merge github.com:grpc/grpc into one-shouldnt-depend-on-protobufs | 2015-06-19 | |
| | |\ \ | |_|/ / |/| | | | |||
| * | | | Merge branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix | 2015-06-19 | |
| |\ \ \ | |||
| | | | * | Merge branch 'we-dont-need-no-backup' into oops-i-split-it-again | 2015-06-18 | |
| | | | |\ | |_|_|_|/ |/| | | | | | | | | | | | | | | Conflicts: tools/doxygen/Doxyfile.core.internal | ||
* | | | | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-18 | |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec tools/doxygen/Doxyfile.core.internal | ||
| * | | | | Merge pull request #2116 from nicolasnoble/jenkins-clang | 2015-06-18 | |
| |\ \ \ \ | | | | | | | | | | | | | Adding clang packages for msan/tsan/asan testing. | ||
| * \ \ \ \ | Merge pull request #2104 from murgatroid99/build_json_add_missing_context.h | 2015-06-18 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added missing but included headers to build.json | ||
| | | | | | * | Merge branch 'we-dont-need-no-backup' into oops-i-split-it-again | 2015-06-18 | |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | |||
| | | | * | | | Fixing ssl auth context. | 2015-06-18 | |
| | |_|/ / / | |/| | | | | |||
| | | * | | | Switching from wheezy to jessie. | 2015-06-18 | |
| | | | | | | |||
* | | | | | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-17 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/grpc/compression.h | ||
| | | * | | | Adding clang packages for msan/tsan/asan testing. | 2015-06-18 | |
| | |/ / / | |/| | | | |||
| * | | | | Merge pull request #2095 from jtattermusch/autobuild_jenkins_dockerfile | 2015-06-17 | |
| |\ \ \ \ | | | | | | | | | | | | | make sure docker image is up-to-date before each build | ||
| | | * | | | Added missing but included headers to build.json | 2015-06-17 | |
| | | | | | | |||
| | * | | | | update instructions on picking up failed docker container | 2015-06-17 | |
| | | | | | | |||
| | * | | | | make sure docker image is up-to-date before each build | 2015-06-17 | |
| | |/ / / | |||
| | | | * | Merge branch 'we-dont-need-no-backup' into oops-i-split-it-again | 2015-06-17 | |
| | | | |\ | |_|_|_|/ |/| | | | | |||
* | | | | | Merge branch 'you-complete-me' into we-dont-need-no-backup | 2015-06-17 | |
|\| | | | | |||
| * | | | | Merge github.com:grpc/grpc into you-complete-me | 2015-06-17 | |
| |\| | | | |||
| | * | | | Various Jenkins-related tweaks. | 2015-06-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -) created a .profile at the root of the docker image - seems the new nvm script requires that. -) installing simplejson and mako python packages, for the sanity check. -) calling prepare_travis.sh in order to try and download precompiled packages for openssl and protobuf. -) using the new "config" axis. -) improved the output of prepare_travis.sh. | ||
| | | * | | Merge branch 'we-dont-need-no-backup' into one-shouldnt-depend-on-protobufs | 2015-06-16 | |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/grpc++/async_unary_call.h include/grpc++/config.h include/grpc++/config_protobuf.h include/grpc++/impl/service_type.h include/grpc++/stream.h src/cpp/common/call.cc | ||
| * | | | | | Merge github.com:grpc/grpc into you-complete-me | 2015-06-16 | |
| |\| | | | | |||
| | | | * | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-16 | |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | | | * | | Merge branch 'you-complete-me' into we-dont-need-no-backup | 2015-06-16 | |
| |_|_|/| | |/| | |/ / | | |/| | | |/| | | | | | | | | Conflicts: src/python/src/grpc/_adapter/_c/utility.c |