diff options
author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
---|---|---|
committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /logd/src/logd | |
parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'logd/src/logd')
-rw-r--r-- | logd/src/logd/CMakeLists.txt | 2 | ||||
-rw-r--r-- | logd/src/logd/config_subscriber.cpp | 2 | ||||
-rw-r--r-- | logd/src/logd/config_subscriber.h | 2 | ||||
-rw-r--r-- | logd/src/logd/empty_forwarder.cpp | 2 | ||||
-rw-r--r-- | logd/src/logd/empty_forwarder.h | 2 | ||||
-rw-r--r-- | logd/src/logd/exceptions.h | 2 | ||||
-rw-r--r-- | logd/src/logd/forwarder.h | 2 | ||||
-rw-r--r-- | logd/src/logd/log_protocol_proto.h | 2 | ||||
-rw-r--r-- | logd/src/logd/metrics.cpp | 2 | ||||
-rw-r--r-- | logd/src/logd/metrics.h | 2 | ||||
-rw-r--r-- | logd/src/logd/proto_converter.cpp | 2 | ||||
-rw-r--r-- | logd/src/logd/proto_converter.h | 2 | ||||
-rw-r--r-- | logd/src/logd/rpc_forwarder.cpp | 2 | ||||
-rw-r--r-- | logd/src/logd/rpc_forwarder.h | 2 | ||||
-rw-r--r-- | logd/src/logd/state_reporter.cpp | 2 | ||||
-rw-r--r-- | logd/src/logd/state_reporter.h | 2 | ||||
-rw-r--r-- | logd/src/logd/watcher.cpp | 2 | ||||
-rw-r--r-- | logd/src/logd/watcher.h | 2 |
18 files changed, 18 insertions, 18 deletions
diff --git a/logd/src/logd/CMakeLists.txt b/logd/src/logd/CMakeLists.txt index a28bbba56c7..ef4ac360881 100644 --- a/logd/src/logd/CMakeLists.txt +++ b/logd/src/logd/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # logd is the only cpp module using the protobuf files for the log protocol. # We have choosen to generate the cpp code where it is used, instead of changing the java logserver module to also generate and export cpp code just for this case. diff --git a/logd/src/logd/config_subscriber.cpp b/logd/src/logd/config_subscriber.cpp index 0b47d22096a..4f46c9c7173 100644 --- a/logd/src/logd/config_subscriber.cpp +++ b/logd/src/logd/config_subscriber.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "config_subscriber.h" #include "empty_forwarder.h" diff --git a/logd/src/logd/config_subscriber.h b/logd/src/logd/config_subscriber.h index 3c5ac202832..e199a23ec0a 100644 --- a/logd/src/logd/config_subscriber.h +++ b/logd/src/logd/config_subscriber.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "forwarder.h" diff --git a/logd/src/logd/empty_forwarder.cpp b/logd/src/logd/empty_forwarder.cpp index b601ea6d890..2e40160d836 100644 --- a/logd/src/logd/empty_forwarder.cpp +++ b/logd/src/logd/empty_forwarder.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "empty_forwarder.h" #include "metrics.h" diff --git a/logd/src/logd/empty_forwarder.h b/logd/src/logd/empty_forwarder.h index 0ee33f3e71f..e9144b29b36 100644 --- a/logd/src/logd/empty_forwarder.h +++ b/logd/src/logd/empty_forwarder.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "forwarder.h" diff --git a/logd/src/logd/exceptions.h b/logd/src/logd/exceptions.h index acee03dcda5..a531574c630 100644 --- a/logd/src/logd/exceptions.h +++ b/logd/src/logd/exceptions.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <stdexcept> diff --git a/logd/src/logd/forwarder.h b/logd/src/logd/forwarder.h index 595643b9931..7d7276d4cb2 100644 --- a/logd/src/logd/forwarder.h +++ b/logd/src/logd/forwarder.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/logd/src/logd/log_protocol_proto.h b/logd/src/logd/log_protocol_proto.h index 60bb016d243..a948f4472c1 100644 --- a/logd/src/logd/log_protocol_proto.h +++ b/logd/src/logd/log_protocol_proto.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/logd/src/logd/metrics.cpp b/logd/src/logd/metrics.cpp index 9ea2880d711..518a08ef0d9 100644 --- a/logd/src/logd/metrics.cpp +++ b/logd/src/logd/metrics.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "metrics.h" diff --git a/logd/src/logd/metrics.h b/logd/src/logd/metrics.h index ae9c3c0cc6d..504beecd316 100644 --- a/logd/src/logd/metrics.h +++ b/logd/src/logd/metrics.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <vespa/vespalib/metrics/metrics_manager.h> diff --git a/logd/src/logd/proto_converter.cpp b/logd/src/logd/proto_converter.cpp index e50116bc529..0911a844eb7 100644 --- a/logd/src/logd/proto_converter.cpp +++ b/logd/src/logd/proto_converter.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "proto_converter.h" #include <vespa/vespalib/text/utf8.h> diff --git a/logd/src/logd/proto_converter.h b/logd/src/logd/proto_converter.h index 0e804be57f8..64b0bd22579 100644 --- a/logd/src/logd/proto_converter.h +++ b/logd/src/logd/proto_converter.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/logd/src/logd/rpc_forwarder.cpp b/logd/src/logd/rpc_forwarder.cpp index b89eb87e2f7..16cf22e9d65 100644 --- a/logd/src/logd/rpc_forwarder.cpp +++ b/logd/src/logd/rpc_forwarder.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "exceptions.h" #include "metrics.h" diff --git a/logd/src/logd/rpc_forwarder.h b/logd/src/logd/rpc_forwarder.h index 864c7b666cb..e87dd68bc0a 100644 --- a/logd/src/logd/rpc_forwarder.h +++ b/logd/src/logd/rpc_forwarder.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/logd/src/logd/state_reporter.cpp b/logd/src/logd/state_reporter.cpp index afde38d5acd..cd65e980eb3 100644 --- a/logd/src/logd/state_reporter.cpp +++ b/logd/src/logd/state_reporter.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "state_reporter.h" #include <vespa/vespalib/metrics/simple_metrics_manager.h> diff --git a/logd/src/logd/state_reporter.h b/logd/src/logd/state_reporter.h index eef5df3fce9..45c510d9d0a 100644 --- a/logd/src/logd/state_reporter.h +++ b/logd/src/logd/state_reporter.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <vespa/vespalib/net/http/state_server.h> diff --git a/logd/src/logd/watcher.cpp b/logd/src/logd/watcher.cpp index af1efc3077d..3e4d53985b3 100644 --- a/logd/src/logd/watcher.cpp +++ b/logd/src/logd/watcher.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "config_subscriber.h" #include "exceptions.h" diff --git a/logd/src/logd/watcher.h b/logd/src/logd/watcher.h index 19cb7fe3cd6..0856fff58f2 100644 --- a/logd/src/logd/watcher.h +++ b/logd/src/logd/watcher.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <vector> |