aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-04-23 08:45:17 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-04-23 08:45:17 -0700
commitd7fa0ffb82cf91b0728758fb27e04b5dca4dfe47 (patch)
treee3d596c34483de31ed744c2f56e4faf49c821032
parente5cb23ba550878c2e562cd2df9ba0d857da63667 (diff)
parentb372405cede07d64af90867d89ba95ae95d3dc05 (diff)
Merge github.com:grpc/grpc into one-pass
-rw-r--r--src/core/support/histogram.c2
-rwxr-xr-xtools/run_tests/run_tests.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/support/histogram.c b/src/core/support/histogram.c
index ed344b43e8..673affde71 100644
--- a/src/core/support/histogram.c
+++ b/src/core/support/histogram.c
@@ -76,7 +76,7 @@ static size_t bucket_for_unchecked(gpr_histogram *h, double x) {
/* bounds checked version of the above */
static size_t bucket_for(gpr_histogram *h, double x) {
- size_t bucket = bucket_for_unchecked(h, GPR_CLAMP(x, 0, h->max_possible));
+ size_t bucket = bucket_for_unchecked(h, GPR_CLAMP(x, 1.0, h->max_possible));
GPR_ASSERT(bucket < h->num_buckets);
return bucket;
}
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 4e24f4b510..5165983d97 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -259,7 +259,7 @@ class Build(object):
return []
def make_targets(self):
- return ['all']
+ return ['static']
def build_steps(self):
return []