Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | master bumped to 1.5.x | 2017-05-30 | |
| | |||
* | Upmerge from v1.3.x branch to master | 2017-05-17 | |
|\ | |||
| * | Bump to version 1.3.3 | 2017-05-16 | |
| | | |||
| * | Bump to version 1.3.2 | 2017-05-10 | |
| | | |||
| * | Bump to 1.3.2-pre1 | 2017-05-09 | |
| | | |||
| * | Update version to 1.3.1 | 2017-05-04 | |
| | | |||
| * | Switch Protobuf.js dependency back to version 5 | 2017-05-02 | |
| | | |||
* | | Merge branch 'v1.3.x' into master-upmerge-v1.3.x | 2017-04-28 | |
|\ \ | |||
| | * | 1.3.0 -> 1.3.1-pre1 | 2017-04-27 | |
| | | | |||
| | * | s/1.3.0-pre/1.3.0 | 2017-04-27 | |
| | | | |||
| | * | Revert "Merge branch 'master' into v1.3.x" | 2017-04-26 | |
| | | | | | | | | | | | | | | | This reverts commit 79759fea1abd09102d38af3e13a84b69e898124b, reversing changes made to dc36f4df6aba60275a31227e1d29c4d20b6cadca. | ||
| | * | Merge branch 'master' into v1.3.x | 2017-04-25 | |
| |/| | |/ |/| | |||
| * | Node: Don't depend on cares npm package | 2017-04-19 | |
| | | |||
* | | master to 1.4.0-dev | 2017-04-13 | |
| | | |||
| * | 1.3.x branch cut | 2017-04-13 | |
|/ | |||
* | Fix serializer error handling, update ProtoBuf.js dependency | 2017-04-03 | |
| | |||
* | Merge branch 'master' into node_protobuf_js_6_upgrade | 2017-04-03 | |
|\ | |||
| * | Merge pull request #7771 from y-zeng/cares_buildin | 2017-03-24 | |
| |\ | | | | | | | Async DNS resolver with pre-configured c-ares | ||
* | | | Merge branch 'master' into node_protobuf_js_6_upgrade | 2017-03-24 | |
|\| | | |||
| * | | Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0 | 2017-03-24 | |
| |\ \ | |||
| | * | | bump v1.2.x branch to 1.2.1-pre1 | 2017-03-20 | |
| | | | | |||
| | * | | Going for 1.2.0 | 2017-03-20 | |
| | | | | |||
| | | * | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | 2017-03-17 | |
| | | |\ | | |_|/ | |/| | | |||
* / | | | Upgrade Node dependency on Protobuf.js to version 6 | 2017-03-17 | |
|/ / / | |||
| * | | Bump 1.2.x version to pre-2 | 2017-03-16 | |
| | | | |||
| * | | Drop support for io.js, fix minor issue with node extension | 2017-03-14 | |
| | | | |||
| * | | Introducing 1.2.0-pre1 | 2017-03-09 | |
| | | | |||
* | | | Bumped version to 1.3.0-dev | 2017-03-09 | |
|/ / | |||
| * | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | 2017-02-01 | |
| |\ | |/ |/| | |||
* | | Bump master version numbers | 2017-01-30 | |
| | | |||
| * | Merge remote-tracking branch 'upstream/master' into cares_buildin | 2017-01-18 | |
| |\ | |/ |/| | |||
* | | Merge branch 'master' into node_electron_build | 2017-01-13 | |
|\ \ | |||
| * | | Update package.json with version compatibility changes | 2016-11-29 | |
| | | | |||
* | | | Merge branch 'master' into node_electron_build | 2016-11-01 | |
|\| | | |||
* | | | Add test scripts for electron | 2016-11-01 | |
| | | | |||
| | * | Merge remote-tracking branch 'upstream/master' into cares_buildin | 2016-10-28 | |
| | |\ | | |/ | |/| | |||
| * | | Merge remote-tracking branch 'upstream/v1.0.x' into v1.0.1_upmerge | 2016-10-28 | |
| |\ \ | |||
| | * | | Going 1.0.1. | 2016-10-26 | |
| | | | | |||
| * | | | Sanitize | 2016-10-24 | |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/v1.0.x' into node_package_updates | 2016-10-24 | |
| | |\ \ | |||
| * | | | | Fix issues with express benchmark and synchronize package.json with template | 2016-10-18 | |
| | | | | | |||
| * | | | | Create benchmark client and server for Node Express | 2016-10-18 | |
|/ / / / | |||
| | | * | Merge remote-tracking branch 'upstream/master' into cares_buildin | 2016-08-24 | |
| | | |\ | |_|_|/ |/| | | | |||
| | | * | Use cares package in node | 2016-08-22 | |
| | | | | |||
| | * | | Bumping version to 1.0.1-pre1. | 2016-08-18 | |
| | | | | |||
| | | * | Fix python build on windows | 2016-08-16 | |
| | | | | |||
| | * | | Removing pre2 flag. | 2016-08-16 | |
| | | | | |||
* | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | 2016-08-16 | |
|\ \ \ \ | | |/ / | |/| | | |||
| | * | | Update Node library dependencies and change deprecated function calls | 2016-08-15 | |
| |/ / | |||
| | * | Fix node test | 2016-08-10 | |
| |/ |/| |