diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-03-31 23:22:28 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-03-31 23:22:28 -0700 |
| commit | 86fcfcc7b35cd4478603bb0a93711962b71b8c76 (patch) | |
| tree | 0477d1674bf7fcad3713931d760d4214ddd5e89b /src/core/lib/client_config/resolver_registry.h | |
| parent | fcf7ad692cbd98a75d7dba53acf0ac8739a9da5e (diff) | |
| parent | 7661da5b417130262ded988b2f881ab619d3b244 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into subchannel_factory_create_lb_channel
Diffstat (limited to 'src/core/lib/client_config/resolver_registry.h')
| -rw-r--r-- | src/core/lib/client_config/resolver_registry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/client_config/resolver_registry.h b/src/core/lib/client_config/resolver_registry.h index eec830bbcb..e7eec6d3a6 100644 --- a/src/core/lib/client_config/resolver_registry.h +++ b/src/core/lib/client_config/resolver_registry.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |