diff options
author | Yang Gao <yangg@google.com> | 2015-06-16 13:19:07 -0700 |
---|---|---|
committer | Yang Gao <yangg@google.com> | 2015-06-16 13:19:07 -0700 |
commit | 763afe1fd66e3a57c4484bb0f1f9930b7bd68ea2 (patch) | |
tree | 2c457ddd98168fd47026fc02c181be672fb49eac /src/cpp/util/status.cc | |
parent | 102eccb63238f2b40e89d2ec1ed93a7771a82798 (diff) | |
parent | 32f020ae2a4c01eba236b3a93251ef9c18f606ec (diff) |
merge with upstream
Diffstat (limited to 'src/cpp/util/status.cc')
-rw-r--r-- | src/cpp/util/status.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/util/status.cc b/src/cpp/util/status.cc index b694a513e7..5bb9eda3d9 100644 --- a/src/cpp/util/status.cc +++ b/src/cpp/util/status.cc @@ -36,6 +36,6 @@ namespace grpc { const Status& Status::OK = Status(); -const Status& Status::Cancelled = Status(StatusCode::CANCELLED); +const Status& Status::CANCELLED = Status(StatusCode::CANCELLED, ""); } // namespace grpc |