aboutsummaryrefslogtreecommitdiffstats
path: root/fsa
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-06-13 18:43:39 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-06-13 18:43:39 +0200
commit4e5d87a9baa4176a1089f7afd1f433a8da275725 (patch)
tree23f2b54901b81b5c56dbf4a8c064658985962ead /fsa
parent76221b9e73ad7a76a8179663e638b545a470c325 (diff)
Copyright header
Diffstat (limited to 'fsa')
-rw-r--r--fsa/CMakeLists.txt2
-rw-r--r--fsa/TODO7
-rw-r--r--fsa/doc/Doxyfile2
-rw-r--r--fsa/doc/docbook/fsadump.xml2
-rw-r--r--fsa/doc/docbook/fsainfo.xml2
-rw-r--r--fsa/doc/docbook/makefsa.xml2
-rw-r--r--fsa/doc/fsa_file_format.html2
-rw-r--r--fsa/pom.xml2
-rw-r--r--fsa/queryproc/count_plain_grams.cpp2
-rw-r--r--fsa/queryproc/count_sorted_grams.cpp2
-rw-r--r--fsa/queryproc/p2s_ratio.cpp2
-rw-r--r--fsa/queryproc/permute_query.cpp2
-rw-r--r--fsa/queryproc/sort_grams.cpp2
-rw-r--r--fsa/src/alltest/CMakeLists.txt2
-rwxr-xr-xfsa/src/alltest/alltest.sh1
-rw-r--r--fsa/src/alltest/conceptnet_test.cpp2
-rw-r--r--fsa/src/alltest/detector_test.cpp2
-rwxr-xr-xfsa/src/alltest/detector_test.sh1
-rw-r--r--fsa/src/alltest/fsa_create_test.cpp2
-rw-r--r--fsa/src/alltest/fsa_perftest.cpp2
-rw-r--r--fsa/src/alltest/fsa_test.cpp2
-rwxr-xr-xfsa/src/alltest/fsa_test.sh1
-rw-r--r--fsa/src/alltest/fsamanager_test.cpp2
-rw-r--r--fsa/src/alltest/lookup_test.cpp2
-rwxr-xr-xfsa/src/alltest/lookup_test.sh1
-rw-r--r--fsa/src/alltest/ngram_test.cpp2
-rwxr-xr-xfsa/src/alltest/ngram_test.sh1
-rw-r--r--fsa/src/alltest/segmenter_test.cpp2
-rwxr-xr-xfsa/src/alltest/segmenter_test.sh1
-rw-r--r--fsa/src/alltest/vectorizer_perftest.cpp2
-rw-r--r--fsa/src/alltest/vectorizer_test.cpp2
-rwxr-xr-xfsa/src/alltest/vectorizer_test.sh1
-rw-r--r--fsa/src/apps/fsadump/CMakeLists.txt2
-rw-r--r--fsa/src/apps/fsadump/fsadump.cpp2
-rw-r--r--fsa/src/apps/fsainfo/CMakeLists.txt2
-rw-r--r--fsa/src/apps/fsainfo/fsainfo.cpp2
-rw-r--r--fsa/src/apps/makefsa/CMakeLists.txt2
-rw-r--r--fsa/src/apps/makefsa/makefsa.cpp2
-rw-r--r--fsa/src/libfsa/automaton-alternate.h2
-rw-r--r--fsa/src/main/java/com/yahoo/fsa/FSA.java2
-rw-r--r--fsa/src/main/java/com/yahoo/fsa/MetaData.java2
-rw-r--r--fsa/src/main/java/com/yahoo/fsa/conceptnet/ConceptNet.java2
-rw-r--r--fsa/src/main/java/com/yahoo/fsa/package-info.java2
-rw-r--r--fsa/src/main/java/com/yahoo/fsa/segmenter/Segment.java2
-rw-r--r--fsa/src/main/java/com/yahoo/fsa/segmenter/Segmenter.java2
-rw-r--r--fsa/src/main/java/com/yahoo/fsa/segmenter/Segments.java2
-rw-r--r--fsa/src/main/java/com/yahoo/fsa/topicpredictor/PredictedTopic.java2
-rw-r--r--fsa/src/main/java/com/yahoo/fsa/topicpredictor/TopicPredictor.java2
-rw-r--r--fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java2
-rw-r--r--fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java2
-rw-r--r--fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java2
-rw-r--r--fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java2
-rwxr-xr-xfsa/src/util/cn_txt2xml1
-rwxr-xr-xfsa/src/util/cn_xml2dat1
-rw-r--r--fsa/src/vespa/fsa/CMakeLists.txt2
-rw-r--r--fsa/src/vespa/fsa/automaton-alternate.cpp2
-rw-r--r--fsa/src/vespa/fsa/automaton.cpp2
-rw-r--r--fsa/src/vespa/fsa/automaton.h2
-rw-r--r--fsa/src/vespa/fsa/base64.cpp2
-rw-r--r--fsa/src/vespa/fsa/base64.h2
-rw-r--r--fsa/src/vespa/fsa/blob.cpp2
-rw-r--r--fsa/src/vespa/fsa/blob.h2
-rw-r--r--fsa/src/vespa/fsa/checksum.h2
-rw-r--r--fsa/src/vespa/fsa/conceptnet.cpp2
-rw-r--r--fsa/src/vespa/fsa/conceptnet.h2
-rw-r--r--fsa/src/vespa/fsa/detector.cpp2
-rw-r--r--fsa/src/vespa/fsa/detector.h2
-rw-r--r--fsa/src/vespa/fsa/file.h2
-rw-r--r--fsa/src/vespa/fsa/fsa.cpp2
-rw-r--r--fsa/src/vespa/fsa/fsa.h2
-rw-r--r--fsa/src/vespa/fsa/metadata.cpp2
-rw-r--r--fsa/src/vespa/fsa/metadata.h2
-rw-r--r--fsa/src/vespa/fsa/ngram.cpp2
-rw-r--r--fsa/src/vespa/fsa/ngram.h2
-rw-r--r--fsa/src/vespa/fsa/permuter.cpp2
-rw-r--r--fsa/src/vespa/fsa/permuter.h2
-rw-r--r--fsa/src/vespa/fsa/segmenter.cpp2
-rw-r--r--fsa/src/vespa/fsa/segmenter.h2
-rw-r--r--fsa/src/vespa/fsa/selector.cpp2
-rw-r--r--fsa/src/vespa/fsa/selector.h2
-rw-r--r--fsa/src/vespa/fsa/timestamp.h2
-rw-r--r--fsa/src/vespa/fsa/tokenizer.h2
-rw-r--r--fsa/src/vespa/fsa/unicode.cpp2
-rw-r--r--fsa/src/vespa/fsa/unicode.h2
-rw-r--r--fsa/src/vespa/fsa/unicode_charprops.cpp2
-rw-r--r--fsa/src/vespa/fsa/unicode_lowercase.cpp2
-rw-r--r--fsa/src/vespa/fsa/unicode_tables.cpp2
-rw-r--r--fsa/src/vespa/fsa/vectorizer.cpp2
-rw-r--r--fsa/src/vespa/fsa/vectorizer.h2
-rw-r--r--fsa/src/vespa/fsa/wordchartokenizer.cpp2
-rw-r--r--fsa/src/vespa/fsa/wordchartokenizer.h2
-rw-r--r--fsa/src/vespa/fsamanagers/CMakeLists.txt2
-rw-r--r--fsa/src/vespa/fsamanagers/conceptnethandle.h2
-rw-r--r--fsa/src/vespa/fsamanagers/conceptnetmanager.cpp2
-rw-r--r--fsa/src/vespa/fsamanagers/conceptnetmanager.h2
-rw-r--r--fsa/src/vespa/fsamanagers/fsahandle.h2
-rw-r--r--fsa/src/vespa/fsamanagers/fsamanager.cpp2
-rw-r--r--fsa/src/vespa/fsamanagers/fsamanager.h2
-rw-r--r--fsa/src/vespa/fsamanagers/metadatahandle.h2
-rw-r--r--fsa/src/vespa/fsamanagers/metadatamanager.cpp2
-rw-r--r--fsa/src/vespa/fsamanagers/metadatamanager.h2
-rw-r--r--fsa/src/vespa/fsamanagers/mutex.cpp2
-rw-r--r--fsa/src/vespa/fsamanagers/mutex.h2
-rw-r--r--fsa/src/vespa/fsamanagers/refcountable.h2
-rw-r--r--fsa/src/vespa/fsamanagers/rwlock.cpp2
-rw-r--r--fsa/src/vespa/fsamanagers/rwlock.h2
-rw-r--r--fsa/src/vespa/fsamanagers/singleton.cpp2
-rw-r--r--fsa/src/vespa/fsamanagers/singleton.h2
108 files changed, 107 insertions, 105 deletions
diff --git a/fsa/CMakeLists.txt b/fsa/CMakeLists.txt
index 7b621a6f111..ea6e0f140aa 100644
--- a/fsa/CMakeLists.txt
+++ b/fsa/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_define_module(
LIBS
src/vespa/fsa
diff --git a/fsa/TODO b/fsa/TODO
deleted file mode 100644
index 7244fc3f002..00000000000
--- a/fsa/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-* Improve performance of traversing fsa (iterator) by limiting the number of
- possible transitions which need to be checked.
-
-* Extend makefsa -v (verbose) option to include statistics (memory usage etc.)
-
-* Make memory consumption and allocation strategy in Automaton more efficient.
-
diff --git a/fsa/doc/Doxyfile b/fsa/doc/Doxyfile
index 6b47c186cb4..8bb7411ac2e 100644
--- a/fsa/doc/Doxyfile
+++ b/fsa/doc/Doxyfile
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
# Doxyfile 1.3.5
# This file describes the settings to be used by the documentation system
diff --git a/fsa/doc/docbook/fsadump.xml b/fsa/doc/docbook/fsadump.xml
index c4a72a157a2..0d3b5bf479d 100644
--- a/fsa/doc/docbook/fsadump.xml
+++ b/fsa/doc/docbook/fsadump.xml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<refentry id="fsadump">
<refmeta>
diff --git a/fsa/doc/docbook/fsainfo.xml b/fsa/doc/docbook/fsainfo.xml
index d0315b112ba..073ed75385c 100644
--- a/fsa/doc/docbook/fsainfo.xml
+++ b/fsa/doc/docbook/fsainfo.xml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<refentry id="fsainfo">
<refmeta>
diff --git a/fsa/doc/docbook/makefsa.xml b/fsa/doc/docbook/makefsa.xml
index 4673b06f78d..0a76f61fe4f 100644
--- a/fsa/doc/docbook/makefsa.xml
+++ b/fsa/doc/docbook/makefsa.xml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<refentry id="makefsa">
<refmeta>
diff --git a/fsa/doc/fsa_file_format.html b/fsa/doc/fsa_file_format.html
index 077edd627c3..b86328fc8b9 100644
--- a/fsa/doc/fsa_file_format.html
+++ b/fsa/doc/fsa_file_format.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<html>
<head>
<title>fsa file format</title>
diff --git a/fsa/pom.xml b/fsa/pom.xml
index 98ad9083e7e..a49845105cf 100644
--- a/fsa/pom.xml
+++ b/fsa/pom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. 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 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/fsa/queryproc/count_plain_grams.cpp b/fsa/queryproc/count_plain_grams.cpp
index 197c958149b..ef400db9bc4 100644
--- a/fsa/queryproc/count_plain_grams.cpp
+++ b/fsa/queryproc/count_plain_grams.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <iostream>
#include <iomanip>
#include <map>
diff --git a/fsa/queryproc/count_sorted_grams.cpp b/fsa/queryproc/count_sorted_grams.cpp
index 58be4548fac..cd047633e72 100644
--- a/fsa/queryproc/count_sorted_grams.cpp
+++ b/fsa/queryproc/count_sorted_grams.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <iostream>
#include <iomanip>
#include <map>
diff --git a/fsa/queryproc/p2s_ratio.cpp b/fsa/queryproc/p2s_ratio.cpp
index cbc61c45d53..830985813a8 100644
--- a/fsa/queryproc/p2s_ratio.cpp
+++ b/fsa/queryproc/p2s_ratio.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <iostream>
#include <iomanip>
#include <map>
diff --git a/fsa/queryproc/permute_query.cpp b/fsa/queryproc/permute_query.cpp
index 7645e864a44..304ff262508 100644
--- a/fsa/queryproc/permute_query.cpp
+++ b/fsa/queryproc/permute_query.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <iostream>
#include <iomanip>
diff --git a/fsa/queryproc/sort_grams.cpp b/fsa/queryproc/sort_grams.cpp
index 427dba129ff..764ccf09ce0 100644
--- a/fsa/queryproc/sort_grams.cpp
+++ b/fsa/queryproc/sort_grams.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <iostream>
#include <iomanip>
diff --git a/fsa/src/alltest/CMakeLists.txt b/fsa/src/alltest/CMakeLists.txt
index d4b4c2bbd3e..667920c6a23 100644
--- a/fsa/src/alltest/CMakeLists.txt
+++ b/fsa/src/alltest/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(fsa_conceptnet_test_app
SOURCES
conceptnet_test.cpp
diff --git a/fsa/src/alltest/alltest.sh b/fsa/src/alltest/alltest.sh
index 4a252e4bca0..e04dae481ea 100755
--- a/fsa/src/alltest/alltest.sh
+++ b/fsa/src/alltest/alltest.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
set -e
if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/fsa/src/alltest/conceptnet_test.cpp b/fsa/src/alltest/conceptnet_test.cpp
index 38c020aa511..157903fcd4e 100644
--- a/fsa/src/alltest/conceptnet_test.cpp
+++ b/fsa/src/alltest/conceptnet_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
diff --git a/fsa/src/alltest/detector_test.cpp b/fsa/src/alltest/detector_test.cpp
index 35307b9054e..1cd40f17e4f 100644
--- a/fsa/src/alltest/detector_test.cpp
+++ b/fsa/src/alltest/detector_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/alltest/detector_test.sh b/fsa/src/alltest/detector_test.sh
index a712e313b0f..dd87feeab19 100755
--- a/fsa/src/alltest/detector_test.sh
+++ b/fsa/src/alltest/detector_test.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
set -e
if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/fsa/src/alltest/fsa_create_test.cpp b/fsa/src/alltest/fsa_create_test.cpp
index c72ea900aad..3bae88eb66f 100644
--- a/fsa/src/alltest/fsa_create_test.cpp
+++ b/fsa/src/alltest/fsa_create_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <iostream>
#include <vespa/fsa/fsa.h>
diff --git a/fsa/src/alltest/fsa_perftest.cpp b/fsa/src/alltest/fsa_perftest.cpp
index 90d2c042b07..ab2332f4ed2 100644
--- a/fsa/src/alltest/fsa_perftest.cpp
+++ b/fsa/src/alltest/fsa_perftest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <stdlib.h>
#include <iostream>
diff --git a/fsa/src/alltest/fsa_test.cpp b/fsa/src/alltest/fsa_test.cpp
index 5bc95f20430..e505765cfd9 100644
--- a/fsa/src/alltest/fsa_test.cpp
+++ b/fsa/src/alltest/fsa_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
diff --git a/fsa/src/alltest/fsa_test.sh b/fsa/src/alltest/fsa_test.sh
index 7969df745e8..3995e949d7e 100755
--- a/fsa/src/alltest/fsa_test.sh
+++ b/fsa/src/alltest/fsa_test.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
set -e
if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/fsa/src/alltest/fsamanager_test.cpp b/fsa/src/alltest/fsamanager_test.cpp
index 7ca4a2d8e8a..aee97432347 100644
--- a/fsa/src/alltest/fsamanager_test.cpp
+++ b/fsa/src/alltest/fsamanager_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/fsa/fsa.h>
#include <vespa/fsamanagers/fsamanager.h>
diff --git a/fsa/src/alltest/lookup_test.cpp b/fsa/src/alltest/lookup_test.cpp
index 6ff4e3063d4..dcb570f09a2 100644
--- a/fsa/src/alltest/lookup_test.cpp
+++ b/fsa/src/alltest/lookup_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <stdlib.h>
#include <iostream>
diff --git a/fsa/src/alltest/lookup_test.sh b/fsa/src/alltest/lookup_test.sh
index 2f633ea9c74..89ff97224d0 100755
--- a/fsa/src/alltest/lookup_test.sh
+++ b/fsa/src/alltest/lookup_test.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
set -e
if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/fsa/src/alltest/ngram_test.cpp b/fsa/src/alltest/ngram_test.cpp
index 7f0be7769e1..7ad01ca2e8f 100644
--- a/fsa/src/alltest/ngram_test.cpp
+++ b/fsa/src/alltest/ngram_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <iostream>
#include <vespa/fsa/permuter.h>
diff --git a/fsa/src/alltest/ngram_test.sh b/fsa/src/alltest/ngram_test.sh
index cc3ccb83b0f..59d6d7f2db0 100755
--- a/fsa/src/alltest/ngram_test.sh
+++ b/fsa/src/alltest/ngram_test.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
set -e
if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/fsa/src/alltest/segmenter_test.cpp b/fsa/src/alltest/segmenter_test.cpp
index 3b80fe3390e..b0903596954 100644
--- a/fsa/src/alltest/segmenter_test.cpp
+++ b/fsa/src/alltest/segmenter_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/alltest/segmenter_test.sh b/fsa/src/alltest/segmenter_test.sh
index 5b8f73b30f8..be98ada0e24 100755
--- a/fsa/src/alltest/segmenter_test.sh
+++ b/fsa/src/alltest/segmenter_test.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
set -e
if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/fsa/src/alltest/vectorizer_perftest.cpp b/fsa/src/alltest/vectorizer_perftest.cpp
index 582652ec66d..4772dcde5df 100644
--- a/fsa/src/alltest/vectorizer_perftest.cpp
+++ b/fsa/src/alltest/vectorizer_perftest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/alltest/vectorizer_test.cpp b/fsa/src/alltest/vectorizer_test.cpp
index e3bcf236455..b040c56d3ef 100644
--- a/fsa/src/alltest/vectorizer_test.cpp
+++ b/fsa/src/alltest/vectorizer_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/alltest/vectorizer_test.sh b/fsa/src/alltest/vectorizer_test.sh
index 5e482935da1..543646f833a 100755
--- a/fsa/src/alltest/vectorizer_test.sh
+++ b/fsa/src/alltest/vectorizer_test.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
set -e
if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/fsa/src/apps/fsadump/CMakeLists.txt b/fsa/src/apps/fsadump/CMakeLists.txt
index cd9113be3dd..eea10a89d75 100644
--- a/fsa/src/apps/fsadump/CMakeLists.txt
+++ b/fsa/src/apps/fsadump/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(fsa_fsadump_app
SOURCES
fsadump.cpp
diff --git a/fsa/src/apps/fsadump/fsadump.cpp b/fsa/src/apps/fsadump/fsadump.cpp
index a713b5dd30f..9e488d5bb74 100644
--- a/fsa/src/apps/fsadump/fsadump.cpp
+++ b/fsa/src/apps/fsadump/fsadump.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/fsa/src/apps/fsainfo/CMakeLists.txt b/fsa/src/apps/fsainfo/CMakeLists.txt
index 30d9c173d7f..d6165a6b314 100644
--- a/fsa/src/apps/fsainfo/CMakeLists.txt
+++ b/fsa/src/apps/fsainfo/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(fsa_fsainfo_app
SOURCES
fsainfo.cpp
diff --git a/fsa/src/apps/fsainfo/fsainfo.cpp b/fsa/src/apps/fsainfo/fsainfo.cpp
index efbe6075331..31b23c17401 100644
--- a/fsa/src/apps/fsainfo/fsainfo.cpp
+++ b/fsa/src/apps/fsainfo/fsainfo.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/fsa/src/apps/makefsa/CMakeLists.txt b/fsa/src/apps/makefsa/CMakeLists.txt
index 60231e01591..f31deff3af5 100644
--- a/fsa/src/apps/makefsa/CMakeLists.txt
+++ b/fsa/src/apps/makefsa/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(fsa_makefsa_app
SOURCES
makefsa.cpp
diff --git a/fsa/src/apps/makefsa/makefsa.cpp b/fsa/src/apps/makefsa/makefsa.cpp
index b27485a851e..59b7e2c27d0 100644
--- a/fsa/src/apps/makefsa/makefsa.cpp
+++ b/fsa/src/apps/makefsa/makefsa.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/fsa/src/libfsa/automaton-alternate.h b/fsa/src/libfsa/automaton-alternate.h
index 20cc8f933eb..535b0f16014 100644
--- a/fsa/src/libfsa/automaton-alternate.h
+++ b/fsa/src/libfsa/automaton-alternate.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/main/java/com/yahoo/fsa/FSA.java b/fsa/src/main/java/com/yahoo/fsa/FSA.java
index da013cc4dce..a4ec93286c4 100644
--- a/fsa/src/main/java/com/yahoo/fsa/FSA.java
+++ b/fsa/src/main/java/com/yahoo/fsa/FSA.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa;
import java.io.FileInputStream;
diff --git a/fsa/src/main/java/com/yahoo/fsa/MetaData.java b/fsa/src/main/java/com/yahoo/fsa/MetaData.java
index fde868464c8..a4b69d5abc2 100644
--- a/fsa/src/main/java/com/yahoo/fsa/MetaData.java
+++ b/fsa/src/main/java/com/yahoo/fsa/MetaData.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa;
import java.io.FileInputStream;
diff --git a/fsa/src/main/java/com/yahoo/fsa/conceptnet/ConceptNet.java b/fsa/src/main/java/com/yahoo/fsa/conceptnet/ConceptNet.java
index 13cb93073d2..b72e27152c6 100644
--- a/fsa/src/main/java/com/yahoo/fsa/conceptnet/ConceptNet.java
+++ b/fsa/src/main/java/com/yahoo/fsa/conceptnet/ConceptNet.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa.conceptnet;
import java.io.FileInputStream;
diff --git a/fsa/src/main/java/com/yahoo/fsa/package-info.java b/fsa/src/main/java/com/yahoo/fsa/package-info.java
index 94c7fd30603..2fc4a520154 100644
--- a/fsa/src/main/java/com/yahoo/fsa/package-info.java
+++ b/fsa/src/main/java/com/yahoo/fsa/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
@ExportPackage
@PublicApi
package com.yahoo.fsa;
diff --git a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segment.java b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segment.java
index 1e424372a66..97453d97c6d 100644
--- a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segment.java
+++ b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segment.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa.segmenter;
/**
diff --git a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segmenter.java b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segmenter.java
index 80ccd791644..64c20e38b55 100644
--- a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segmenter.java
+++ b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segmenter.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa.segmenter;
import java.util.LinkedList;
diff --git a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segments.java b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segments.java
index 26752046f80..6d7ee7be1a6 100644
--- a/fsa/src/main/java/com/yahoo/fsa/segmenter/Segments.java
+++ b/fsa/src/main/java/com/yahoo/fsa/segmenter/Segments.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa.segmenter;
import java.util.LinkedList;
diff --git a/fsa/src/main/java/com/yahoo/fsa/topicpredictor/PredictedTopic.java b/fsa/src/main/java/com/yahoo/fsa/topicpredictor/PredictedTopic.java
index 2dd0dcc9bb2..0610ee96ea6 100644
--- a/fsa/src/main/java/com/yahoo/fsa/topicpredictor/PredictedTopic.java
+++ b/fsa/src/main/java/com/yahoo/fsa/topicpredictor/PredictedTopic.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa.topicpredictor;
diff --git a/fsa/src/main/java/com/yahoo/fsa/topicpredictor/TopicPredictor.java b/fsa/src/main/java/com/yahoo/fsa/topicpredictor/TopicPredictor.java
index 177e879c6c8..f29dc38f2ce 100644
--- a/fsa/src/main/java/com/yahoo/fsa/topicpredictor/TopicPredictor.java
+++ b/fsa/src/main/java/com/yahoo/fsa/topicpredictor/TopicPredictor.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa.topicpredictor;
import java.util.logging.Logger;
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java
index 87dcda1cf94..c245bb25af9 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa.test;
import com.yahoo.fsa.FSA;
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java
index 6a2c8049f6e..97522a6634d 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa.test;
import com.yahoo.fsa.FSA;
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
index dfd221a5bf6..95b2b22b853 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa.test;
import com.yahoo.fsa.FSA;
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java
index 6a68c4c50f2..68ee5483b36 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.fsa.test;
import com.yahoo.fsa.FSA;
diff --git a/fsa/src/util/cn_txt2xml b/fsa/src/util/cn_txt2xml
index 9c439879af9..8662a869729 100755
--- a/fsa/src/util/cn_txt2xml
+++ b/fsa/src/util/cn_txt2xml
@@ -1,4 +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.
use strict;
diff --git a/fsa/src/util/cn_xml2dat b/fsa/src/util/cn_xml2dat
index 4394c201da8..e531a955ec5 100755
--- a/fsa/src/util/cn_xml2dat
+++ b/fsa/src/util/cn_xml2dat
@@ -1,4 +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.
use strict;
diff --git a/fsa/src/vespa/fsa/CMakeLists.txt b/fsa/src/vespa/fsa/CMakeLists.txt
index dff59686894..6b85538032e 100644
--- a/fsa/src/vespa/fsa/CMakeLists.txt
+++ b/fsa/src/vespa/fsa/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_library(fsa
SOURCES
automaton.cpp
diff --git a/fsa/src/vespa/fsa/automaton-alternate.cpp b/fsa/src/vespa/fsa/automaton-alternate.cpp
index c753ba9f844..4b3b8db2d93 100644
--- a/fsa/src/vespa/fsa/automaton-alternate.cpp
+++ b/fsa/src/vespa/fsa/automaton-alternate.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/fsa/src/vespa/fsa/automaton.cpp b/fsa/src/vespa/fsa/automaton.cpp
index dffca7739ff..4948eb868de 100644
--- a/fsa/src/vespa/fsa/automaton.cpp
+++ b/fsa/src/vespa/fsa/automaton.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/fsa/src/vespa/fsa/automaton.h b/fsa/src/vespa/fsa/automaton.h
index 089c7784a0d..18d56cd4291 100644
--- a/fsa/src/vespa/fsa/automaton.h
+++ b/fsa/src/vespa/fsa/automaton.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/base64.cpp b/fsa/src/vespa/fsa/base64.cpp
index f06fc445cc7..a5e418447d9 100644
--- a/fsa/src/vespa/fsa/base64.cpp
+++ b/fsa/src/vespa/fsa/base64.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/base64.h b/fsa/src/vespa/fsa/base64.h
index b0ada3b1bff..ce9acad9f5c 100644
--- a/fsa/src/vespa/fsa/base64.h
+++ b/fsa/src/vespa/fsa/base64.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/blob.cpp b/fsa/src/vespa/fsa/blob.cpp
index 3fd381b33fd..cd1ca9d50ab 100644
--- a/fsa/src/vespa/fsa/blob.cpp
+++ b/fsa/src/vespa/fsa/blob.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/blob.h b/fsa/src/vespa/fsa/blob.h
index 362b37eb48e..13eeb38141a 100644
--- a/fsa/src/vespa/fsa/blob.h
+++ b/fsa/src/vespa/fsa/blob.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/checksum.h b/fsa/src/vespa/fsa/checksum.h
index 0c685b27e0a..e0e0b7d09f8 100644
--- a/fsa/src/vespa/fsa/checksum.h
+++ b/fsa/src/vespa/fsa/checksum.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/09/20
diff --git a/fsa/src/vespa/fsa/conceptnet.cpp b/fsa/src/vespa/fsa/conceptnet.cpp
index da73003dee6..be2e098774a 100644
--- a/fsa/src/vespa/fsa/conceptnet.cpp
+++ b/fsa/src/vespa/fsa/conceptnet.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/10/01
diff --git a/fsa/src/vespa/fsa/conceptnet.h b/fsa/src/vespa/fsa/conceptnet.h
index 77c7a8b9e03..f082660ff18 100644
--- a/fsa/src/vespa/fsa/conceptnet.h
+++ b/fsa/src/vespa/fsa/conceptnet.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/10/01
diff --git a/fsa/src/vespa/fsa/detector.cpp b/fsa/src/vespa/fsa/detector.cpp
index 196d6908342..e5b68eb8e01 100644
--- a/fsa/src/vespa/fsa/detector.cpp
+++ b/fsa/src/vespa/fsa/detector.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/detector.h b/fsa/src/vespa/fsa/detector.h
index 62e54077519..59d653808fe 100644
--- a/fsa/src/vespa/fsa/detector.h
+++ b/fsa/src/vespa/fsa/detector.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/file.h b/fsa/src/vespa/fsa/file.h
index 414751e4849..973c316cd73 100644
--- a/fsa/src/vespa/fsa/file.h
+++ b/fsa/src/vespa/fsa/file.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2008/05/30
diff --git a/fsa/src/vespa/fsa/fsa.cpp b/fsa/src/vespa/fsa/fsa.cpp
index f3b7c774f8c..b7343704de4 100644
--- a/fsa/src/vespa/fsa/fsa.cpp
+++ b/fsa/src/vespa/fsa/fsa.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/fsa.h b/fsa/src/vespa/fsa/fsa.h
index 8bed0b5f8ba..621e4a03c2b 100644
--- a/fsa/src/vespa/fsa/fsa.h
+++ b/fsa/src/vespa/fsa/fsa.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/metadata.cpp b/fsa/src/vespa/fsa/metadata.cpp
index 2a9d511cc91..3233fb86d46 100644
--- a/fsa/src/vespa/fsa/metadata.cpp
+++ b/fsa/src/vespa/fsa/metadata.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/10/01
diff --git a/fsa/src/vespa/fsa/metadata.h b/fsa/src/vespa/fsa/metadata.h
index 132ecb1d157..cd43dd454b2 100644
--- a/fsa/src/vespa/fsa/metadata.h
+++ b/fsa/src/vespa/fsa/metadata.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/12/17
diff --git a/fsa/src/vespa/fsa/ngram.cpp b/fsa/src/vespa/fsa/ngram.cpp
index 050b9eff035..2c2dd74c8ac 100644
--- a/fsa/src/vespa/fsa/ngram.cpp
+++ b/fsa/src/vespa/fsa/ngram.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/ngram.h b/fsa/src/vespa/fsa/ngram.h
index 32f739e3533..fb76fb10b97 100644
--- a/fsa/src/vespa/fsa/ngram.h
+++ b/fsa/src/vespa/fsa/ngram.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/permuter.cpp b/fsa/src/vespa/fsa/permuter.cpp
index a0d472e59fd..c783deed68d 100644
--- a/fsa/src/vespa/fsa/permuter.cpp
+++ b/fsa/src/vespa/fsa/permuter.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/permuter.h b/fsa/src/vespa/fsa/permuter.h
index 15b016ab733..e264e2e99de 100644
--- a/fsa/src/vespa/fsa/permuter.h
+++ b/fsa/src/vespa/fsa/permuter.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/segmenter.cpp b/fsa/src/vespa/fsa/segmenter.cpp
index fc7d30e9a9b..fdeba5c2bd7 100644
--- a/fsa/src/vespa/fsa/segmenter.cpp
+++ b/fsa/src/vespa/fsa/segmenter.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/segmenter.h b/fsa/src/vespa/fsa/segmenter.h
index 74254639538..a2720c6de0c 100644
--- a/fsa/src/vespa/fsa/segmenter.h
+++ b/fsa/src/vespa/fsa/segmenter.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/09/13
diff --git a/fsa/src/vespa/fsa/selector.cpp b/fsa/src/vespa/fsa/selector.cpp
index b139a8ebaed..4f3d82c42f8 100644
--- a/fsa/src/vespa/fsa/selector.cpp
+++ b/fsa/src/vespa/fsa/selector.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/selector.h b/fsa/src/vespa/fsa/selector.h
index 00e87bcb3f5..b9e72cbf5d8 100644
--- a/fsa/src/vespa/fsa/selector.h
+++ b/fsa/src/vespa/fsa/selector.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/timestamp.h b/fsa/src/vespa/fsa/timestamp.h
index 0455fc4c144..ab1e217758a 100644
--- a/fsa/src/vespa/fsa/timestamp.h
+++ b/fsa/src/vespa/fsa/timestamp.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/tokenizer.h b/fsa/src/vespa/fsa/tokenizer.h
index 2dceacca60b..398210835b2 100644
--- a/fsa/src/vespa/fsa/tokenizer.h
+++ b/fsa/src/vespa/fsa/tokenizer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/unicode.cpp b/fsa/src/vespa/fsa/unicode.cpp
index 48569c410a7..d4e92d6ca23 100644
--- a/fsa/src/vespa/fsa/unicode.cpp
+++ b/fsa/src/vespa/fsa/unicode.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/fsa/src/vespa/fsa/unicode.h b/fsa/src/vespa/fsa/unicode.h
index 3b14299193d..7546a28d1ac 100644
--- a/fsa/src/vespa/fsa/unicode.h
+++ b/fsa/src/vespa/fsa/unicode.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#pragma once
diff --git a/fsa/src/vespa/fsa/unicode_charprops.cpp b/fsa/src/vespa/fsa/unicode_charprops.cpp
index 3bcc45d4a2c..2ba66287967 100644
--- a/fsa/src/vespa/fsa/unicode_charprops.cpp
+++ b/fsa/src/vespa/fsa/unicode_charprops.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/fsa/src/vespa/fsa/unicode_lowercase.cpp b/fsa/src/vespa/fsa/unicode_lowercase.cpp
index e69368c6ef3..a44de774e9d 100644
--- a/fsa/src/vespa/fsa/unicode_lowercase.cpp
+++ b/fsa/src/vespa/fsa/unicode_lowercase.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/fsa/src/vespa/fsa/unicode_tables.cpp b/fsa/src/vespa/fsa/unicode_tables.cpp
index d20255f29c5..31c774c0994 100644
--- a/fsa/src/vespa/fsa/unicode_tables.cpp
+++ b/fsa/src/vespa/fsa/unicode_tables.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/fsa/src/vespa/fsa/vectorizer.cpp b/fsa/src/vespa/fsa/vectorizer.cpp
index 41f3ce66965..275a08bf998 100644
--- a/fsa/src/vespa/fsa/vectorizer.cpp
+++ b/fsa/src/vespa/fsa/vectorizer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/vectorizer.h b/fsa/src/vespa/fsa/vectorizer.h
index 21b855e186f..5f4c66447ff 100644
--- a/fsa/src/vespa/fsa/vectorizer.h
+++ b/fsa/src/vespa/fsa/vectorizer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsa/wordchartokenizer.cpp b/fsa/src/vespa/fsa/wordchartokenizer.cpp
index e6ea7ec918a..6ae48c595f6 100644
--- a/fsa/src/vespa/fsa/wordchartokenizer.cpp
+++ b/fsa/src/vespa/fsa/wordchartokenizer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/fsa/src/vespa/fsa/wordchartokenizer.h b/fsa/src/vespa/fsa/wordchartokenizer.h
index a23dfb9e7f5..c299906890a 100644
--- a/fsa/src/vespa/fsa/wordchartokenizer.h
+++ b/fsa/src/vespa/fsa/wordchartokenizer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsamanagers/CMakeLists.txt b/fsa/src/vespa/fsamanagers/CMakeLists.txt
index 0cc044d2dc8..f119a0325b7 100644
--- a/fsa/src/vespa/fsamanagers/CMakeLists.txt
+++ b/fsa/src/vespa/fsamanagers/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_library(fsamanagers
SOURCES
conceptnetmanager.cpp
diff --git a/fsa/src/vespa/fsamanagers/conceptnethandle.h b/fsa/src/vespa/fsamanagers/conceptnethandle.h
index a574343714f..1d3fc49582d 100644
--- a/fsa/src/vespa/fsamanagers/conceptnethandle.h
+++ b/fsa/src/vespa/fsamanagers/conceptnethandle.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/10/01
diff --git a/fsa/src/vespa/fsamanagers/conceptnetmanager.cpp b/fsa/src/vespa/fsamanagers/conceptnetmanager.cpp
index 459d7c81239..f817d1627bc 100644
--- a/fsa/src/vespa/fsamanagers/conceptnetmanager.cpp
+++ b/fsa/src/vespa/fsamanagers/conceptnetmanager.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/10/01
diff --git a/fsa/src/vespa/fsamanagers/conceptnetmanager.h b/fsa/src/vespa/fsamanagers/conceptnetmanager.h
index d4e55bc68a6..28cfb064ff5 100644
--- a/fsa/src/vespa/fsamanagers/conceptnetmanager.h
+++ b/fsa/src/vespa/fsamanagers/conceptnetmanager.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/10/01
diff --git a/fsa/src/vespa/fsamanagers/fsahandle.h b/fsa/src/vespa/fsamanagers/fsahandle.h
index 9504c416c79..78cf0dbd477 100644
--- a/fsa/src/vespa/fsamanagers/fsahandle.h
+++ b/fsa/src/vespa/fsamanagers/fsahandle.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/09/07
diff --git a/fsa/src/vespa/fsamanagers/fsamanager.cpp b/fsa/src/vespa/fsamanagers/fsamanager.cpp
index 8816ea2a4b8..607175e9ae0 100644
--- a/fsa/src/vespa/fsamanagers/fsamanager.cpp
+++ b/fsa/src/vespa/fsamanagers/fsamanager.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsamanagers/fsamanager.h b/fsa/src/vespa/fsamanagers/fsamanager.h
index 6de1b95a085..b3b21410490 100644
--- a/fsa/src/vespa/fsamanagers/fsamanager.h
+++ b/fsa/src/vespa/fsamanagers/fsamanager.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/09/07
diff --git a/fsa/src/vespa/fsamanagers/metadatahandle.h b/fsa/src/vespa/fsamanagers/metadatahandle.h
index 8603caedfb7..db266b0da81 100644
--- a/fsa/src/vespa/fsamanagers/metadatahandle.h
+++ b/fsa/src/vespa/fsamanagers/metadatahandle.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/10/01
diff --git a/fsa/src/vespa/fsamanagers/metadatamanager.cpp b/fsa/src/vespa/fsamanagers/metadatamanager.cpp
index 9721d632c52..7d3120b2966 100644
--- a/fsa/src/vespa/fsamanagers/metadatamanager.cpp
+++ b/fsa/src/vespa/fsamanagers/metadatamanager.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/10/01
diff --git a/fsa/src/vespa/fsamanagers/metadatamanager.h b/fsa/src/vespa/fsamanagers/metadatamanager.h
index d87ca59626c..881ea142f8f 100644
--- a/fsa/src/vespa/fsamanagers/metadatamanager.h
+++ b/fsa/src/vespa/fsamanagers/metadatamanager.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/10/01
diff --git a/fsa/src/vespa/fsamanagers/mutex.cpp b/fsa/src/vespa/fsamanagers/mutex.cpp
index 1c62744291d..01915b3c185 100644
--- a/fsa/src/vespa/fsamanagers/mutex.cpp
+++ b/fsa/src/vespa/fsamanagers/mutex.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/09/07
diff --git a/fsa/src/vespa/fsamanagers/mutex.h b/fsa/src/vespa/fsamanagers/mutex.h
index 87deb081b08..05ea2adc732 100644
--- a/fsa/src/vespa/fsamanagers/mutex.h
+++ b/fsa/src/vespa/fsamanagers/mutex.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/09/07
diff --git a/fsa/src/vespa/fsamanagers/refcountable.h b/fsa/src/vespa/fsamanagers/refcountable.h
index 77f00bc3450..ac3fb220955 100644
--- a/fsa/src/vespa/fsamanagers/refcountable.h
+++ b/fsa/src/vespa/fsamanagers/refcountable.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/08/20
diff --git a/fsa/src/vespa/fsamanagers/rwlock.cpp b/fsa/src/vespa/fsamanagers/rwlock.cpp
index 4de79cd5146..3e15d5fd9cf 100644
--- a/fsa/src/vespa/fsamanagers/rwlock.cpp
+++ b/fsa/src/vespa/fsamanagers/rwlock.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/09/07
diff --git a/fsa/src/vespa/fsamanagers/rwlock.h b/fsa/src/vespa/fsamanagers/rwlock.h
index 4c85d1cac8a..395cf66c468 100644
--- a/fsa/src/vespa/fsamanagers/rwlock.h
+++ b/fsa/src/vespa/fsamanagers/rwlock.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/09/07
diff --git a/fsa/src/vespa/fsamanagers/singleton.cpp b/fsa/src/vespa/fsamanagers/singleton.cpp
index 76e9535b450..31793c630f6 100644
--- a/fsa/src/vespa/fsamanagers/singleton.cpp
+++ b/fsa/src/vespa/fsamanagers/singleton.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/09/05
diff --git a/fsa/src/vespa/fsamanagers/singleton.h b/fsa/src/vespa/fsamanagers/singleton.h
index db11a9bf444..ab6bae5b06a 100644
--- a/fsa/src/vespa/fsamanagers/singleton.h
+++ b/fsa/src/vespa/fsamanagers/singleton.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @author Peter Boros
* @date 2004/09/05