Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #2506 from larsonmpdx/gitt | 2015-07-28 | |
|\ | | | | | changes to allow VS solution/project generation and grpc.mak generation for c++ tests | ||
* \ | Merge github.com:grpc/grpc into ↵ | 2015-07-26 | |
|\ \ | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other Conflicts: src/core/iomgr/tcp_server_windows.c | ||
| * \ | Merge branch 'master' into deepend | 2015-07-24 | |
| |\ \ | |||
| * | | | Add dynamic thread pool and initial port of test | 2015-07-23 | |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into ↵ | 2015-07-23 | |
|\ \ \ \ | | |/ / | |/| | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | Merge pull request #2493 from a-veitch/record_stat | 2015-07-23 | |
| |\ \ \ | | | | | | | | | | | Census record stats API | ||
| | | | * | documentation for windows testing using grpc.mak | 2015-07-21 | |
| | | | | | |||
| | * | | | fix build | 2015-07-20 | |
| | | | | | |||
| * | | | | Add ipv4:, ipv6: schemes | 2015-07-20 | |
| | |/ / | |/| | | |||
* | | | | Merge github.com:grpc/grpc into ↵ | 2015-07-20 | |
|\| | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | Merge branch 'decompression' of https://github.com/dgquintas/grpc into ↵ | 2015-07-19 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dgquintas-decompression Conflicts: Makefile vsprojects/Grpc.mak | ||
| | | | * | nmake: continue on error | 2015-07-19 | |
| | | | | | |||
| | | | * | documentation of new vcxproj/.sln debug buildgen | 2015-07-19 | |
| | | | | | |||
| | | | * | new includes / one less warning | 2015-07-19 | |
| | | | | | |||
| | | | * | new .props that has c++ dependencies | 2015-07-19 | |
| | |_|/ | |/| | | |||
* | | | | Merge github.com:grpc/grpc into ↵ | 2015-07-17 | |
|\ \ \ \ | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| | * \ \ | Merge with head and resolve conflict | 2015-07-17 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | | * | rebuild makefile | 2015-07-17 | |
| | | | | | |||
| * | | | | Merge github.com:grpc/grpc into no-worries-i-can-wait | 2015-07-17 | |
| |\ \ \ \ | |||
| | * \ \ \ | Merge with head | 2015-07-16 | |
| | |\ \ \ \ | |||
| | * | | | | | split iterator into its own file | 2015-07-16 | |
| | | |_|_|/ | | |/| | | | |||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-07-16 | |
| | | | | |\ | | | | |_|/ | | | |/| | | |||
* | | | | | | Merge github.com:grpc/grpc into ↵ | 2015-07-16 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | | | Merge pull request #2460 from vjpai/exposed_pool | 2015-07-16 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Make thread_pool.h a public header | ||
* | | | | | | | Added connectivity tests, fixed bugs | 2015-07-16 | |
| | | | | | | | |||
| | * | | | | | Change name of thread_pool files to fixed_size_thread_pool when | 2015-07-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate | ||
* | | | | | | | Client connectivity API | 2015-07-15 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Initial plumbing work; needs tests and more client_channel implementation. | ||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-07-15 | |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Makefile # include/grpc++/client_context.h # include/grpc++/server_context.h # src/cpp/client/client_context.cc # src/cpp/server/server_context.cc # vsprojects/Grpc.mak | ||
* | | | | | | Merge pull request #2383 from vjpai/lockfree-stack | 2015-07-15 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Lockfree stack | ||
| | * | | | | Make thread_pool.h a public header | 2015-07-15 | |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | Rename ThreadPool -> FixedSizeThreadPool to allow for later introduction of DynamicSizeThreadPool | ||
| | | * | | Add oauth2_auth_token test case in interop test | 2015-07-13 | |
| | | | | | |||
| | * | | | Merge github.com:grpc/grpc into no-worries-i-can-wait | 2015-07-13 | |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| | * | | | Introduce a clock type field onto gpr_timespec. | 2015-07-13 | |
| | |/ / | | | | | | | | | | | | | | | | | Use it to validate that arithmetic on time types makes even some vague kind of sense. | ||
* | | | | Merge pull request #2398 from nicolasnoble/we-have-many-solutions-now | 2015-07-11 | |
|\ \ \ \ | | | | | | | | | | | Fixing VS's documentation. | ||
| * | | | | Fixing VS's documentation. | 2015-07-11 | |
| | | | | | | | | | | | | | | | | | | | | The nuget command line tool can't find which solution we want to restore packages on. The documentation needs some update. | ||
* | | | | | Faking tools target for win32. | 2015-07-11 | |
|/ / / / | | | | | | | | | | | | | With run_test.py, we need a tools target now. Let's fake it for Windows so we can at least build. | ||
| * | | | Merge branch 'master' into lockfree-stack | 2015-07-10 | |
| |\ \ \ | |/ / / |/| | | | |||
| * | | | Debug and add in generated build files | 2015-07-10 | |
| | | | | |||
* | | | | Merge pull request #2368 from ctiller/they-gave-me-a-badge | 2015-07-10 | |
|\ \ \ \ | |_|/ / |/| | | | Add a version string and a function to retrieve it | ||
| | * | | Initial checkin commit for lockfree stack. | 2015-07-10 | |
| | | | | | | | | | | | | | | | | Tests not yet included. | ||
| * | | | Add a version string and a function to retrieve it | 2015-07-10 | |
| | | | | |||
* | | | | bumped version of C# | 2015-07-09 | |
| | | | | |||
* | | | | Backport of pull request #2313 into release-0_10. | 2015-07-10 | |
| |/ / |/| | | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-07-09 | |
| | |\ | |_|/ |/| | | |||
| * | | Merge remote-tracking branch 'upstream/master' into security_context2 | 2015-07-09 | |
| |\ \ | |/ / |/| | | |||
* | | | Merge branch 'master' of github.com:grpc/grpc into jwt_verifier | 2015-07-08 | |
|\ \ \ | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-07-08 | |
| | | |\ | | |_|/ | |/| | | |||
| | * | | resolve comments | 2015-07-07 | |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into security_context2 | 2015-07-07 | |
| | |\ \ | | |/ / | |/| | | |||
| | * | | merge with upstream and resolve conflicts | 2015-07-06 | |
| | |\ \ |