Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into sceq | 2016-02-17 | |
|\ | |||
| * | Merge pull request #5098 from a-veitch/base_log | 2016-02-16 | |
| |\ | | | | | | | Add Census base log | ||
| * \ | Merge pull request #5254 from grpc/release-0_13 | 2016-02-15 | |
| |\ \ | | | | | | | | | Release 0.13 upmerge. | ||
| | * | | Adding the .yardopts file into the gems. | 2016-02-14 | |
| | | | | |||
| * | | | Revert "Proto API for LB request/responses" | 2016-02-11 | |
| | | | | |||
| | | * | merge to HEAD | 2016-02-11 | |
| | | |\ | |||
| * | | \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-02-11 | |
| |\ \ \ \ | | | |_|/ | | |/| | | |||
| | * | | | Merge pull request #5165 from ctiller/bring_back_gpr | 2016-02-10 | |
| | |\ \ \ | | | |/ / | | |/| | | Bring back gpr | ||
| | * | | | Fixing Ruby binary build (again). | 2016-02-10 | |
| | | | | | |||
* | | | | | Merge github.com:grpc/grpc into sceq | 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 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | Fixing ruby versionning. | 2016-02-09 | |
| | |/ / | |/| | | |||
| | | * | Merge branch 'master' into base_log | 2016-02-08 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Nope. | 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. | ||
| | | | | * | | Removing zookeeper's API for now. | 2016-01-31 | |
| | | | | | | | |||
| | | | | * | | 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 | |
| | | | | | | | |||
| | | | | * | | Building the grpc DLLs. | 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 make-ruby-installable | 2016-01-29 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-01-28 | |
| | | | |\ | | | |_|/ | | |/| | | |||
| | | * | | Few more fixes to the Ruby installation. | 2016-01-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | -) properly depending on libraries. -) adding an independent 'loader' class to use instead of require 'grpc/grpc'. | ||
| | | * | | Allowing for creation of pre-compiled gems, using rack-compiler-dock. | 2016-01-28 | |
| | |/ / | |||
| * | | | 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 | |
| |\| | | |||
* | | | | Get subchannel index working | 2016-01-25 | |
| |/ / |/| | | |||
* | | | Fix build | 2016-01-22 | |
| | | | |||
| * | | made codegen targets in build.yaml | 2016-01-21 | |
| | | | |||
| * | | added missing codegen deps for grp | 2016-01-21 | |
| | | | |||
| * | | Made "codedgen" directories closed over #includes | 2016-01-21 | |
|/ / | |||
| * | re-gend projects | 2016-01-15 | |
|/ | |||
* | Merged from master and resolved merge conflicts | 2016-01-08 | |
| | |||
* | Updated dependencies, fixed a couple of tests | 2016-01-06 | |
| |