diff options
| author |  David G. Quintas <dgq@google.com> | 2016-03-31 22:17:45 -0700 |
|---|---|---|
| committer | David G. Quintas <dgq@google.com> | 2016-03-31 22:17:45 -0700 |
| commit | 95d6767bf3dcd6516bb995b822725f8ff4e85ab6 (patch) | |
| tree | 7ea75eb2ece80f93fcaf1b25f2bb0178e6ed9732 /src/cpp/server | |
| parent | 1e681c2474d560254d3d26116ec3574a060dcfcd (diff) | |
| parent | 7661da5b417130262ded988b2f881ab619d3b244 (diff) | |
Merge branch 'master' into sockaddr_resolver_lb_2
Diffstat (limited to 'src/cpp/server')
| -rw-r--r-- | src/cpp/server/server.cc | 2 | ||||
| -rw-r--r-- | src/cpp/server/server_builder.cc | 2 | ||||
| -rw-r--r-- | src/cpp/server/server_context.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index 5ec05e4dcc..3e44c502fc 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server.cc @@ -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 diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index 1947d68e3e..68cc38258c 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -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 diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 0422650953..e05a7df28a 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -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 |