aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Resolved merge conflictsGravatar murgatroid992015-02-23
|\
* | Added pubsub demo clientGravatar murgatroid992015-02-23
| * Merge pull request #715 from tbetbetbe/grpc-ruby-fix-interop-clientGravatar Tim Emiola2015-02-23
| |\
| | * Fixes a missed old module name reference in the interop clientGravatar Tim Emiola2015-02-23
| * | Merge pull request #713 from nmittler/route_guide_packageGravatar Tim Emiola2015-02-22
| |\ \
| | * | Fixing java package for route_guide.protoGravatar nmittler2015-02-22
| |/ /
| * | Merge pull request #709 from nathanielmanistaatgoogle/thread-pool-less-linksGravatar Masood Malekghassemi2015-02-22
| |\ \
| * \ \ Merge pull request #678 from jboeuf/installed_ssl_rootsGravatar Craig Tiller2015-02-21
| |\ \ \
| | * | | Actually installing root certificates on the system.Gravatar Nicolas "Pixel" Noble2015-02-22
| | * | | Merge branch 'master' of github.com:google/grpc into installed_ssl_roots-patchGravatar Nicolas "Pixel" Noble2015-02-22
| | |\ \ \ | | |/ / / | |/| | |
| | | * | Thread-pool-less construction of GRPC links.Gravatar Nathaniel Manista2015-02-22
| | |/ / | |/| |
| * | | Merge pull request #708 from jtattermusch/deb_on_dockerGravatar donnadionne2015-02-21
| |\ \ \
| | * | | Dockerfile to test that debian packages can be used with ruby instead of make...Gravatar Jan Tattermusch2015-02-21
| | * | | Dockerfile to build debian packages on dockerGravatar Jan Tattermusch2015-02-21
| | * | | Fixes to build_deb_packages script to allow running on DockerGravatar Jan Tattermusch2015-02-21
| * | | | Merge pull request #704 from ctiller/interop3Gravatar Yang Gao2015-02-21
| |\ \ \ \
| * \ \ \ \ Merge pull request #707 from nicolasnoble/contribGravatar Abhishek Kumar2015-02-21
| |\ \ \ \ \
| | * | | | | Adding a CONTRIBUTING file.Gravatar Nicolas "Pixel" Noble2015-02-21
| * | | | | | Merge pull request #706 from nicolasnoble/regenGravatar Craig Tiller2015-02-21
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Re-generated project files.Gravatar Nicolas "Pixel" Noble2015-02-21
| |/ / / / /
| * | | | | Merge pull request #705 from ctiller/fd_shutdownGravatar Nicolas Noble2015-02-21
| |\ \ \ \ \
| | * | | | | Fix a double-close in the server code.Gravatar Craig Tiller2015-02-21
| * | | | | | Merge pull request #703 from nicolasnoble/win32Gravatar Craig Tiller2015-02-21
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | | * | | | Rename interop_test.c --> interop_test.ccGravatar Craig Tiller2015-02-21
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #641 from jboeuf/jwt_id_tokenGravatar Yang Gao2015-02-21
| |\ \ \ \ \
| | | * | | | Factorizing out function split_host_port.Gravatar Nicolas "Pixel" Noble2015-02-20
| | | * | | | Merge branch 'master' of github.com:google/grpc into win32Gravatar Nicolas "Pixel" Noble2015-02-21
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | | * | | | Fixing Windows port.Gravatar Nicolas "Pixel" Noble2015-02-20
| * | | | | | Merge pull request #701 from ctiller/mac3Gravatar Nicolas Noble2015-02-20
| |\ \ \ \ \ \
| | * | | | | | Check POLLHUP, POLLERR as requiredGravatar Craig Tiller2015-02-20
| | * | | | | | sockaddr_un needs the null terminator included in the address lengthGravatar Craig Tiller2015-02-20
| * | | | | | | Merge pull request #699 from ctiller/mac3Gravatar Nicolas Noble2015-02-20
| |\| | | | | |
| | * | | | | | Fix in tree build of protobufGravatar Craig Tiller2015-02-20
| |/ / / / / /
| * | | | | | Merge pull request #698 from nicolasnoble/verify-installGravatar Craig Tiller2015-02-20
| |\ \ \ \ \ \
| | * | | | | | Adding a helpful installation message about protobuf.Gravatar Nicolas "Pixel" Noble2015-02-21
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #697 from ctiller/mac2Gravatar Nicolas Noble2015-02-20
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | This magically fixes the C build on my MacGravatar Craig Tiller2015-02-20
| |/ / / / /
| * | | | | Merge pull request #692 from soltanmm/py-protoc-plugin-test-fixedGravatar Nathaniel Manista2015-02-20
| |\ \ \ \ \
| | * | | | | Added compiler plugin test for Python.Gravatar Masood Malekghassemi2015-02-20
| * | | | | | Merge pull request #693 from nicolasnoble/regen-makefileGravatar Jan Tattermusch2015-02-20
| |\ \ \ \ \ \
| | * | | | | | Regenerated outdated Makefile.Gravatar Nicolas "Pixel" Noble2015-02-21
| |/ / / / / /
| * | | | | | Merge pull request #601 from murgatroid99/node_route_guide_sampleGravatar Tim Emiola2015-02-20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #690 from ctiller/mac2Gravatar Nicolas Noble2015-02-20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #684 from jtattermusch/dockerfile_fixesGravatar Tim Emiola2015-02-20
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge pull request #689 from nicolasnoble/macos-fixGravatar Craig Tiller2015-02-20
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #687 from nicolasnoble/no-install-protobufGravatar Craig Tiller2015-02-20
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #688 from nicolasnoble/local-protobuf-buildGravatar Craig Tiller2015-02-20
| |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | Fix in tree build of openssl on macGravatar Craig Tiller2015-02-20
| | | * | | | | | | | | Let's not install our potentially broken version of protobuf onto the system ...Gravatar Nicolas "Pixel" Noble2015-02-21
| | * | | | | | | | | | Force compilation of protobuf using -fPIC.Gravatar Nicolas "Pixel" Noble2015-02-21
| | |/ / / / / / / / /