diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-24 17:03:20 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-02-24 17:03:20 -0800 |
| commit | 312fdba3506b8872a2ca7ff1dd51fb4e0ce6c9c6 (patch) | |
| tree | 20966216f9f4307914e2436c34d218dfe0d8c4b1 /tools/run_tests/run_microbenchmark.py | |
| parent | f30194f157c1027de4579b091a9e1be1621c4a55 (diff) | |
| parent | f2cf3d94a1a46db2ebb2c13c3476e58ecdae6006 (diff) | |
Merge github.com:grpc/grpc into bm_meta
Diffstat (limited to 'tools/run_tests/run_microbenchmark.py')
| -rwxr-xr-x | tools/run_tests/run_microbenchmark.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/run_tests/run_microbenchmark.py b/tools/run_tests/run_microbenchmark.py index 7f871bf0ad..4307906a7e 100755 --- a/tools/run_tests/run_microbenchmark.py +++ b/tools/run_tests/run_microbenchmark.py @@ -206,7 +206,6 @@ argp.add_argument('-b', '--benchmarks', 'bm_error', 'bm_chttp2_hpack', 'bm_metadata'], ->>>>>>> b325a1dd4af3f3d3443da3e0ac0f007162c63772 nargs='+', type=str, help='Which microbenchmarks should be run') |