Update 2017 copyright notices.

37 files changed, 37 insertions, 37 deletions

diff --git a/fbench/CMakeLists.txt b/fbench/CMakeLists.txt
index 3da632d98a6..77d0a5e9080 100644
--- a/fbench/CMakeLists.txt
+++ b/fbench/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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_define_module(
     DEPENDS
     fastos
diff --git a/fbench/src/fbench/CMakeLists.txt b/fbench/src/fbench/CMakeLists.txt
index 8c50d55a172..99f8eaa3126 100644
--- a/fbench/src/fbench/CMakeLists.txt
+++ b/fbench/src/fbench/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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fbench_app
     SOURCES
     client.cpp
diff --git a/fbench/src/fbench/client.cpp b/fbench/src/fbench/client.cpp
index 108d44e2b9b..f3e6fba2cf1 100644
--- a/fbench/src/fbench/client.cpp
+++ b/fbench/src/fbench/client.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "client.h"
 #include <util/timer.h>
diff --git a/fbench/src/fbench/client.h b/fbench/src/fbench/client.h
index 3349a112fa2..f2f354a35fb 100644
--- a/fbench/src/fbench/client.h
+++ b/fbench/src/fbench/client.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <fstream>
diff --git a/fbench/src/fbench/description.html b/fbench/src/fbench/description.html
index 007b04fedda..b6876a6d1bc 100644
--- a/fbench/src/fbench/description.html
+++ b/fbench/src/fbench/description.html
@@ -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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 The actual benchmarking program.
diff --git a/fbench/src/fbench/fbench.cpp b/fbench/src/fbench/fbench.cpp
index 1ba49e9897a..92facaa3cae 100644
--- a/fbench/src/fbench/fbench.cpp
+++ b/fbench/src/fbench/fbench.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "fbench.h"
 #include "client.h"
diff --git a/fbench/src/fbench/fbench.h b/fbench/src/fbench/fbench.h
index ffceabd0f2b..d157cf26aff 100644
--- a/fbench/src/fbench/fbench.h
+++ b/fbench/src/fbench/fbench.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <vector>
diff --git a/fbench/src/filterfile/CMakeLists.txt b/fbench/src/filterfile/CMakeLists.txt
index f1480b4c81d..5774bdcf009 100644
--- a/fbench/src/filterfile/CMakeLists.txt
+++ b/fbench/src/filterfile/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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fbench_filterfile_app
     SOURCES
     filterfile.cpp
diff --git a/fbench/src/filterfile/description.html b/fbench/src/filterfile/description.html
index 27f71cd30a4..82bdabbcebf 100644
--- a/fbench/src/filterfile/description.html
+++ b/fbench/src/filterfile/description.html
@@ -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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 Program used to extract query urls from fastserver logs.
diff --git a/fbench/src/filterfile/filterfile.cpp b/fbench/src/filterfile/filterfile.cpp
index 74d00ecf2b9..446a4ae2429 100644
--- a/fbench/src/filterfile/filterfile.cpp
+++ b/fbench/src/filterfile/filterfile.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <util/filereader.h>
 #include <iostream>
 #include <string.h>
diff --git a/fbench/src/geturl/CMakeLists.txt b/fbench/src/geturl/CMakeLists.txt
index a536a92ce57..9468e147b44 100644
--- a/fbench/src/geturl/CMakeLists.txt
+++ b/fbench/src/geturl/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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fbench_geturl_app
     SOURCES
     geturl.cpp
diff --git a/fbench/src/geturl/description.html b/fbench/src/geturl/description.html
index 894f1df8d0b..7851fb117d2 100644
--- a/fbench/src/geturl/description.html
+++ b/fbench/src/geturl/description.html
@@ -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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 Program used to fetch the content of an URL.
diff --git a/fbench/src/geturl/geturl.cpp b/fbench/src/geturl/geturl.cpp
index 868d33f30a9..955fc0d578d 100644
--- a/fbench/src/geturl/geturl.cpp
+++ b/fbench/src/geturl/geturl.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/net/crypto_engine.h>
 #include <httpclient/httpclient.h>
diff --git a/fbench/src/httpclient/CMakeLists.txt b/fbench/src/httpclient/CMakeLists.txt
index a28f3666383..163a68f9c98 100644
--- a/fbench/src/httpclient/CMakeLists.txt
+++ b/fbench/src/httpclient/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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(fbench_httpclient STATIC
     SOURCES
     httpclient.cpp
diff --git a/fbench/src/httpclient/httpclient.cpp b/fbench/src/httpclient/httpclient.cpp
index ea10ff14269..36525be8d7b 100644
--- a/fbench/src/httpclient/httpclient.cpp
+++ b/fbench/src/httpclient/httpclient.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "httpclient.h"
 #include <vespa/vespalib/net/socket_spec.h>
 #include <vespa/vespalib/util/size_literals.h>
diff --git a/fbench/src/httpclient/httpclient.h b/fbench/src/httpclient/httpclient.h
index 5b96daa2441..da04378b38f 100644
--- a/fbench/src/httpclient/httpclient.h
+++ b/fbench/src/httpclient/httpclient.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <ostream>
diff --git a/fbench/src/splitfile/CMakeLists.txt b/fbench/src/splitfile/CMakeLists.txt
index 6a9456b652f..6efbb87adf5 100644
--- a/fbench/src/splitfile/CMakeLists.txt
+++ b/fbench/src/splitfile/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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fbench_splitfile_app
     SOURCES
     splitfile.cpp
diff --git a/fbench/src/splitfile/description.html b/fbench/src/splitfile/description.html
index ba0891d10e1..0d44987a651 100644
--- a/fbench/src/splitfile/description.html
+++ b/fbench/src/splitfile/description.html
@@ -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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 Program used to split query url files.
diff --git a/fbench/src/splitfile/splitfile.cpp b/fbench/src/splitfile/splitfile.cpp
index ef85a59020d..abf42f0e9ba 100644
--- a/fbench/src/splitfile/splitfile.cpp
+++ b/fbench/src/splitfile/splitfile.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <util/filereader.h>
 #include <fstream>
 #include <vector>
diff --git a/fbench/src/test/CMakeLists.txt b/fbench/src/test/CMakeLists.txt
index 63d2aa617cf..d13b6b82a81 100644
--- a/fbench/src/test/CMakeLists.txt
+++ b/fbench/src/test/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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_executable(fbench_httpclient_splitstring_app TEST
     SOURCES
     httpclient_splitstring.cpp
diff --git a/fbench/src/test/clientstatus.cpp b/fbench/src/test/clientstatus.cpp
index c8b7bce1a34..72b71fda48e 100644
--- a/fbench/src/test/clientstatus.cpp
+++ b/fbench/src/test/clientstatus.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <util/timer.h>
 #include <util/clientstatus.h>
 #include <fbench/client.h>
diff --git a/fbench/src/test/filereader.cpp b/fbench/src/test/filereader.cpp
index d01c42fab6f..61bbca0f9d3 100644
--- a/fbench/src/test/filereader.cpp
+++ b/fbench/src/test/filereader.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <util/filereader.h>
 #include <string.h>
 #include <cassert>
diff --git a/fbench/src/test/httpclient.cpp b/fbench/src/test/httpclient.cpp
index 5d11663f1da..271f95fa2c2 100644
--- a/fbench/src/test/httpclient.cpp
+++ b/fbench/src/test/httpclient.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/net/crypto_engine.h>
 #include <httpclient/httpclient.h>
diff --git a/fbench/src/test/httpclient_splitstring.cpp b/fbench/src/test/httpclient_splitstring.cpp
index 4f3e0027db0..53f076609c7 100644
--- a/fbench/src/test/httpclient_splitstring.cpp
+++ b/fbench/src/test/httpclient_splitstring.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/net/crypto_engine.h>
 #include <httpclient/httpclient.h>
diff --git a/fbench/src/util/CMakeLists.txt b/fbench/src/util/CMakeLists.txt
index 3cdff26ce16..c0b0a0870c3 100644
--- a/fbench/src/util/CMakeLists.txt
+++ b/fbench/src/util/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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(fbench_util STATIC
     SOURCES
     authority.cpp
diff --git a/fbench/src/util/clientstatus.cpp b/fbench/src/util/clientstatus.cpp
index 6ef188da201..35086fd84dc 100644
--- a/fbench/src/util/clientstatus.cpp
+++ b/fbench/src/util/clientstatus.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "clientstatus.h"
 #include <cstring>
 #include <cmath>
diff --git a/fbench/src/util/clientstatus.h b/fbench/src/util/clientstatus.h
index f8a223e121a..89589ef75e9 100644
--- a/fbench/src/util/clientstatus.h
+++ b/fbench/src/util/clientstatus.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <map>
diff --git a/fbench/src/util/description.html b/fbench/src/util/description.html
index 37e80a0c3f7..2763b710459 100644
--- a/fbench/src/util/description.html
+++ b/fbench/src/util/description.html
@@ -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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 Library containing utility classes.
diff --git a/fbench/src/util/filereader.cpp b/fbench/src/util/filereader.cpp
index 9a48f6442a3..71c1b5ae703 100644
--- a/fbench/src/util/filereader.cpp
+++ b/fbench/src/util/filereader.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "filereader.h"
 #include <iostream>
 #include <unistd.h>
diff --git a/fbench/src/util/filereader.h b/fbench/src/util/filereader.h
index 5a4f6886d34..96fae6d2858 100644
--- a/fbench/src/util/filereader.h
+++ b/fbench/src/util/filereader.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <fstream>
diff --git a/fbench/src/util/timer.cpp b/fbench/src/util/timer.cpp
index 22c2a781704..40b0e713bda 100644
--- a/fbench/src/util/timer.cpp
+++ b/fbench/src/util/timer.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "timer.h"
 #include <stdio.h>
 #include <thread>
diff --git a/fbench/src/util/timer.h b/fbench/src/util/timer.h
index 6e4d5dafc97..12aa28e9247 100644
--- a/fbench/src/util/timer.h
+++ b/fbench/src/util/timer.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <chrono>
diff --git a/fbench/util/plot.pl b/fbench/util/plot.pl
index ca25bd66d4b..45311d9f97c 100755
--- a/fbench/util/plot.pl
+++ b/fbench/util/plot.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -s
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # TODO
 # 	- parameter for input and output file name
diff --git a/fbench/util/pretest.sh b/fbench/util/pretest.sh
index 756a72e7c5f..1bf2a0372f8 100755
--- a/fbench/util/pretest.sh
+++ b/fbench/util/pretest.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #
 # This script will be run by the 'runtests.sh' script before
diff --git a/fbench/util/resultfilter.pl b/fbench/util/resultfilter.pl
index 4c0f885b591..f66aed42dc3 100755
--- a/fbench/util/resultfilter.pl
+++ b/fbench/util/resultfilter.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # This script converts an fbench summary report read from stdin to a
 # single line containing only the numerical values written to
diff --git a/fbench/util/runtests.sh b/fbench/util/runtests.sh
index dd18fd6d9b4..1c5c7583e6e 100755
--- a/fbench/util/runtests.sh
+++ b/fbench/util/runtests.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 Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 opt_o=false
 opt_l=false
diff --git a/fbench/util/separate.pl b/fbench/util/separate.pl
index a164b196ae7..418733bde7c 100755
--- a/fbench/util/separate.pl
+++ b/fbench/util/separate.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 $sepcol = shift;