diff options
| author |  vjpai <vpai@google.com> | 2016-01-19 08:01:47 -0800 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2016-01-19 08:01:47 -0800 |
| commit | f6269a4dca3854267a26a0f70f5bddc3a72ca916 (patch) | |
| tree | 8dccaf75a5986d1f5647678a0e983012ad644e45 /test/cpp/qps/server.h | |
| parent | b9a8f1ba396becc94b09e4e123ea6445444ac09a (diff) | |
| parent | 16affcce96eb9dc467eed62f521ab3e62737726e (diff) | |
Merge branch 'master' into corelimit2
Diffstat (limited to 'test/cpp/qps/server.h')
| -rw-r--r-- | test/cpp/qps/server.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h index a31114cb44..0c6e264a50 100644 --- a/test/cpp/qps/server.h +++ b/test/cpp/qps/server.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |