Commit Graph

127 Commits

Author SHA1 Message Date
Craig Tiller 2a548d082b Merge pull request #3006 from soltanmm/sketchbook
Add API tracing, coalesce surface+batch tracing
2015-10-05 08:48:57 -07:00
Nicolas "Pixel" Noble cff6469dfc Making template agree with clang-format. 2015-10-03 02:01:51 +02:00
Masood Malekghassemi 9229810752 Update build files 2015-10-02 16:37:33 -07:00
Masood Malekghassemi fe1093c3a8 Update build tools 2015-10-02 16:37:33 -07:00
Tim Emiola 25061413cf Merge pull request #3602 from grpc/release-0_11
Upmerge from beta to master.
2015-10-02 13:43:14 -07:00
Jorge Canizales c825f42347 Update versions in Podspec to 0.11.1 2015-09-28 22:16:34 -07:00
Yang Gao b09a875917 Merge pull request #3476 from vjpai/block_annotate
Annotate blocking points
2015-09-25 13:54:51 -07:00
vjpai 9839d285cd Move block_annotate from iomgr to support since it's used in other
core places besides iomgr
2015-09-24 17:55:18 -07:00
Vijay Pai 3dd3ba1efa Rebuild all project files with new header included 2015-09-24 15:04:07 -07:00
Craig Tiller 8af4c33718 Final patches for rename 2015-09-22 12:32:31 -07:00
Craig Tiller 298751c119 Split closures from iomgr.h 2015-09-22 09:41:05 -07:00
Craig Tiller 10ee2747a9 Merge github.com:grpc/grpc into we-are-one 2015-09-22 09:25:57 -07:00
Craig Tiller 786522166e Merge pull request #3027 from jboeuf/security_connector_refactoring
Security connector refactoring
2015-09-22 08:25:57 -07:00
Craig Tiller ba496454b2 Fixes 2015-09-21 17:15:19 -07:00
David Garcia Quintas 2921cf0b34 regenerated projects 2015-09-16 18:02:50 -07:00
Julien Boeuf 5600a6aaac Changing build.yaml: s/secure_tranport_setup/handshake 2015-09-15 23:01:39 -07:00
Julien Boeuf e9961d29f1 Merge branch 'master' of github.com:grpc/grpc into security_connector_refactoring 2015-09-15 22:51:02 -07:00
Craig Tiller 1701b09333 Merge github.com:grpc/grpc into shindig 2015-09-11 13:33:26 -07:00
Craig Tiller 73b6606629 Workqueue: interface, test, and posix implementation 2015-09-09 09:34:46 -07:00
Jorge Canizales 7f51a041b4 Restrict deployment targets to the protobuf requirement. 2015-09-08 21:31:59 -07:00
Jorge Canizales 0bee681ab1 Bump version of gRPC.podspec to 0.11
Technically unnecessary, but for consistency with the other beta releases.
2015-09-08 21:05:33 -07:00
David Garcia Quintas 4fb049b647 Added round robin LB policy. 2015-09-08 10:47:37 -07:00
David Garcia Quintas 5c4543d9f5 Introduced a registry for LB policies. 2015-09-03 16:04:19 -07:00
Alistair Veitch 1c09accaad change aggregation_ops to internal type 2015-08-31 16:57:32 -07:00
Alistair Veitch c47621fbef merge 2015-08-31 08:39:47 -07:00
Alistair Veitch bff9cf52ed Merge branch 'master' into tracing_api 2015-08-28 14:35:49 -07:00
Alistair Veitch ae7bbfcb92 merge to head 2015-08-28 11:00:02 -07:00
Alistair Veitch 9a09982e2d view and aggregation API 2015-08-27 13:16:00 -07:00
Hongyu Chen beb580b941 More merge conflict fix 2015-08-25 16:19:33 -07:00
Alistair Veitch a4e884721d merge to head 2015-08-25 15:36:20 -07:00
Hongyu Chen 011ea49592 Merge remote-tracking branch 'upstream/master' into timespec 2015-08-25 14:44:15 -07:00
yang-g 31ff8bcc15 add missing headers from 2495 2015-08-25 14:09:06 -07:00
Hongyu Chen a0f149e873 Move core/profiling/timers_preciseclock.h to core/support/ such that we
have a gpr public function which returns cycle clock.
2015-08-24 16:27:19 -07:00
Julien Boeuf 87047d7e93 Security connector is now responsible for the handshake. 2015-08-21 14:30:33 -07:00
Hongyu Chen e09dc78e74 rename census_filter.{c,h} to grpc_filter.{c,h} 2015-08-21 11:28:33 -07:00
Hongyu Chen c389bd22b7 Merge remote-tracking branch 'upstream/master' 2015-08-20 11:18:35 -07:00
Hongyu Chen fdc1dc744b Move census_filters from .../channel to .../census 2015-08-19 16:58:12 -07:00
Robbie Shade 3544fd26a0 Merge remote-tracking branch 'upstream/master' into add_udp_server_2
Conflicts:
	Makefile
2015-08-13 18:03:24 -04:00
Nicolas "Pixel" Noble bb3aed0ef9 Removing gpr_cancelable. 2015-08-13 22:53:21 +02:00
Robbie Shade 37ad56b469 Merge remote-tracking branch 'upstream/master' into add_udp_server_2 2015-08-13 16:12:26 -04:00
Alistair Veitch c47e69b71e Merge branch 'master' into tracing_api 2015-08-13 11:36:10 -07:00
Alistair Veitch e6d0ad317e add all new content 2015-08-13 09:59:48 -07:00
Hongyu Chen 7adbb64307 Build file changes 2015-08-11 16:00:32 -07:00
Robbie Shade fb5eb0e98d Regenerated project files 2015-08-06 12:39:04 -04:00
Craig Tiller 0700d8b118 Merge github.com:grpc/grpc into kinetic-lopsided-poetry 2015-08-05 15:28:41 -07:00
Alistair Veitch a924b31d28 merge with upstream/master 2015-08-04 17:47:11 -07:00
Craig Tiller f53d9c8d0d Testing port server
run_tests.py will start a server (if it's not running, or if the running
port server mismatches the 'current' one) that serves ports to use for
tests. The server is left running after run_tests.py finishes, so that
in environments such as Mac and Windows where tests run unshielded from
each other, we don't start jumping on already used ports.
2015-08-04 14:19:43 -07:00
Craig Tiller 42ce225d50 Merge github.com:grpc/grpc into plucking-hell
Conflicts:
	Makefile
2015-08-01 16:21:18 -07:00
Craig Tiller 44a127c80f Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about
Conflicts:
	vsprojects/Grpc.mak
	vsprojects/grpc.sln
	vsprojects/grpc/grpc.vcxproj
	vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj
	vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj
	vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj
	vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj
	vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj
	vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj
	vsprojects/grpc_unsecure/grpc_unsecure.vcxproj
2015-07-31 07:45:59 -07:00
Craig Tiller 70e9b3d2a2 Merge github.com:grpc/grpc into plucking-hell 2015-07-30 16:15:58 -07:00