diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-06-13 20:46:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-13 20:46:46 +0200 |
commit | a9785bfd7b01ddc83ac4b6d8d6a0e9f3222b21d4 (patch) | |
tree | adac15bff93c68cab36a260227aef3045e17901a /logd | |
parent | 4ae60e3fbc20e0397662c39848cab012ff052e5e (diff) |
Revert "Copyright header"
Diffstat (limited to 'logd')
32 files changed, 32 insertions, 32 deletions
diff --git a/logd/CMakeLists.txt b/logd/CMakeLists.txt index 53309ef3dd8..b69a56e7697 100644 --- a/logd/CMakeLists.txt +++ b/logd/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_define_module( DEPENDS fastos diff --git a/logd/pom.xml b/logd/pom.xml index e21931efc5a..b8d49e21677 100644 --- a/logd/pom.xml +++ b/logd/pom.xml @@ -1,4 +1,4 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 diff --git a/logd/src/apps/logd/CMakeLists.txt b/logd/src/apps/logd/CMakeLists.txt index 50a9a900958..24b39c45144 100644 --- a/logd/src/apps/logd/CMakeLists.txt +++ b/logd/src/apps/logd/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_executable(logd_app SOURCES main.cpp diff --git a/logd/src/apps/logd/main.cpp b/logd/src/apps/logd/main.cpp index 48450f323e9..b76ec71bf8a 100644 --- a/logd/src/apps/logd/main.cpp +++ b/logd/src/apps/logd/main.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <stdlib.h> #include <string.h> #include <stdio.h> diff --git a/logd/src/logd/CMakeLists.txt b/logd/src/logd/CMakeLists.txt index 6b46ef50b92..81aa64641b2 100644 --- a/logd/src/logd/CMakeLists.txt +++ b/logd/src/logd/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(logd STATIC SOURCES watch.cpp diff --git a/logd/src/logd/cmdbuf.cpp b/logd/src/logd/cmdbuf.cpp index 37915446f2d..9412a9cd588 100644 --- a/logd/src/logd/cmdbuf.cpp +++ b/logd/src/logd/cmdbuf.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <stdlib.h> #include <string.h> #include <stdio.h> diff --git a/logd/src/logd/cmdbuf.h b/logd/src/logd/cmdbuf.h index 8a9bf8a1ec1..de471d50f85 100644 --- a/logd/src/logd/cmdbuf.h +++ b/logd/src/logd/cmdbuf.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once namespace logdemon { diff --git a/logd/src/logd/conf.cpp b/logd/src/logd/conf.cpp index 8a53317c286..444a755170d 100644 --- a/logd/src/logd/conf.cpp +++ b/logd/src/logd/conf.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <stdlib.h> #include <string.h> #include <stdio.h> diff --git a/logd/src/logd/conf.h b/logd/src/logd/conf.h index ce135d153cd..d16c6fbf09e 100644 --- a/logd/src/logd/conf.h +++ b/logd/src/logd/conf.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <logd/config-logd.h> #include <vespa/config/config.h> diff --git a/logd/src/logd/conn.cpp b/logd/src/logd/conn.cpp index 19de80545cf..eee1076278c 100644 --- a/logd/src/logd/conn.cpp +++ b/logd/src/logd/conn.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <stdlib.h> #include <string.h> #include <stdio.h> diff --git a/logd/src/logd/conn.h b/logd/src/logd/conn.h index e6e3409796d..029db823547 100644 --- a/logd/src/logd/conn.h +++ b/logd/src/logd/conn.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once // simple utility function diff --git a/logd/src/logd/errhandle.h b/logd/src/logd/errhandle.h index 376005661fe..001ca0c9214 100644 --- a/logd/src/logd/errhandle.h +++ b/logd/src/logd/errhandle.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <stdexcept> #include <vespa/vespalib/stllike/string.h> diff --git a/logd/src/logd/forward.cpp b/logd/src/logd/forward.cpp index 99e778a379c..560ccaf1063 100644 --- a/logd/src/logd/forward.cpp +++ b/logd/src/logd/forward.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "forward.h" #include "errhandle.h" diff --git a/logd/src/logd/forward.h b/logd/src/logd/forward.h index 794db3bb45f..4b5b1e59bd4 100644 --- a/logd/src/logd/forward.h +++ b/logd/src/logd/forward.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "service.h" #include <vespa/vespalib/util/hashmap.h> diff --git a/logd/src/logd/perform.cpp b/logd/src/logd/perform.cpp index fdda358a365..a112b42f598 100644 --- a/logd/src/logd/perform.cpp +++ b/logd/src/logd/perform.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <stdlib.h> #include <string.h> #include <stdio.h> diff --git a/logd/src/logd/perform.h b/logd/src/logd/perform.h index 0b045c4c34e..db9e67e585e 100644 --- a/logd/src/logd/perform.h +++ b/logd/src/logd/perform.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once namespace logdemon { diff --git a/logd/src/logd/service.cpp b/logd/src/logd/service.cpp index 8e2237b1973..0cc2d414862 100644 --- a/logd/src/logd/service.cpp +++ b/logd/src/logd/service.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <stdlib.h> #include <string.h> #include <stdio.h> diff --git a/logd/src/logd/service.h b/logd/src/logd/service.h index 09b4ca3fa4b..3ff2e7fab92 100644 --- a/logd/src/logd/service.h +++ b/logd/src/logd/service.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include <logd/config-logd.h> diff --git a/logd/src/logd/sigterm.cpp b/logd/src/logd/sigterm.cpp index 8fe7665865f..2cdfcae75af 100644 --- a/logd/src/logd/sigterm.cpp +++ b/logd/src/logd/sigterm.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "sigterm.h" #include <vespa/vespalib/util/signalhandler.h> diff --git a/logd/src/logd/sigterm.h b/logd/src/logd/sigterm.h index 79b0eb7b781..fc86d25dbb7 100644 --- a/logd/src/logd/sigterm.h +++ b/logd/src/logd/sigterm.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once // setup for catching signals extern void hook_signals(); diff --git a/logd/src/logd/watch.cpp b/logd/src/logd/watch.cpp index 0ff6510bd25..7e251ac2888 100644 --- a/logd/src/logd/watch.cpp +++ b/logd/src/logd/watch.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "errhandle.h" #include "sigterm.h" diff --git a/logd/src/logd/watch.h b/logd/src/logd/watch.h index 29523181303..6385e725104 100644 --- a/logd/src/logd/watch.h +++ b/logd/src/logd/watch.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once namespace logdemon { diff --git a/logd/src/main/resources/configdefinitions/logd.def b/logd/src/main/resources/configdefinitions/logd.def index 96c6bf5a616..664c949fdc2 100644 --- a/logd/src/main/resources/configdefinitions/logd.def +++ b/logd/src/main/resources/configdefinitions/logd.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=cloud.config.log ## Host to contact the logserver on. diff --git a/logd/src/tests/forward/CMakeLists.txt b/logd/src/tests/forward/CMakeLists.txt index 414aaf6e474..653fa145522 100644 --- a/logd/src/tests/forward/CMakeLists.txt +++ b/logd/src/tests/forward/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_executable(logd_forward_test_app TEST SOURCES forward.cpp diff --git a/logd/src/tests/forward/forward.cpp b/logd/src/tests/forward/forward.cpp index 6a9a8668e9b..332b4661edc 100644 --- a/logd/src/tests/forward/forward.cpp +++ b/logd/src/tests/forward/forward.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/log/log.h> #include <vespa/vespalib/testkit/testapp.h> #include <logd/forward.h> diff --git a/logd/src/tests/info/CMakeLists.txt b/logd/src/tests/info/CMakeLists.txt index 0428753a3a6..b82292dd9d4 100644 --- a/logd/src/tests/info/CMakeLists.txt +++ b/logd/src/tests/info/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_executable(logd_info_test_app TEST SOURCES info.cpp diff --git a/logd/src/tests/info/info.cpp b/logd/src/tests/info/info.cpp index 438db3c3e7f..a54fd261801 100644 --- a/logd/src/tests/info/info.cpp +++ b/logd/src/tests/info/info.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/log/log.h> LOG_SETUP("info_test"); #include <vespa/vespalib/testkit/testapp.h> diff --git a/logd/src/tests/rotate/CMakeLists.txt b/logd/src/tests/rotate/CMakeLists.txt index 43415ae3cba..b289c607347 100644 --- a/logd/src/tests/rotate/CMakeLists.txt +++ b/logd/src/tests/rotate/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_executable(logd_dummyserver_app SOURCES dummyserver.cpp diff --git a/logd/src/tests/rotate/create_configfile.sh b/logd/src/tests/rotate/create_configfile.sh index cff4321b3b4..3211218c369 100755 --- a/logd/src/tests/rotate/create_configfile.sh +++ b/logd/src/tests/rotate/create_configfile.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. read port < logserver.port diff --git a/logd/src/tests/rotate/dummylogger.cpp b/logd/src/tests/rotate/dummylogger.cpp index a3d72e2beca..375ce4026b3 100644 --- a/logd/src/tests/rotate/dummylogger.cpp +++ b/logd/src/tests/rotate/dummylogger.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <stdio.h> #include <stdlib.h> #include <time.h> diff --git a/logd/src/tests/rotate/dummyserver.cpp b/logd/src/tests/rotate/dummyserver.cpp index 5a73cfb7711..c36bf4597cb 100644 --- a/logd/src/tests/rotate/dummyserver.cpp +++ b/logd/src/tests/rotate/dummyserver.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/logd/src/tests/rotate/rotate_test.sh b/logd/src/tests/rotate/rotate_test.sh index b9f28342535..053a6a3670c 100755 --- a/logd/src/tests/rotate/rotate_test.sh +++ b/logd/src/tests/rotate/rotate_test.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. set -e if [ -z "$SOURCE_DIRECTORY" ]; then |