377881204f
Merge branch 'reset-thy-counts-or-fear-my-wrath' into tis-but-thy-name
2015-07-06 10:26:03 -07:00
f8857de339
Merge branch 'master' of https://github.com/grpc/grpc
2015-06-30 20:26:58 -07:00
49dc1146ec
Merge github.com:grpc/grpc into forever-is-a-long-time
2015-06-30 16:38:39 -07:00
b713546e4d
Resolving dependency error in Jenkins
2015-06-29 14:14:37 -07:00
25481f72c1
Resolving merge conflict
2015-06-29 13:27:23 -07:00
08a1cf8f4f
Use connectivity state tracking code in chttp2 transport
2015-06-29 09:37:52 -07:00
4d74056b08
Merge branch 'forever-is-a-long-time' into tis-but-thy-name
...
Conflicts:
Makefile
vsprojects/Grpc.mak
2015-06-29 08:49:49 -07:00
ee98d84a02
Add an fd conservation test to verify that fds actually close
2015-06-29 08:45:55 -07:00
acf0f07dfc
Unix resolver, bug fixes
2015-06-29 08:24:16 -07:00
bb30971cec
Fix run_tests forever mode
2015-06-28 16:05:34 -07:00
73f36bdb6c
Fix run_tests forever mode
2015-06-28 16:04:47 -07:00
1107558558
Merge github.com:grpc/grpc into tis-but-thy-name
2015-06-28 16:03:51 -07:00
66e358b1e0
Disabling saving failed containers.
...
We clearly don't have enough space for that, if we are to run our tests every few minutes.
We can revisit that later and automatically purge old containers for example.
2015-06-27 22:37:50 +02:00
c7b5f7605e
Factor out channel state watching
2015-06-27 11:48:42 -07:00
d35f93d1b3
Merges broke the build - regenerating.
2015-06-27 00:57:29 +02:00
0c5cf25d4e
Merge github.com:grpc/grpc into tis-but-thy-name
2015-06-26 14:42:54 -07:00
8bcba9a08f
Merge pull request #2149 from ctiller/oops-i-split-it-again
...
Initial transport lock split up
2015-06-26 13:58:55 -07:00
00d018ca13
Merge github.com:grpc/grpc into forever-is-a-long-time
2015-06-26 13:13:18 -07:00
ebaa860e08
Update this file
2015-06-26 13:12:58 -07:00
6b1ad3c40a
Merge pull request #2225 from nicolasnoble/make-runtest-output-junit-reports
...
Make runtest output junit reports
2015-06-26 10:49:16 -07:00
ef2a3e22a1
Merge github.com:grpc/grpc into forever-is-a-long-time
2015-06-26 10:48:17 -07:00
30ee10b785
Rename test into the right place
2015-06-26 08:09:01 -07:00
5937b5bc5a
Exporting XML reports, JUnit-compatible.
2015-06-26 03:32:16 +02:00
1aa041ab1a
BLARGHAFLARGHAAHAJHAKJHATJHKAYMNHZIYRN
2015-06-25 18:02:18 -07:00
916246625b
Introduce connector, to help subchannel connect
2015-06-25 16:31:02 -07:00
e039f03383
Plumbing transport_op changes through
2015-06-25 12:54:23 -07:00
3b1847c528
Merge branch 'oops-i-split-it-again' into tis-but-thy-name
2015-06-25 09:00:34 -07:00
4b62811032
Merge github.com:grpc/grpc into tis-but-thy-name
2015-06-25 08:58:23 -07:00
6e8c7e87ef
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-25 08:52:40 -07:00
f5f1712e1f
Refactoring progress towards integrating client configs
2015-06-25 08:47:26 -07:00
224b04f6ef
Make this more robust against merges
2015-06-25 07:11:18 -07:00
fe8592ee99
Merge github.com:grpc/grpc into are-includes-sane
...
Conflicts:
tools/doxygen/Doxyfile.c++.internal
2015-06-25 07:00:18 -07:00
f75fc12e3a
Add a test that headers are properly in build.json
...
Clean up anything that failed
2015-06-25 06:58:00 -07:00
964f955b22
Some Jenkins changes and improvements.
...
-) Don't re-clone from github. We already have the directory here, just bind it, and copy it inside the docker container.
-) Let's properly set up our environment for asan.
-) Let's split the docker "run_jenkins" part into its own separate script.
2015-06-25 03:23:52 +02:00
3bc8ebd48e
Implementation work for client_config
...
- uri parsing
- dns resolution
2015-06-24 15:41:15 -07:00
1e02fed4a1
Merge pull request #2185 from ctiller/it-hides-them
...
Move some code out of src/ into tools/
2015-06-24 12:59:30 -07:00
7df28a7bd2
Merge github.com:grpc/grpc into that-which-we-call-a-rose
...
Introduce resolver_factory
2015-06-24 09:23:52 -07:00
d13794332c
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-24 08:48:14 -07:00
eb327fba7c
Make it less likely a build.json change triggers a merge conflict
2015-06-23 16:51:38 -07:00
009886cf79
Merge github.com:grpc/grpc into that-which-we-call-a-rose
...
Conflicts:
gRPC.podspec
tools/doxygen/Doxyfile.core.internal
2015-06-23 16:26:18 -07:00
af69180478
Flesh out things and make them compile
2015-06-23 14:57:07 -07:00
31489e3aba
Move some code out of src/ into tools/
...
It shouldn't count towards coverage
2015-06-23 14:27:34 -07:00
01ac44bf08
Fix doxyfile for real
2015-06-23 13:42:00 -07:00
728f29076d
clang-format messed up Doxyfile.c++, restored
2015-06-23 13:09:58 -07:00
adfed03146
Add missing headers to build.json
2015-06-23 13:01:22 -07:00
253aaa6b10
Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs
...
Remove Protobuf dependency for C++
2015-06-23 10:05:20 -07:00
949b6ee796
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-23 09:26:21 -07:00
aa555df7ee
Merge pull request #2175 from yang-g/constness
...
Add const to ByteBuffer methods and add tests
2015-06-23 07:54:19 -07:00
89c5a56233
Add const to ByteBuffer methods and add tests
2015-06-22 16:31:11 -07:00
6b3cb2a71f
Merge pull request #2168 from ctiller/dont-do-nothing-infinite-times
...
Dont do nothing for eternity
2015-06-22 15:00:56 -07:00
Craig Tiller