Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into naming-crisis | 2016-02-23 | |
|\ | |||
| * | Merge github.com:grpc/grpc into fix-proto-docker | 2016-02-22 | |
| |\ | |||
* | \ | Regenerate files, fix bugs | 2016-02-22 | |
|\ \ \ | | |/ | |/| | |||
| * | | rename census log files to avoid build breakage on MacOS | 2016-02-22 | |
|/ / | |||
* | | Merge pull request #5302 from nicolasnoble/python-windows | 2016-02-22 | |
|\ \ | | | | | | | Enabling python artifact building for Windows. | ||
| * | | Building the dlls. | 2016-02-19 | |
| | | | |||
| | * | Merge github.com:grpc/grpc into fix-proto-docker | 2016-02-18 | |
| | |\ | |_|/ |/| | | |||
* | | | 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 | ||
| | | * | Revert "Revert "Proto API for LB request/responses"" | 2016-02-11 | |
| | | | | |||
| | | * | Revert "Proto API for LB request/responses" | 2016-02-11 | |
| | | | | |||
| | * | | merge to HEAD | 2016-02-11 | |
| | |\ \ | |||
| * | \ \ | Merge github.com:grpc/grpc into compatibility_mode | 2016-02-11 | |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-02-11 | |
| | | | |\ | | | |_|/ | | |/| | | |||
* | | | | | 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 | |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | * | | merge | 2016-02-05 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | Make binary compatibility not the default | 2016-02-04 | |
| |/ / / | |||
| * | | | Merge pull request #5013 from a-veitch/tag_set_to_context | 2016-02-04 | |
| |\ \ \ | | | | | | | | | | | Change all instances of census_tag_set to census_context | ||
| * \ \ \ | Merged from master | 2016-02-03 | |
| |\ \ \ \ | |||
| * | | | | | Add working Node artifact builder for all platforms | 2016-02-03 | |
| | | | | | | |||
| | | * | | | 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 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Fixed windows build warning | 2016-01-28 | |
| | | | | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-01-28 | |
| | | |\ | |||
| * | | | | Update template, add comment and message about Windows build | 2016-01-28 | |
| | | | | | |||
* | | | | | Merge github.com:grpc/grpc into sceq | 2016-01-28 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| | * | | | Make Node library build on Windows | 2016-01-27 | |
| |/ / / | |||
| * | | | Merge branch 'master' into node_binary_precompile | 2016-01-26 | |
| |\ \ \ | |||
| | * | | | Make Node library depend on BoringSSL and zlib, and only build them under ↵ | 2016-01-25 | |
| | |/ / | | | | | | | | | | | | | Windows | ||
* | | | | Merge github.com:grpc/grpc into sceq | 2016-01-22 | |
|\ \ \ \ | | |/ / | |/| | | |||
| | * | | Update copyright in binding.gyp | 2016-01-20 | |
| | | | | |||
| | * | | Completed integration of node-pre-gyp into Node library | 2016-01-20 | |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into sceq | 2016-01-15 | |
|\ \ \ \ | | |/ / | |/| | |