From a84e7e88923c211d6bcdc56929ade99d86813bb6 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <jonbratseth@yahoo.com>
Date: Wed, 14 Jun 2017 17:57:50 +0200
Subject: Revert "Update copyright headers"

---
 configd/CMakeLists.txt                           | 2 +-
 configd/src/apps/sentinel/CMakeLists.txt         | 2 +-
 configd/src/apps/sentinel/command-connection.cpp | 2 +-
 configd/src/apps/sentinel/command-connection.h   | 2 +-
 configd/src/apps/sentinel/config-handler.cpp     | 2 +-
 configd/src/apps/sentinel/config-handler.h       | 2 +-
 configd/src/apps/sentinel/line-splitter.cpp      | 2 +-
 configd/src/apps/sentinel/line-splitter.h        | 2 +-
 configd/src/apps/sentinel/metrics.cpp            | 2 +-
 configd/src/apps/sentinel/metrics.h              | 2 +-
 configd/src/apps/sentinel/output-connection.cpp  | 2 +-
 configd/src/apps/sentinel/output-connection.h    | 2 +-
 configd/src/apps/sentinel/sentinel-tester.sh     | 2 +-
 configd/src/apps/sentinel/sentinel.cpp           | 2 +-
 configd/src/apps/sentinel/service.cpp            | 2 +-
 configd/src/apps/sentinel/service.h              | 2 +-
 configd/src/apps/sentinel/state-api.cpp          | 2 +-
 configd/src/apps/sentinel/state-api.h            | 2 +-
 configd/src/apps/su/CMakeLists.txt               | 2 +-
 configd/src/apps/su/main.cpp                     | 2 +-
 configd/src/tests/configd/CMakeLists.txt         | 2 +-
 configd/src/tests/configd/run-sentinel.sh        | 2 +-
 configd/src/tests/messages/CMakeLists.txt        | 2 +-
 configd/src/tests/messages/messages.cpp          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'configd')

diff --git a/configd/CMakeLists.txt b/configd/CMakeLists.txt
index d3926b59759..66be2fde277 100644
--- a/configd/CMakeLists.txt
+++ b/configd/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(
     APPS
     src/apps/sentinel
diff --git a/configd/src/apps/sentinel/CMakeLists.txt b/configd/src/apps/sentinel/CMakeLists.txt
index dceb4811d3d..ea25156a3c4 100644
--- a/configd/src/apps/sentinel/CMakeLists.txt
+++ b/configd/src/apps/sentinel/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(configd_config-sentinel_app
     SOURCES
     sentinel.cpp
diff --git a/configd/src/apps/sentinel/command-connection.cpp b/configd/src/apps/sentinel/command-connection.cpp
index f253e084305..bd3988bdbba 100644
--- a/configd/src/apps/sentinel/command-connection.cpp
+++ b/configd/src/apps/sentinel/command-connection.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 <unistd.h>
 #include <stdarg.h>
 #include <cstdio>
diff --git a/configd/src/apps/sentinel/command-connection.h b/configd/src/apps/sentinel/command-connection.h
index 532b70caf76..355ee4e72b1 100644
--- a/configd/src/apps/sentinel/command-connection.h
+++ b/configd/src/apps/sentinel/command-connection.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 "line-splitter.h"
diff --git a/configd/src/apps/sentinel/config-handler.cpp b/configd/src/apps/sentinel/config-handler.cpp
index c9242370b66..1c9b53bde2b 100644
--- a/configd/src/apps/sentinel/config-handler.cpp
+++ b/configd/src/apps/sentinel/config-handler.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 <sys/types.h>
 #include <sys/wait.h>
 #include <sys/time.h>
diff --git a/configd/src/apps/sentinel/config-handler.h b/configd/src/apps/sentinel/config-handler.h
index aa2fb3b5ea1..897f1e1ce3c 100644
--- a/configd/src/apps/sentinel/config-handler.h
+++ b/configd/src/apps/sentinel/config-handler.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 <sys/types.h>
diff --git a/configd/src/apps/sentinel/line-splitter.cpp b/configd/src/apps/sentinel/line-splitter.cpp
index 9bfac17225e..61523db10b4 100644
--- a/configd/src/apps/sentinel/line-splitter.cpp
+++ b/configd/src/apps/sentinel/line-splitter.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 <errno.h>
diff --git a/configd/src/apps/sentinel/line-splitter.h b/configd/src/apps/sentinel/line-splitter.h
index 1fd9fce8653..5ccf7690fda 100644
--- a/configd/src/apps/sentinel/line-splitter.h
+++ b/configd/src/apps/sentinel/line-splitter.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 config {
diff --git a/configd/src/apps/sentinel/metrics.cpp b/configd/src/apps/sentinel/metrics.cpp
index 078dfa275d9..7f45b01d3de 100644
--- a/configd/src/apps/sentinel/metrics.cpp
+++ b/configd/src/apps/sentinel/metrics.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 "metrics.h"
 #include <vespa/log/log.h>
diff --git a/configd/src/apps/sentinel/metrics.h b/configd/src/apps/sentinel/metrics.h
index 87072410ef0..709ee9103d9 100644
--- a/configd/src/apps/sentinel/metrics.h
+++ b/configd/src/apps/sentinel/metrics.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 <sys/time.h>
diff --git a/configd/src/apps/sentinel/output-connection.cpp b/configd/src/apps/sentinel/output-connection.cpp
index 5dbe1c22f58..4524e15da72 100644
--- a/configd/src/apps/sentinel/output-connection.cpp
+++ b/configd/src/apps/sentinel/output-connection.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 <unistd.h>
 #include <stdarg.h>
 #include <cstdio>
diff --git a/configd/src/apps/sentinel/output-connection.h b/configd/src/apps/sentinel/output-connection.h
index ff5a8c62bbb..c8b7178e07a 100644
--- a/configd/src/apps/sentinel/output-connection.h
+++ b/configd/src/apps/sentinel/output-connection.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 "line-splitter.h"
diff --git a/configd/src/apps/sentinel/sentinel-tester.sh b/configd/src/apps/sentinel/sentinel-tester.sh
index 2c016d97107..f1c28a6f342 100755
--- a/configd/src/apps/sentinel/sentinel-tester.sh
+++ b/configd/src/apps/sentinel/sentinel-tester.sh
@@ -1,4 +1,4 @@
 #!/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.
 sleep 1
 kill -SEGV $$
diff --git a/configd/src/apps/sentinel/sentinel.cpp b/configd/src/apps/sentinel/sentinel.cpp
index 61aec8b3376..d557cc04993 100644
--- a/configd/src/apps/sentinel/sentinel.cpp
+++ b/configd/src/apps/sentinel/sentinel.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/config/common/exceptions.h>
 #include <signal.h>
diff --git a/configd/src/apps/sentinel/service.cpp b/configd/src/apps/sentinel/service.cpp
index 78aa618f01f..dc62d687007 100644
--- a/configd/src/apps/sentinel/service.cpp
+++ b/configd/src/apps/sentinel/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 <sys/types.h>
 #include <signal.h>
 #include <errno.h>
diff --git a/configd/src/apps/sentinel/service.h b/configd/src/apps/sentinel/service.h
index d6bdbadd8f6..ad391d3680f 100644
--- a/configd/src/apps/sentinel/service.h
+++ b/configd/src/apps/sentinel/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 <vespa/vespalib/stllike/string.h>
diff --git a/configd/src/apps/sentinel/state-api.cpp b/configd/src/apps/sentinel/state-api.cpp
index 56df10908f2..81efdfda050 100644
--- a/configd/src/apps/sentinel/state-api.cpp
+++ b/configd/src/apps/sentinel/state-api.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 "state-api.h"
 #include <vespa/vespalib/util/host_name.h>
diff --git a/configd/src/apps/sentinel/state-api.h b/configd/src/apps/sentinel/state-api.h
index 879563b79a5..59e614a26cc 100644
--- a/configd/src/apps/sentinel/state-api.h
+++ b/configd/src/apps/sentinel/state-api.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
 
diff --git a/configd/src/apps/su/CMakeLists.txt b/configd/src/apps/su/CMakeLists.txt
index e06db1da341..72502e9dc5e 100644
--- a/configd/src/apps/su/CMakeLists.txt
+++ b/configd/src/apps/su/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(configd_vespa-run-as-vespa-user_app
     SOURCES
     main.cpp
diff --git a/configd/src/apps/su/main.cpp b/configd/src/apps/su/main.cpp
index c1cebd56c29..ab6cd919138 100644
--- a/configd/src/apps/su/main.cpp
+++ b/configd/src/apps/su/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 <stdio.h>
 #include <unistd.h>
diff --git a/configd/src/tests/configd/CMakeLists.txt b/configd/src/tests/configd/CMakeLists.txt
index 39f140296c1..59f87a30390 100644
--- a/configd/src/tests/configd/CMakeLists.txt
+++ b/configd/src/tests/configd/CMakeLists.txt
@@ -1,2 +1,2 @@
-# 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.
 add_test(NAME configd_configd_test COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/run-sentinel.sh)
diff --git a/configd/src/tests/configd/run-sentinel.sh b/configd/src/tests/configd/run-sentinel.sh
index 32aa9e62f52..e257a41c829 100755
--- a/configd/src/tests/configd/run-sentinel.sh
+++ b/configd/src/tests/configd/run-sentinel.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 ../../apps/sentinel/vespa-config-sentinel > tmp.log 2>&1 ; then
diff --git a/configd/src/tests/messages/CMakeLists.txt b/configd/src/tests/messages/CMakeLists.txt
index a7aef4d2a5f..400e47e0fe9 100644
--- a/configd/src/tests/messages/CMakeLists.txt
+++ b/configd/src/tests/messages/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(configd_messages_test_app TEST
     SOURCES
     messages.cpp
diff --git a/configd/src/tests/messages/messages.cpp b/configd/src/tests/messages/messages.cpp
index c86fb4e5103..a8b2e37af36 100644
--- a/configd/src/tests/messages/messages.cpp
+++ b/configd/src/tests/messages/messages.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/vespalib/testkit/testapp.h>
 
-- 
cgit v1.2.3