Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | Merge branch 'master' of github.com:grpc/grpc into the-purge-2 | Nicolas "Pixel" Noble | 2015-04-24 | |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: include/grpc++/completion_queue.h | |||
| | * | | Add the new header to build.json and regenerate projects | Yang Gao | 2015-04-24 | |
| | | | | ||||
* | | | | Merge github.com:grpc/grpc into one-pass | Craig Tiller | 2015-04-23 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: Makefile | |||
| | * | | Merge branch 'master' of github.com:grpc/grpc into the-purge-2 | Nicolas "Pixel" Noble | 2015-04-24 | |
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/cpp/client/channel.cc vsprojects/vs2010/grpc++.vcxproj vsprojects/vs2013/grpc++.vcxproj.filters | |||
| | | * | Merge branch 'master' of https://github.com/grpc/grpc | zeliard | 2015-04-23 | |
| | | |\ | ||||
| | | * | | add nuget info | zeliard | 2015-04-23 | |
| | | | | | ||||
| * | | | | More work in not having to compile OpenSSL. | Nicolas "Pixel" Noble | 2015-04-23 | |
| | |_|/ | |/| | | ||||
* | | | | Merge github.com:google/grpc into one-pass | Craig Tiller | 2015-04-22 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: vsprojects/vs2010/grpc.vcxproj vsprojects/vs2010/grpc.vcxproj.filters vsprojects/vs2010/grpc_unsecure.vcxproj vsprojects/vs2010/grpc_unsecure.vcxproj.filters | |||
| * | | | Post merge cleanup. | Nicolas "Pixel" Noble | 2015-04-23 | |
| | | | | ||||
* | | | | Merge github.com:grpc/grpc into one-pass | Craig Tiller | 2015-04-22 | |
|\| | | | ||||
| * | | | Merge github.com:google/grpc into batch-metadata | Craig Tiller | 2015-04-22 | |
| |\ \ \ | ||||
* | | | | | Merge branch 'batch-metadata' of github.com:ctiller/grpc into one-pass | Craig Tiller | 2015-04-22 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/channel/http_client_filter.c src/core/channel/http_server_filter.c | |||
| | | | * | fix MSVC solution build-able on x64 mode (remove _USE_32BIT_TIME_T) | zeliard | 2015-04-22 | |
| | | |/ | | |/| | ||||
* | | | | stuff | Craig Tiller | 2015-04-21 | |
| | | | | ||||
| * | | | Merge github.com:google/grpc into batch-metadata | Craig Tiller | 2015-04-21 | |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile vsprojects/Grpc.mak vsprojects/vs2010/Grpc.mak vsprojects/vs2010/grpc.vcxproj vsprojects/vs2010/grpc.vcxproj.filters vsprojects/vs2010/grpc_test_util.vcxproj vsprojects/vs2010/grpc_unsecure.vcxproj vsprojects/vs2010/grpc_unsecure.vcxproj.filters | |||
| | * | | enabling creation of nuget package for grpc_csharp_ext | Jan Tattermusch | 2015-04-20 | |
| | | | | ||||
| | * | | fix typo in vcxproj template | Jan Tattermusch | 2015-04-20 | |
| |/ / | ||||
| * | | fixed grammar in readme | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | tiny fixups | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | fixes to Grpc.mak | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | updated README | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | allow building vcxproj files separately using msbuild | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | fixes to run_tests.py to at least start building tests on Windows | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | updated version of nuget packages used in Grpc.mak | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | regenerated Grpc.mak | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | remove what's left from vs2010 and vs2013 directories | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | small fixes in README.md | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | start using grpc.dependencies.openssl and grpc.dependencies.zlib nuget packages | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | regenerated project files | Jan Tattermusch | 2015-04-20 | |
| | | | ||||
| * | | big refactoring of visual studio projects, started using nuget | Jan Tattermusch | 2015-04-20 | |
| | | | | | | | | | | | | dependencies. | |||
* | | | Merge github.com:grpc/grpc into batch-metadata | Craig Tiller | 2015-04-20 | |
|\| | | ||||
| * | | Refactoring of core security to remove the factories. | Julien Boeuf | 2015-04-17 | |
| | | | | | | | | | | | | | | | - Renamed security_context -> security_connector. - Credentials are now responsible for creating their own connectors. | |||
* | | | Kill transport end2end tests: not useful | Craig Tiller | 2015-04-16 | |
| | | | ||||
* | | | Switching to batch oriented metadata passing | Craig Tiller | 2015-04-16 | |
|/ / | ||||
* | | Merge branch 'master' of git://github.com/vjpai/grpc into timers | Vijay Pai | 2015-04-13 | |
|\ \ | ||||
* | | | Visual Studio build files | Vijay Pai | 2015-04-13 | |
| | | | ||||
| * | | Update build files | Craig Tiller | 2015-04-13 | |
| | | | ||||
| * | | Merge github.com:grpc/grpc into windows-fixes | Craig Tiller | 2015-04-13 | |
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: BUILD src/core/iomgr/tcp_server.h src/core/iomgr/tcp_server_posix.c src/core/iomgr/tcp_server_windows.c src/core/security/server_secure_chttp2.c src/core/surface/completion_queue.c src/core/surface/completion_queue.h src/core/surface/server.c test/core/end2end/tests/cancel_after_invoke.c test/core/end2end/tests/cancel_test_helpers.h tools/run_tests/tests.json vsprojects/vs2013/Grpc.mak | |||
* | | | Merge pull request #1249 from ctiller/tls | Nicolas Noble | 2015-04-10 | |
|\ \ \ | | | | | | | | | Thread local storage for grpc | |||
| | | * | Merge branch 'master' of https://github.com/grpc/grpc into the-purge-2 | Nicolas "Pixel" Noble | 2015-04-11 | |
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Conflicts: test/cpp/end2end/async_end2end_test.cc test/cpp/end2end/end2end_test.cc test/cpp/interop/client.cc | |||
| | | * | Adjusting build.json. | Nicolas "Pixel" Noble | 2015-04-11 | |
| | | | | ||||
* | | | | Add missing public headers | Yang Gao | 2015-04-10 | |
| | | | | ||||
| * | | | Thread local storage for grpc | Craig Tiller | 2015-04-10 | |
| | |/ | |/| | ||||
* / | | Have the secure credentials in separate header files. | Julien Boeuf | 2015-04-09 | |
|/ / | ||||
| * | Begin port selection code for windows | Craig Tiller | 2015-04-08 | |
| | | ||||
| * | Dont build uninteresting tests on Windows | Craig Tiller | 2015-04-08 | |
| | | ||||
| * | Add endpoint_pair_windows.c | Craig Tiller | 2015-04-08 | |
| | | ||||
| * | Ensure OUT_DIR created | Craig Tiller | 2015-04-08 | |
| | | ||||
| * | Make Grpc.mak more useful for run_tests.py | Craig Tiller | 2015-04-08 | |
| | | ||||
* | | Merge branch 'master' of github.com:google/grpc into the-purge | Nicolas "Pixel" Noble | 2015-04-06 | |
|\ \ |