Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into sceq | 2016-02-17 | |
|\ | |||
| * | Merge pull request #5209 from vjpai/why_lever | 2016-02-16 | |
| |\ | | | | | | | Delete fixed_size_thread_pool | ||
| * \ | Merge pull request #5098 from a-veitch/base_log | 2016-02-16 | |
| |\ \ | | | | | | | | | Add Census base log | ||
| * | | | Revert "Proto API for LB request/responses" | 2016-02-11 | |
| | | | | |||
| * | | | Merge pull request #4038 from dgquintas/grpclb_api | 2016-02-11 | |
| |\ \ \ | | | | | | | | | | | Proto API for LB request/responses | ||
| | | | * | fixed_size_thread_pool : why do we even have that lever? It has been | 2016-02-11 | |
| | |_|/ | |/| | | | | | | | | | | deprecated and unused for quite some time. | ||
| | | * | merge to HEAD | 2016-02-11 | |
| | | |\ | |||
| | * | \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-02-11 | |
| | |\ \ \ | | | | |/ | | | |/| | |||
| * | | | | Merge branch 'master' into alarm_mods | 2016-02-11 | |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| * | | | | Properly specify dependences on alarm.h in build.yaml | 2016-02-10 | |
| | | | | | |||
| * | | | | Make C++ alarm class usable and testable - there were some build issues and | 2016-02-10 | |
| | | | | | | | | | | | | | | | | | | | | it was not actually even included in the library or the test suite. | ||
* | | | | | Merge github.com:grpc/grpc into sceq | 2016-02-09 | |
|\| | | | | |||
| | * | | | Further cleanup | 2016-02-09 | |
| | | | | | |||
| | * | | | Further cleanup | 2016-02-09 | |
| | | | | | |||
| | * | | | Get compilation working again | 2016-02-09 | |
| | | | | | |||
| | * | | | Rollback gpr deletion | 2016-02-09 | |
| |/ / / | |||
| | * | | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-02-08 | |
| | |\ \ | | |/ / | |/| | | |||
| | | * | merge | 2016-02-05 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | merge | 2016-02-03 | |
| |\ \ \ | |||
| | | | * | initial commit | 2016-02-02 | |
| | | | | | |||
| | * | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | 2016-02-03 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: BUILD Makefile binding.gyp build.yaml gRPC.podspec grpc.gemspec package.json src/python/grpcio/grpc_core_dependencies.py templates/Makefile.template tools/doxygen/Doxyfile.core.internal tools/run_tests/sources_and_headers.json vsprojects/vcxproj/gpr/gpr.vcxproj vsprojects/vcxproj/gpr/gpr.vcxproj.filters | ||
| * | | | | | post merge | 2016-02-02 | |
| | | | | | | |||
* | | | | | | Merge github.com:grpc/grpc into sceq | 2016-02-02 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||
| | | | * | | Use old memcpy for wrappers | 2016-02-02 | |
| | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #4979 from nicolasnoble/win32_subprocess | 2016-02-01 | |
| |\ \ \ \ | | | | | | | | | | | | | Adding windows support for gpr subprocesses. | ||
| * \ \ \ \ | Merge pull request #4978 from nicolasnoble/alarming | 2016-01-31 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fixing, using and testing alarm code. | ||
| | | | | * \ | Merge branch 'census-placeholders' into make-ruby-installable | 2016-01-31 | |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: package.json tools/doxygen/Doxyfile.core.internal | ||
| * | | | | | | Actually moving this to the proper place. | 2016-01-31 | |
| | | | | | | | |||
| | | | | * | | Merge branch 'win32_subprocess' into make-ruby-installable | 2016-01-31 | |
| | | | | |\ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: BUILD Makefile binding.gyp build.yaml gRPC.podspec grpc.gemspec src/python/grpcio/grpc_core_dependencies.py tools/run_tests/sources_and_headers.json vsprojects/vcxproj/gpr/gpr.vcxproj vsprojects/vcxproj/gpr/gpr.vcxproj.filters | ||
| | | * | | | | Adding windows support for gpr subprocesses. | 2016-01-31 | |
| | |/ / / / | |/| | | | | |||
| | | | * | | Merge branch 'alarming' into make-ruby-installable | 2016-01-31 | |
| | | | |\ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | Conflicts: tools/run_tests/sources_and_headers.json | ||
| | * | | | | Fixing, using and testing alarm code. | 2016-01-31 | |
| |/ / / / | |||
| | | * / | Removing gpr as a separated library. | 2016-01-30 | |
| | |/ / | |/| | | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-01-29 | |
| | | |\ | | |_|/ | |/| | | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-01-28 | |
| | | |\ | | | |/ | | |/| | |||
| * | | | Fixed wrong usage of global var | 2016-01-28 | |
| | | | | |||
| * | | | DONE!!1one | 2016-01-27 | |
| | | | | |||
| * | | | After GrpcLibrary refactoring. Compiles and passes. WIP still | 2016-01-27 | |
| | | | | |||
| * | | | pre sync_stream.cc creation. Does not compile | 2016-01-25 | |
| | | | | |||
| * | | | async_stream.h done. Compiles | 2016-01-25 | |
| | | | | |||
| * | | | Further work. Compiles. WIP | 2016-01-25 | |
| | | | | |||
| * | | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | 2016-01-25 | |
| |\| | | |||
* | | | | Merge github.com:grpc/grpc into sceq | 2016-01-22 | |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #4750 from a-veitch/tag_set | 2016-01-22 | |
| |\ \ \ | | | | | | | | | | | Census Tag Set API and implementation | ||
| | | * | | made codegen targets in build.yaml | 2016-01-21 | |
| | | | | | |||
| | | * | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | 2016-01-21 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | Add -std=gnu99 when building libgrpc | 2016-01-21 | |
| | | | | | |||
| | | * | | more dependency/sanity fixes | 2016-01-21 | |
| | | | | | |||
| | | * | | added missing codegen deps for grp | 2016-01-21 | |
| | | | | | |||
| | | * | | Made "codedgen" directories closed over #includes | 2016-01-21 | |
| | | | | |