aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Use typedefs to avoid triply-nested function templatesGravatar vjpai2015-02-27
|
* Merge remote-tracking branch 'upstream/master'Gravatar vjpai2015-02-27
|\
| * Merge pull request #855 from nathanielmanistaatgoogle/python-test-portGravatar Masood Malekghassemi2015-02-27
| |\ | | | | | | Drop fixed port from python_plugin_test
| * \ Merge pull request #872 from ctiller/portGravatar Vijay Pai2015-02-27
| |\ \ | | | | | | | | Increment 'try' variable
| | * | Fix typoGravatar Craig Tiller2015-02-27
| | | |
| | * | Save makefile var clobberingGravatar Craig Tiller2015-02-27
| | | |
| | * | Save makefile var clobberingGravatar Craig Tiller2015-02-27
| | | |
| | * | Probe compiler settingsGravatar Craig Tiller2015-02-27
| | | |
| | * | Fix commentGravatar Craig Tiller2015-02-27
| | | |
| * | | Merge pull request #862 from jtattermusch/interop_serverGravatar Tim Emiola2015-02-27
| |\ \ \ | | | | | | | | | | Added C# interop server
| | | * \ Merge branch 'master' of github.com:grpc/grpc into portGravatar Craig Tiller2015-02-27
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #861 from murgatroid99/node_package_repo_infoGravatar Tim Emiola2015-02-27
| |\ \ \ \ | | | | | | | | | | | | Added useful information and links to Node's package.json
* | | | | | refresh -> ResetGravatar vjpai2015-02-27
| | | | | |
| | | | * | Merge github.com:grpc/grpc into portGravatar Craig Tiller2015-02-27
| | | | |\ \ | | |_|_|/ / | |/| | | |
* | | | | | Stop abusing operator() overloadingGravatar vjpai2015-02-27
| | | | | |
| | | | * | Extend timeouts for Travis 2xGravatar Craig Tiller2015-02-27
| | | | | |
* | | | | | Move std::bind call out of main loop, change constructor appropriatelyGravatar vjpai2015-02-27
| | | | | |
| * | | | | Merge pull request #873 from jtattermusch/fix_readmeGravatar Michael Lumish2015-02-27
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix typo in README.md
| | | | | * | Allow machine and build type tuning of slowdownGravatar Craig Tiller2015-02-27
| | | | | | |
| | * | | | | Update README.mdGravatar Jan Tattermusch2015-02-27
| | | | | | |
| | | | | * | Make timeout redGravatar Craig Tiller2015-02-27
| | | | | | |
| | | | | * | Increment 'try' variableGravatar Craig Tiller2015-02-27
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | To ensure that we actually probe different ports
* | | | | | <:: -> < ::Gravatar vjpai2015-02-27
| | | | | |
* | | | | | override->GRPC_OVERRIDEGravatar vjpai2015-02-27
| | | | | |
* | | | | | Merge remote-tracking branch 'upstream/master'Gravatar vjpai2015-02-27
|\| | | | |
| * | | | | Merge pull request #871 from eavgerinos/patch-1Gravatar Nicolas Noble2015-02-27
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix typos 'proivde' -> 'provide' and 'e,g.' -> 'e.g.'
| | * | | | | Fix typos 'proivde' -> 'provide' and 'e,g.' -> 'e.g.'Gravatar Aggelos Avgerinos2015-02-27
| |/ / / / /
* | | | | | Merge remote-tracking branch 'upstream/master'Gravatar vjpai2015-02-26
|\| | | | |
| * | | | | Merge pull request #869 from nicolasnoble/macos-make-installGravatar Craig Tiller2015-02-26
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixing make install target for MacOS
| * \ \ \ \ \ Merge pull request #867 from ctiller/timeout2Gravatar Nicolas Noble2015-02-26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Force-kill long running processes
| | | * | | | | Fixing make install target for MacOS - strip -x is the command to use here.Gravatar Nicolas "Pixel" Noble2015-02-27
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #865 from nicolasnoble/flakyGravatar Craig Tiller2015-02-26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Adding flaky attribute for tests.
| | | * | | | | Force-kill long running processesGravatar Craig Tiller2015-02-26
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | To get at least some information on them
| * | | | | | Merge pull request #863 from toddpoynor/pedanticGravatar Craig Tiller2015-02-26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | grpc: cpp_generator: fix pedantic warning on extra ';'
| | | * | | | | Adding flaky attribute for tests.Gravatar Nicolas "Pixel" Noble2015-02-27
| | |/ / / / / | |/| | | | |
| | * | | | | grpc: cpp_generator: fix pedantic warning on extra ';'Gravatar Todd Poynor2015-02-26
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pedantic warnings of form: myprotobuf.pb.cc:619:2: warning: extra ';' [-Wpedantic] }; ^
| * | | | | Merge pull request #860 from nicolasnoble/travis-c++Gravatar Craig Tiller2015-02-26
| |\ \ \ \ \ | | | | | | | | | | | | | | Travis c++
| | | | | * | added C# interop serverGravatar Jan Tattermusch2015-02-26
| | |_|_|/ / | |/| | | |
| | | | * | Added useful information and links to Node's package.jsonGravatar murgatroid992015-02-26
| | |_|/ / | |/| | |
| | * | | Removing python for now.Gravatar Nicolas "Pixel" Noble2015-02-27
| | | | |
| * | | | Merge pull request #859 from nicolasnoble/0_5-extra-commitsGravatar Michael Lumish2015-02-26
| |\ \ \ \ | | | | | | | | | | | | "Upporting" commits from 0.5 into master.
| | * | | | Merge branch 'release-0_5' into 0_5-extra-commitsGravatar Nicolas "Pixel" Noble2015-02-27
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: INSTALL
* | | | | | clang-format all these filesGravatar Vijay Pai2015-02-26
| | | | | |
| | | * | | Use nicos fixGravatar Craig Tiller2015-02-26
| | | | | |
| | | * | | Merge branch 'travis' of github.com:nicolasnoble/grpc into travis-c++Gravatar Craig Tiller2015-02-26
| | | |\ \ \
| | | * | | | Better port pickerGravatar Craig Tiller2015-02-26
| | | | | | |
| | | | * | | Fixing dependency on protobuf for parallel C++ build.Gravatar Nicolas "Pixel" Noble2015-02-27
| | |_|/ / / | |/| | | |
| | | * | | Install virtualenvGravatar Craig Tiller2015-02-26
| | | | | |
| | | * | | Compile protobuf explicitlyGravatar Craig Tiller2015-02-26
| | | | | |
| * | | | | Merge pull request #841 from soltanmm/py-updateGravatar Nathaniel Manista2015-02-26
| |\ \ \ \ \ | | | | | | | | | | | | | | Python code generator fixes.