Commit Graph

223 Commits

Author SHA1 Message Date
Yang Gao 3d3d632d72 merge with head 2015-05-04 13:54:11 -07:00
Yang Gao 26839c7da9 Add a c test for max message length 2015-05-04 13:49:38 -07:00
Craig Tiller 434a36bf4a Add test for >16777215 sequence numbered streams 2015-05-04 09:49:22 -07:00
Nicolas "Pixel" Noble df3c6c55b0 Adding property sheets for OpenSSL and zlib's NuGet packages. 2015-05-02 00:07:59 -07:00
Craig Tiller 26dfbb2d15 Merge branch 'fix-windows-tests' into delete-the-old-api 2015-04-30 14:13:29 -07:00
Craig Tiller 74bbc41175 Ensure all unsecure tests are built on Windows 2015-04-30 14:11:11 -07:00
Craig Tiller 48373dfab0 Merge github.com:grpc/grpc into delete-the-old-api 2015-04-30 13:25:11 -07:00
Craig Tiller 0ced984233 Kill echo test 2015-04-29 15:02:07 -07:00
David Garcia Quintas 5f9f455682 Merge remote-tracking branch 'upstream/master' into stap 2015-04-29 14:35:49 -07:00
David Garcia Quintas 45d54e4581 Merge remote-tracking branch 'upstream/master' into stap 2015-04-29 09:48:43 -07:00
David Garcia Quintas 8954e90b72 Integration of Systemtap (STAP) for profiling.
This commit includes a faulty Makefile to be fixed in a follow commit.
2015-04-29 09:46:33 -07:00
Craig Tiller a0f666aeba Merge github.com:grpc/grpc into delete-the-old-api
Conflicts:
	include/grpc++/channel_interface.h
2015-04-28 17:17:31 -07:00
Craig Tiller 4354a8eb28 Merge github.com:grpc/grpc into one-pass 2015-04-28 16:55:49 -07:00
Nicolas "Pixel" Noble 5fb4ba0adb Updating the templates to create win64 projects. 2015-04-28 00:20:06 +02:00
zeliard 8ff24593f8 add Windows x64 (WIN64) mode and make buildable on MSVC 2015-04-27 15:26:32 +09:00
zeliard 179be50ad3 merge VS solutions file from upstream master 2015-04-27 14:52:00 +09:00
zeliard 04ddd8c524 fix expression bug on socket creation failure (fd<0 is always false because fd is unsigned and Windows returns ~0 (-1) on socket failure) 2015-04-27 14:50:07 +09:00
Craig Tiller 7551fa6149 Merge github.com:grpc/grpc into one-pass
Conflicts:
	Makefile
2015-04-25 00:40:12 -07:00
Nicolas "Pixel" Noble fd2bf675f7 Merge branch 'master' of github.com:grpc/grpc into the-purge-2
Conflicts:
	include/grpc++/completion_queue.h
2015-04-24 23:24:44 +02:00
Yang Gao 96de48449c Add the new header to build.json and regenerate projects 2015-04-24 13:13:12 -07:00
Craig Tiller f0ebc99dc1 Merge github.com:grpc/grpc into one-pass
Conflicts:
	Makefile
2015-04-23 16:27:41 -07:00
Nicolas "Pixel" Noble 23be280366 Merge branch 'master' of github.com:grpc/grpc into the-purge-2
Conflicts:
	src/cpp/client/channel.cc
	vsprojects/vs2010/grpc++.vcxproj
	vsprojects/vs2013/grpc++.vcxproj.filters
2015-04-24 00:38:19 +02:00
zeliard 2cade59b9d Merge branch 'master' of https://github.com/grpc/grpc 2015-04-23 16:31:22 +09:00
zeliard 201d303263 add nuget info 2015-04-23 16:31:03 +09:00
Nicolas "Pixel" Noble 010f1e7b62 More work in not having to compile OpenSSL. 2015-04-23 03:30:15 +02:00
Craig Tiller 924874e8f0 Merge github.com:google/grpc into one-pass
Conflicts:
	vsprojects/vs2010/grpc.vcxproj
	vsprojects/vs2010/grpc.vcxproj.filters
	vsprojects/vs2010/grpc_unsecure.vcxproj
	vsprojects/vs2010/grpc_unsecure.vcxproj.filters
2015-04-22 16:45:54 -07:00
Nicolas "Pixel" Noble c43b34517f Post merge cleanup. 2015-04-23 01:41:09 +02:00
Craig Tiller 6ad62a7204 Merge github.com:grpc/grpc into one-pass 2015-04-22 15:24:27 -07:00
Craig Tiller 2b1f7a959f Merge github.com:google/grpc into batch-metadata 2015-04-22 07:57:21 -07:00
Craig Tiller 77979b0860 Merge branch 'batch-metadata' of github.com:ctiller/grpc into one-pass
Conflicts:
	src/core/channel/http_client_filter.c
	src/core/channel/http_server_filter.c
2015-04-22 07:56:09 -07:00
zeliard 292adfee5d fix MSVC solution build-able on x64 mode (remove _USE_32BIT_TIME_T) 2015-04-22 15:08:36 +09:00
Craig Tiller 83f88d90b9 stuff 2015-04-21 16:02:05 -07:00
Craig Tiller 062db022b7 Merge github.com:google/grpc into batch-metadata
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
2015-04-21 13:57:55 -07:00
Jan Tattermusch c6d5f106aa enabling creation of nuget package for grpc_csharp_ext 2015-04-20 19:44:48 -07:00
Jan Tattermusch 65c2020d89 fix typo in vcxproj template 2015-04-20 19:44:45 -07:00
Jan Tattermusch 5508c2c288 fixed grammar in readme 2015-04-20 19:20:51 -07:00
Jan Tattermusch 5566d6de58 tiny fixups 2015-04-20 19:20:50 -07:00
Jan Tattermusch 87d621bcf4 fixes to Grpc.mak 2015-04-20 19:20:48 -07:00
Jan Tattermusch d169d60ba3 updated README 2015-04-20 19:20:46 -07:00
Jan Tattermusch 87ac31ee7d allow building vcxproj files separately using msbuild 2015-04-20 19:20:45 -07:00
Jan Tattermusch e82435922d fixes to run_tests.py to at least start building tests on Windows 2015-04-20 19:20:43 -07:00
Jan Tattermusch 789e7aee60 updated version of nuget packages used in Grpc.mak 2015-04-20 19:20:42 -07:00
Jan Tattermusch 867ada1d24 regenerated Grpc.mak 2015-04-20 19:20:40 -07:00
Jan Tattermusch d2a38450aa remove what's left from vs2010 and vs2013 directories 2015-04-20 19:20:34 -07:00
Jan Tattermusch 33c424ad85 small fixes in README.md 2015-04-20 19:18:32 -07:00
Jan Tattermusch f6f6fdb49f start using grpc.dependencies.openssl and grpc.dependencies.zlib nuget packages 2015-04-20 19:18:27 -07:00
Jan Tattermusch b5bf574e0c regenerated project files 2015-04-20 19:18:25 -07:00
Jan Tattermusch 8ff00a3c25 big refactoring of visual studio projects, started using nuget
dependencies.
2015-04-20 19:18:22 -07:00
Craig Tiller c8a2299fe8 Merge github.com:grpc/grpc into batch-metadata 2015-04-20 09:04:57 -07:00
Julien Boeuf 7d1d9ca7fa Refactoring of core security to remove the factories.
- Renamed security_context -> security_connector.
- Credentials are now responsible for creating their own connectors.
2015-04-17 23:41:46 -07:00