diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-16 17:18:34 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-16 17:18:34 -0700 |
| commit | 48dd6bfb53ff9ddda39b9b2e6ced297e95027514 (patch) | |
| tree | 46f0c63ecf93ed9ccf5bfda0aba501788744cca1 /src/cpp/util | |
| parent | 18b4b8379259ffa73f8b5414a09bcb682d96b200 (diff) | |
| parent | 94528cb58545a021df177e64a20efc91c1ac6226 (diff) | |
Merge github.com:grpc/grpc into you-complete-me
Diffstat (limited to 'src/cpp/util')
| -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 |