Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | | | | Windows fix | 2015-08-06 | ||
| | * | | | | | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | 2015-08-06 | ||
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||
| * | | | | | | | | | | Merge pull request #2800 from ctiller/reduce-mac-load | 2015-08-06 | ||
| |\ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | * \ \ \ | Merge github.com:grpc/grpc into selective-town | 2015-08-06 | ||
| | | | | | | | |\ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||
| | | | | | | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-06 | ||
| | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||
| | | | | | | * | | | | | Regenerated Makefile | 2015-08-06 | ||
| | | | | | | |\ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | Merge pull request #2750 from ctiller/propagate | 2015-08-06 | ||
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||
| | | | | | | * | | | | | Regenerated project files | 2015-08-06 | ||
| | | | | | | |\ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | Merge pull request #2396 from nicolasnoble/win32-is-an-os-too | 2015-08-05 | ||
| |\ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2781 from yang-g/stuboptions | 2015-08-05 | ||
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | * \ \ \ \ \ \ \ | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | 2015-08-05 | ||
| | | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | Merge branch 'propagate' into reduce-mac-load | 2015-08-05 | ||
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #2801 from ctiller/shrinkify-the-bytes | 2015-08-05 | ||
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | | | * \ \ | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-05 | ||
| | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | ||||
| | | | | | | | | | | * | | | | Bikeshedding | 2015-08-05 | ||
| | | | | * | | | | | | | | | | Merge github.com:grpc/grpc into propagate | 2015-08-05 | ||
| | | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitter | 2015-08-05 | ||
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2713 from ctiller/plucking-hell | 2015-08-05 | ||
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | | | | | * \ \ | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-05 | ||
| | | | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into stuboptions | 2015-08-05 | ||
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into reconnect_branch_based_on... | 2015-08-05 | ||
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | Initial Doxygen import for core, c++ | 2015-08-05 | ||
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||
| | | | | | | * | | | | | | | | | Merge branch 'propagate' into reduce-mac-load | 2015-08-05 | ||
| | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / | | | | | | |/| | | | | | | | | | ||||
| | | | | | * | | | | | | | | | | Merge github.com:grpc/grpc into propagate | 2015-08-05 | ||
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||
| | | | | | | * | | | | | | | | | Fix typo | 2015-08-05 | ||
| | | | | | | * | | | | | | | | | Add linux, mac as test platforms, only run _with_poll tests on linux | 2015-08-05 | ||
| | | | | | |/ / / / / / / / / | ||||
| | | | | | | | | | | * / / / | Give make a long timeout, tests a small one, and interop a slightly longer one | 2015-08-05 | ||
| | | | | | | | |_|_|/ / / / | | | | | | | |/| | | | | | | ||||
| | | | | | | * | | | | | | | Rework restart facility to be more portable | 2015-08-05 | ||
| | | | | | | * | | | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | 2015-08-05 | ||
| | | | | | | |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | merge with upstream/master | 2015-08-04 | ||
|\| | | | | | | | | | | | | | ||||
| | | | | | | | | | | * | | | Update zookeeper in docker file again | 2015-08-04 | ||
| | | | | * | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into win32-is-an-os-too | 2015-08-05 | ||
| | | | | |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | Move Python protoc plugin tests to grpcio_test | 2015-08-04 | ||
| * | | | | | | | | | | | | | Merge pull request #2748 from soltanmm/whats-up-doc | 2015-08-04 | ||
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2346 from jboeuf/upgrade-openssl-1.0.2d | 2015-08-04 | ||
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2757 from jtattermusch/runtest_polishing | 2015-08-04 | ||
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | * | | | | | | | Testing port server | 2015-08-04 | ||
| | | | | | | | | | | | | | * | | | Update zookeeper in docker again | 2015-08-04 | ||
| * | | | | | | | | | | | | | | | | add HealthCheck tests to run_tests.py | 2015-08-04 | ||
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | * | | | Update zookeeper dependencies in docker file | 2015-08-04 | ||
| | | | | * | | | | | | | | | | | Merge github.com:grpc/grpc into plucking-hell | 2015-08-04 | ||
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | | | Add proxy tests to end2end suite | 2015-08-04 | ||
| | | | | | | | | | | | | * | | | Add zookeeper dependencies in jenkins dockerfile | 2015-08-03 | ||
| | | | | | | * | | | | | | | | | Add StubOptions | 2015-08-03 | ||
| | | | | | | | |_|_|/ / / / / | | | | | | | |/| | | | | | | | ||||
| * | | | | | / | | | | | | | | Adding a sanity check that the cached makefile variables aren't committed. | 2015-08-04 | ||
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | ||||
| | | | | | | | | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-03 | ||
| | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||
| | | | | | * | | | | | | | | merge with head and resolve conflicts | 2015-08-03 | ||
| | | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #2737 from jtattermusch/enable_new_interop_tests | 2015-08-03 | ||
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | polishing runtests | 2015-08-01 | ||
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||
| | | | | * | | | | | | | | Merge github.com:grpc/grpc into plucking-hell | 2015-08-01 | ||
| | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |