aboutsummaryrefslogtreecommitdiffhomepage
path: root/package.json
Commit message (Collapse)AuthorAge
* Merge pull request #5257 from ctiller/cleaner-posixGravatar Vijay Pai2016-02-22
|\ | | | | Separate timer checking from pollsets
* | rename census log files to avoid build breakage on MacOSGravatar Alistair Veitch2016-02-22
| |
* | Merge pull request #5302 from nicolasnoble/python-windowsGravatar Masood Malekghassemi2016-02-22
|\ \ | | | | | | Enabling python artifact building for Windows.
| * | Building the dlls.Gravatar Nicolas "Pixel" Noble2016-02-19
| | |
| | * Merge github.com:grpc/grpc into cleaner-posixGravatar Craig Tiller2016-02-18
| | |\ | |_|/ |/| |
* | | Merge github.com:grpc/grpc into sceqGravatar Craig Tiller2016-02-17
|\| |
| * | Merge pull request #5098 from a-veitch/base_logGravatar Bogdan Drutu2016-02-16
| |\ \ | | | | | | | | Add Census base log
| | | * Separate timer checking from pollsetsGravatar Craig Tiller2016-02-16
| | |/ | |/|
| * | Merge remote-tracking branch 'google/release-0_13' into upmerge-from-0.13Gravatar Nicolas "Pixel" Noble2016-02-13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile build.yaml package.json setup.py src/core/surface/version.c src/csharp/Grpc.Core/VersionInfo.cs src/csharp/build_packages.bat src/python/grpcio/grpc_version.py src/ruby/lib/grpc/version.rb tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.c++.internal tools/doxygen/Doxyfile.core tools/doxygen/Doxyfile.core.internal
| | * | Flagging 0.13.1-pre1.Gravatar Nicolas "Pixel" Noble2016-02-13
| | | |
| | * | Flagging the release.Gravatar Nicolas "Pixel" Noble2016-02-13
| | | |
| | * | Ensure we use local node-pre-gyp in Node install hookGravatar murgatroid992016-02-12
| | | |
| * | | Revert "Proto API for LB request/responses"Gravatar Craig Tiller2016-02-11
| | | |
| * | | Merge pull request #4038 from dgquintas/grpclb_apiGravatar Craig Tiller2016-02-11
| |\ \ \ | | | | | | | | | | Proto API for LB request/responses
| | | * | Bundle node-pre-gyp with the node packageGravatar murgatroid992016-02-11
| | | | |
| * | | | Merge pull request #5205 from grpc/release-0_13Gravatar Craig Tiller2016-02-11
| |\ \ \ \ | | | |/ / | | |/| | Release 0.13 upmerge.
| | | | * merge to HEADGravatar Alistair Veitch2016-02-11
| | | | |\ | | |_|_|/ | |/| | |
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_apiGravatar David Garcia Quintas2016-02-11
| | | |\ \ | | |_|/ / | |/| | |
| | * | | Stop explicitly supporting Node 0.10 and 0.11Gravatar murgatroid992016-02-10
| | | | |
* | | | | Merge github.com:grpc/grpc into sceqGravatar Craig Tiller2016-02-09
|\ \ \ \ \
| | * | | | Get compilation working againGravatar Craig Tiller2016-02-09
| | | | | |
| | * | | | Rollback gpr deletionGravatar Craig Tiller2016-02-09
| |/ / / /
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_apiGravatar David Garcia Quintas2016-02-08
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Flagging master as 0.14.0-dev.Gravatar Nicolas "Pixel" Noble2016-02-09
| |/ / /
| * | | Make Node's package.json use the version from build.yamlGravatar murgatroid992016-02-08
| | | |
| | | * mergeGravatar Alistair Veitch2016-02-05
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #5013 from a-veitch/tag_set_to_contextGravatar Bogdan Drutu2016-02-04
| |\ \ \ | | | | | | | | | | Change all instances of census_tag_set to census_context
| | * \ \ mergeGravatar Alistair Veitch2016-02-03
| | |\ \ \
| * | | | | Add new Node JS file to build.yamlGravatar murgatroid992016-02-03
| | |/ / / | |/| | |
| | | | * initial commitGravatar Alistair Veitch2016-02-02
| | | | |
| * | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-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 mergeGravatar Alistair Veitch2016-02-02
| | | | | |
* | | | | | Merge github.com:grpc/grpc into sceqGravatar Craig Tiller2016-02-02
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | | * | | Use old memcpy for wrappersGravatar Craig Tiller2016-02-02
| | |/ / / | |/| | |
| * | | | Merge pull request #4979 from nicolasnoble/win32_subprocessGravatar Craig Tiller2016-02-01
| |\ \ \ \ | | | | | | | | | | | | Adding windows support for gpr subprocesses.
| * \ \ \ \ Merge pull request #4978 from nicolasnoble/alarmingGravatar Craig Tiller2016-01-31
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixing, using and testing alarm code.
| | | | * \ \ Merge branch 'census-placeholders' into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-01-31
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: package.json tools/doxygen/Doxyfile.core.internal
| * | | | | | Actually moving this to the proper place.Gravatar Nicolas "Pixel" Noble2016-01-31
| | | | | | |
| | | | * | | Merge branch 'win32_subprocess' into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-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.Gravatar Nicolas "Pixel" Noble2016-01-31
| | |/ / / / | |/| | | |
| | | * | | Merge branch 'alarming' into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-01-31
| | | |\ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: tools/run_tests/sources_and_headers.json
| | * | | | Fixing, using and testing alarm code.Gravatar Nicolas "Pixel" Noble2016-01-31
| |/ / / /
| | * / / Removing gpr as a separated library.Gravatar Nicolas "Pixel" Noble2016-01-30
| |/ / /
| | | * Merge branch 'master' of github.com:grpc/grpc into grpclb_apiGravatar David Garcia Quintas2016-01-29
| | | |\ | | |_|/ | |/| |
| | | * Merge branch 'master' of github.com:grpc/grpc into grpclb_apiGravatar David Garcia Quintas2016-01-28
| | | |\
* | | | \ Merge github.com:grpc/grpc into sceqGravatar Craig Tiller2016-01-28
|\ \ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfacesGravatar David Garcia Quintas2016-01-27
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' into node_binary_precompileGravatar murgatroid992016-01-26
| |\ \ \ \
| | | * | | async_stream.h done. CompilesGravatar David Garcia Quintas2016-01-25
| | | | | |
| | | * | | Further work. Compiles. WIPGravatar David Garcia Quintas2016-01-25
| | | | | |