Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Use typedefs to avoid triply-nested function templates | 2015-02-27 | |
| | |||
* | Merge remote-tracking branch 'upstream/master' | 2015-02-27 | |
|\ | |||
| * | Merge pull request #855 from nathanielmanistaatgoogle/python-test-port | 2015-02-27 | |
| |\ | | | | | | | Drop fixed port from python_plugin_test | ||
| * \ | Merge pull request #872 from ctiller/port | 2015-02-27 | |
| |\ \ | | | | | | | | | Increment 'try' variable | ||
| | * | | Fix typo | 2015-02-27 | |
| | | | | |||
| | * | | Save makefile var clobbering | 2015-02-27 | |
| | | | | |||
| | * | | Save makefile var clobbering | 2015-02-27 | |
| | | | | |||
| | * | | Probe compiler settings | 2015-02-27 | |
| | | | | |||
| | * | | Fix comment | 2015-02-27 | |
| | | | | |||
| * | | | Merge pull request #862 from jtattermusch/interop_server | 2015-02-27 | |
| |\ \ \ | | | | | | | | | | | Added C# interop server | ||
| | | * \ | Merge branch 'master' of github.com:grpc/grpc into port | 2015-02-27 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #861 from murgatroid99/node_package_repo_info | 2015-02-27 | |
| |\ \ \ \ | | | | | | | | | | | | | Added useful information and links to Node's package.json | ||
* | | | | | | refresh -> Reset | 2015-02-27 | |
| | | | | | | |||
| | | | * | | Merge github.com:grpc/grpc into port | 2015-02-27 | |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
* | | | | | | Stop abusing operator() overloading | 2015-02-27 | |
| | | | | | | |||
| | | | * | | Extend timeouts for Travis 2x | 2015-02-27 | |
| | | | | | | |||
* | | | | | | Move std::bind call out of main loop, change constructor appropriately | 2015-02-27 | |
| | | | | | | |||
| * | | | | | Merge pull request #873 from jtattermusch/fix_readme | 2015-02-27 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix typo in README.md | ||
| | | | | * | | Allow machine and build type tuning of slowdown | 2015-02-27 | |
| | | | | | | | |||
| | * | | | | | Update README.md | 2015-02-27 | |
| | | | | | | | |||
| | | | | * | | Make timeout red | 2015-02-27 | |
| | | | | | | | |||
| | | | | * | | Increment 'try' variable | 2015-02-27 | |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | To ensure that we actually probe different ports | ||
* | | | | | | <:: -> < :: | 2015-02-27 | |
| | | | | | | |||
* | | | | | | override->GRPC_OVERRIDE | 2015-02-27 | |
| | | | | | | |||
* | | | | | | Merge remote-tracking branch 'upstream/master' | 2015-02-27 | |
|\| | | | | | |||
| * | | | | | Merge pull request #871 from eavgerinos/patch-1 | 2015-02-27 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix typos 'proivde' -> 'provide' and 'e,g.' -> 'e.g.' | ||
| | * | | | | | Fix typos 'proivde' -> 'provide' and 'e,g.' -> 'e.g.' | 2015-02-27 | |
| |/ / / / / | |||
* | | | | | | Merge remote-tracking branch 'upstream/master' | 2015-02-26 | |
|\| | | | | | |||
| * | | | | | Merge pull request #869 from nicolasnoble/macos-make-install | 2015-02-26 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fixing make install target for MacOS | ||
| * \ \ \ \ \ | Merge pull request #867 from ctiller/timeout2 | 2015-02-26 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Force-kill long running processes | ||
| | | * | | | | | Fixing make install target for MacOS - strip -x is the command to use here. | 2015-02-27 | |
| | |/ / / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #865 from nicolasnoble/flaky | 2015-02-26 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Adding flaky attribute for tests. | ||
| | | * | | | | | Force-kill long running processes | 2015-02-26 | |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | To get at least some information on them | ||
| * | | | | | | Merge pull request #863 from toddpoynor/pedantic | 2015-02-26 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | grpc: cpp_generator: fix pedantic warning on extra ';' | ||
| | | * | | | | | Adding flaky attribute for tests. | 2015-02-27 | |
| | |/ / / / / | |/| | | | | | |||
| | * | | | | | grpc: cpp_generator: fix pedantic warning on extra ';' | 2015-02-26 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pedantic warnings of form: myprotobuf.pb.cc:619:2: warning: extra ';' [-Wpedantic] }; ^ | ||
| * | | | | | Merge pull request #860 from nicolasnoble/travis-c++ | 2015-02-26 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Travis c++ | ||
| | | | | * | | added C# interop server | 2015-02-26 | |
| | |_|_|/ / | |/| | | | | |||
| | | | * | | Added useful information and links to Node's package.json | 2015-02-26 | |
| | |_|/ / | |/| | | | |||
| | * | | | Removing python for now. | 2015-02-27 | |
| | | | | | |||
| * | | | | Merge pull request #859 from nicolasnoble/0_5-extra-commits | 2015-02-26 | |
| |\ \ \ \ | | | | | | | | | | | | | "Upporting" commits from 0.5 into master. | ||
| | * | | | | Merge branch 'release-0_5' into 0_5-extra-commits | 2015-02-27 | |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: INSTALL | ||
* | | | | | | clang-format all these files | 2015-02-26 | |
| | | | | | | |||
| | | * | | | Use nicos fix | 2015-02-26 | |
| | | | | | | |||
| | | * | | | Merge branch 'travis' of github.com:nicolasnoble/grpc into travis-c++ | 2015-02-26 | |
| | | |\ \ \ | |||
| | | * | | | | Better port picker | 2015-02-26 | |
| | | | | | | | |||
| | | | * | | | Fixing dependency on protobuf for parallel C++ build. | 2015-02-27 | |
| | |_|/ / / | |/| | | | | |||
| | | * | | | Install virtualenv | 2015-02-26 | |
| | | | | | | |||
| | | * | | | Compile protobuf explicitly | 2015-02-26 | |
| | | | | | | |||
| * | | | | | Merge pull request #841 from soltanmm/py-update | 2015-02-26 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Python code generator fixes. |