aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Collapse)AuthorAge
* Merge pull request #1227 from nicolasnoble/the-purge-2Gravatar Craig Tiller2015-04-24
|\ | | | | Refactoring std::chrono out.
* \ Merge pull request #1368 from dgquintas/mkfile_proto_cmd_fixGravatar Nicolas Noble2015-04-24
|\ \ | | | | | | Renamed make variables for protoc presence and version checking.
* \ \ Merge pull request #1366 from ctiller/mwhaGravatar Nicolas Noble2015-04-24
|\ \ \ | | | | | | | | A little Makefile spring cleaning
| | * | Renamed make variables for protoc presence and version checking.Gravatar David Garcia Quintas2015-04-24
| |/ / |/| |
| * | CleanupGravatar Craig Tiller2015-04-24
| | |
| * | Actually remove themGravatar Craig Tiller2015-04-24
| | |
| * | Remove some useless lines in the MakefileGravatar Craig Tiller2015-04-24
| | |
| | * Merge branch 'master' of github.com:grpc/grpc into the-purge-2Gravatar Nicolas "Pixel" Noble2015-04-24
| | |\ | |_|/ |/| | | | | | | | Conflicts: include/grpc++/completion_queue.h
* | | Add the new header to build.json and regenerate projectsGravatar Yang Gao2015-04-24
|/ /
| * Merge branch 'master' of github.com:grpc/grpc into the-purge-2Gravatar Nicolas "Pixel" Noble2015-04-24
| |\ | |/ |/| | | | | | | | | Conflicts: src/cpp/client/channel.cc vsprojects/vs2010/grpc++.vcxproj vsprojects/vs2013/grpc++.vcxproj.filters
* | More work in not having to compile OpenSSL.Gravatar Nicolas "Pixel" Noble2015-04-23
| |
* | Making sure we don't require OpenSSL for tests that, in fact, don't need it.Gravatar Nicolas "Pixel" Noble2015-04-23
| |
* | Merge github.com:google/grpc into batch-metadataGravatar Craig Tiller2015-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
| * | Adding a helpful warning message on top of the Makefile and BUILD file.Gravatar Nicolas "Pixel" Noble2015-04-21
| | |
| * | Run capable test suites against grpc_unsecureGravatar Craig Tiller2015-04-20
| | |
* | | Merge github.com:grpc/grpc into batch-metadataGravatar Craig Tiller2015-04-20
|\| |
| * | Refactoring of core security to remove the factories.Gravatar Julien Boeuf2015-04-17
| | | | | | | | | | | | | | | - Renamed security_context -> security_connector. - Credentials are now responsible for creating their own connectors.
| * | Move .proto files up for reuseGravatar Abhishek Kumar2015-04-16
| | |
| * | Moving test.proto to an outer directory so others can depend on it.Gravatar Abhishek Kumar2015-04-16
| | |
| * | Merge pull request #1291 from yang-g/headersGravatar Nicolas Noble2015-04-16
| |\ \ | | | | | | | | Wrap ParseCommandLineFlags in InitTest
* | | | Kill transport end2end tests: not usefulGravatar Craig Tiller2015-04-16
| | | |
* | | | Switching to batch oriented metadata passingGravatar Craig Tiller2015-04-16
|/ / /
* | | Introduce ahead-of-time registration of (method,host) pairsGravatar Craig Tiller2015-04-16
| | |
| * | Wrap ParseCommandLineFlags in InitTestGravatar Yang Gao2015-04-15
|/ /
* | sync and resolve conflictGravatar Yang Gao2015-04-15
|\ \
* | | Remove outdated protosGravatar Yang Gao2015-04-15
| | |
| * | Merge pull request #1267 from vjpai/timersGravatar Craig Tiller2015-04-14
| |\ \ | | | | | | | | Infrastructure for timer insertion, logging, and testing
| * \ \ Merge pull request #1241 from ctiller/local_workerGravatar Vijay Pai2015-04-14
| |\ \ \ | | | | | | | | | | Allow RunScenarios to spawn in-process workers
| * \ \ \ Merge pull request #1272 from yang-g/interopGravatar Nicolas Noble2015-04-13
| |\ \ \ \ | |/ / / / |/| | | | Further refactor interop_client and server to libraries
* | | | | Further refactor interop_client and server to librariesGravatar Yang Gao2015-04-13
| | | | |
| | | * | Merge branch 'master' of git://github.com/vjpai/grpc into timersGravatar Vijay Pai2015-04-13
| | | |\ \
| | | | * \ Merge remote-tracking branch 'upstream/master'Gravatar Vijay Pai2015-04-13
| | | | |\ \ | | |_|_|/ / | |/| | | |
| | | * | | Allow a build config called CONFIG=latprof that defines the appropriateGravatar Vijay Pai2015-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables to set up the GRPC_LATENCY_PROFILER preprocessor macro so that timing actually takes place.
| | | * | | Move files to a new "profiling" directory to better distinguish from censusGravatar Vijay Pai2015-04-13
| | | |/ / | | | | | | | | | | | | | | | statistics
| * | | | Merge github.com:grpc/grpc into windows-fixesGravatar Craig Tiller2015-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 remote-tracking branch 'upstream/master'Gravatar Vijay Pai2015-04-13
| | | |\ \ | |_|_|/ / |/| | | |
| | | * | Merge branch 'timers' of https://github.com/vjpai/grpc into vjpai-timersGravatar Vijay Pai2015-04-13
| | | |\ \
| | | | * | Infrastructure for timer insertion, logging, and testing.Gravatar Vijay Pai2015-04-13
| | | | | |
* | | | | | Merge pull request #1249 from ctiller/tlsGravatar Nicolas Noble2015-04-10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Thread local storage for grpc
| | | | | * Merge branch 'master' of https://github.com/grpc/grpc into the-purge-2Gravatar Nicolas "Pixel" Noble2015-04-11
| | | | | |\ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/cpp/end2end/async_end2end_test.cc test/cpp/end2end/end2end_test.cc test/cpp/interop/client.cc
| | | | | * Adjusting build.json.Gravatar Nicolas "Pixel" Noble2015-04-11
| | | | | |
| | | * | | Merge github.com:grpc/grpc into local_workerGravatar Craig Tiller2015-04-10
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #1244 from yang-g/interopGravatar Nicolas Noble2015-04-10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Split interop client and server into components
* | | | | | | Add missing public headersGravatar Yang Gao2015-04-10
| | | | | | |
* | | | | | | Merge pull request #1240 from ctiller/qpsGravatar Vijay Pai2015-04-10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Define a smoke test for performance work, fix some bugs
| | | * | | | | Thread local storage for grpcGravatar Craig Tiller2015-04-10
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master' into interopGravatar Yang Gao2015-04-10
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1246 from tbetbetbe/grpc_tools_makefile_update_install_lnsGravatar Michael Lumish2015-04-10
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Fixes the Makefile template to link .so.<MAJOR_VERSION>
| * | | | | | | Fixes the Makefile template to link .so.<MAJOR_VERSION>Gravatar Tim Emiola2015-04-10
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This resolves a blocker stopping a clean linuxbrew install to work with one of the wrapped libraries.
| | | | | * | Merge branch 'qps' into local_workerGravatar Craig Tiller2015-04-10
| | | | | |\ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile build.json test/cpp/qps/worker.cc