Revert "Copyright header"

27 files changed, 231 insertions, 231 deletions

diff --git a/vdslib/src/main/java/com/yahoo/vdslib/BinaryDocumentList.java b/vdslib/src/main/java/com/yahoo/vdslib/BinaryDocumentList.java
index 25b1a6acff4..d2ccf2b2805 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/BinaryDocumentList.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/BinaryDocumentList.java
@@ -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.
 package com.yahoo.vdslib;
 
 import com.yahoo.document.DocumentTypeManager;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/BinaryEntry.java b/vdslib/src/main/java/com/yahoo/vdslib/BinaryEntry.java
index c11bb009a73..4047a3ed4f0 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/BinaryEntry.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/BinaryEntry.java
@@ -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.
 package com.yahoo.vdslib;
 
 import com.yahoo.document.*;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/BucketDistribution.java b/vdslib/src/main/java/com/yahoo/vdslib/BucketDistribution.java
index 09164ffc2e7..0e3e80b2542 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/BucketDistribution.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/BucketDistribution.java
@@ -1,205 +1,205 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vdslib;
-
-import com.yahoo.document.BucketId;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
- */
-public class BucketDistribution {
-
-    // A logger object to enable proper logging.
-    private static Logger log = Logger.getLogger(BucketDistribution.class.getName());
-
-    // A map from bucket id to column index.
-    private int[] bucketToColumn;
-
-    // The number of columns to distribute to.
-    private int numColumns;
-
-    // The number of bits to use for bucket identification.
-    private int numBucketBits;
-
-    /**
-     * Constructs a new bucket distribution object with a given number of columns and buckets.
-     *
-     * @param numColumns    The number of columns to distribute to.
-     * @param numBucketBits The number of bits to use for bucket id.
-     */
-    public BucketDistribution(int numColumns, int numBucketBits) {
-        this.numBucketBits = numBucketBits;
-        bucketToColumn = new int[getNumBuckets()];
-        reset();
-        setNumColumns(numColumns);
-    }
-
-    /**
-     * Constructs a new bucket distribution object as a copy of another.
-     *
-     * @param other The distribution object to copy.
-     */
-    public BucketDistribution(BucketDistribution other) {
-        bucketToColumn = other.bucketToColumn.clone();
-        numColumns = other.numColumns;
-        numBucketBits = other.numBucketBits;
-    }
-
-    /**
-     * Returns the number of buckets that the given number of bucket bits will allow.
-     *
-     * @param numBucketBits The number of bits to use for bucket id.
-     * @return The number of buckets allowed.
-     */
-    private static int getNumBuckets(int numBucketBits) {
-        return 1 << numBucketBits;
-    }
-
-    /**
-     * This method returns a list that contains the distributions of the given number of buckets over the given number
-     * of columns.
-     *
-     * @param numColumns    The number of columns to distribute to.
-     * @param numBucketBits The number of bits to use for bucket id.
-     * @return The bucket distribution.
-     */
-    private static List<Integer> getBucketCount(int numColumns, int numBucketBits) {
-        List<Integer> ret = new ArrayList<Integer>(numColumns);
-        int cnt = getNumBuckets(numBucketBits) / numColumns;
-        int rst = getNumBuckets(numBucketBits) % numColumns;
-        for (int i = 0; i < numColumns; ++i) {
-            ret.add(cnt + (i < rst ? 1 : 0));
-        }
-        return ret;
-    }
-
-    /**
-     * This method returns a list similar to {@link com.yahoo.vdslib.BucketDistribution#getBucketCount(int, int)}, except that the returned list
-     * contains the number of buckets that will have to be migrated from each column if an additional column was added.
-     *
-     * @param numColumns    The original number of columns.
-     * @param numBucketBits The number of bits to use for bucket id.
-     * @return The number of buckets to migrate, one value per column.
-     */
-    private static List<Integer> getBucketMigrateCount(int numColumns, int numBucketBits) {
-        List<Integer> ret = getBucketCount(numColumns++, numBucketBits);
-        int cnt = getNumBuckets(numBucketBits) / numColumns;
-        int rst = getNumBuckets(numBucketBits) % numColumns;
-        for (int i = 0; i < numColumns - 1; ++i) {
-            ret.set(i, ret.get(i) - (cnt + (i < rst ? 1 : 0)));
-        }
-        return ret;
-    }
-
-    /**
-     * Sets the number of columns to distribute to to 1, and resets the content of the internal bucket-to-column map so
-     * that it all buckets point to that single column.
-     */
-    public void reset() {
-        for (int i = 0; i < bucketToColumn.length; ++i) {
-            bucketToColumn[i] = 0;
-        }
-        numColumns = 1;
-    }
-
-    /**
-     * Adds a single column to this bucket distribution object. This will modify the internal bucket-to-column map so
-     * that it takes into account the new column.
-     */
-    private void addColumn() {
-        int newColumns = numColumns + 1;
-        List<Integer> migrate = getBucketMigrateCount(numColumns, numBucketBits);
-        int numBuckets = getNumBuckets(numBucketBits);
-        for (int i = 0; i < numBuckets; ++i) {
-            int old = bucketToColumn[i];
-            if (migrate.get(old) > 0) {
-                bucketToColumn[i] = numColumns; // move this bucket to the new column
-                migrate.set(old, migrate.get(old) - 1);
-            }
-        }
-        numColumns = newColumns;
-    }
-
-    /**
-     * Sets the number of columns to use for this document distribution object. This will reset and setup this object
-     * from scratch. The original number of buckets is maintained.
-     *
-     * @param numColumns The new number of columns to distribute to.
-     */
-    public synchronized void setNumColumns(int numColumns) {
-        if (numColumns < this.numColumns) {
-            reset();
-        }
-        if (numColumns == this.numColumns) {
-            return;
-        }
-        for (int i = numColumns - this.numColumns; --i >= 0; ) {
-            addColumn();
-        }
-    }
-
-    /**
-     * Returns the number of columns to distribute to.
-     *
-     * @return The number of columns.
-     */
-    public int getNumColumns() {
-        return numColumns;
-    }
-
-    /**
-     * Sets the number of buckets to use for this document distribution object. This will reset and setup this object
-     * from scratch. The original number of columns is maintained.
-     *
-     * @param numBucketBits The new number of bits to use for bucket id.
-     */
-    public synchronized void setNumBucketBits(int numBucketBits) {
-        if (numBucketBits == this.numBucketBits) {
-            return;
-        }
-        this.numBucketBits = numBucketBits;
-        bucketToColumn = new int[getNumBuckets(numBucketBits)];
-        int numColumns = this.numColumns;
-        reset();
-        setNumColumns(numColumns);
-    }
-
-    /**
-     * Returns the number of bits used for bucket identifiers.
-     *
-     * @return The number of bits.
-     */
-    public int getNumBucketBits() {
-        return numBucketBits;
-    }
-
-    /**
-     * Returns the number of buckets available using the configured number of bucket bits.
-     *
-     * @return The number of buckets.
-     */
-    public int getNumBuckets() {
-        return getNumBuckets(numBucketBits);
-    }
-
-    /**
-     * This method maps the given bucket id to its corresponding column.
-     *
-     * @param bucketId The bucket whose column to lookup.
-     * @return The column to distribute the bucket to.
-     */
-    public int getColumn(BucketId bucketId) {
-        int ret = (int)(bucketId.getId() & (getNumBuckets(numBucketBits) - 1));
-        if (ret >= bucketToColumn.length) {
-            log.log(Level.SEVERE,
-                    "The bucket distribution map is not in sync with the number of bucket bits. " +
-                    "This should never happen! Distribution is broken!!");
-            return 0;
-        }
-        return bucketToColumn[ret];
-    }
-}
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vdslib;

+

+import com.yahoo.document.BucketId;

+

+import java.util.ArrayList;

+import java.util.List;

+import java.util.logging.Level;

+import java.util.logging.Logger;

+

+/**

+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

+ */

+public class BucketDistribution {

+

+    // A logger object to enable proper logging.

+    private static Logger log = Logger.getLogger(BucketDistribution.class.getName());

+

+    // A map from bucket id to column index.

+    private int[] bucketToColumn;

+

+    // The number of columns to distribute to.

+    private int numColumns;

+

+    // The number of bits to use for bucket identification.

+    private int numBucketBits;

+

+    /**

+     * Constructs a new bucket distribution object with a given number of columns and buckets.

+     *

+     * @param numColumns    The number of columns to distribute to.

+     * @param numBucketBits The number of bits to use for bucket id.

+     */

+    public BucketDistribution(int numColumns, int numBucketBits) {

+        this.numBucketBits = numBucketBits;

+        bucketToColumn = new int[getNumBuckets()];

+        reset();

+        setNumColumns(numColumns);

+    }

+

+    /**

+     * Constructs a new bucket distribution object as a copy of another.

+     *

+     * @param other The distribution object to copy.

+     */

+    public BucketDistribution(BucketDistribution other) {

+        bucketToColumn = other.bucketToColumn.clone();

+        numColumns = other.numColumns;

+        numBucketBits = other.numBucketBits;

+    }

+

+    /**

+     * Returns the number of buckets that the given number of bucket bits will allow.

+     *

+     * @param numBucketBits The number of bits to use for bucket id.

+     * @return The number of buckets allowed.

+     */

+    private static int getNumBuckets(int numBucketBits) {

+        return 1 << numBucketBits;

+    }

+

+    /**

+     * This method returns a list that contains the distributions of the given number of buckets over the given number

+     * of columns.

+     *

+     * @param numColumns    The number of columns to distribute to.

+     * @param numBucketBits The number of bits to use for bucket id.

+     * @return The bucket distribution.

+     */

+    private static List<Integer> getBucketCount(int numColumns, int numBucketBits) {

+        List<Integer> ret = new ArrayList<Integer>(numColumns);

+        int cnt = getNumBuckets(numBucketBits) / numColumns;

+        int rst = getNumBuckets(numBucketBits) % numColumns;

+        for (int i = 0; i < numColumns; ++i) {

+            ret.add(cnt + (i < rst ? 1 : 0));

+        }

+        return ret;

+    }

+

+    /**

+     * This method returns a list similar to {@link com.yahoo.vdslib.BucketDistribution#getBucketCount(int, int)}, except that the returned list

+     * contains the number of buckets that will have to be migrated from each column if an additional column was added.

+     *

+     * @param numColumns    The original number of columns.

+     * @param numBucketBits The number of bits to use for bucket id.

+     * @return The number of buckets to migrate, one value per column.

+     */

+    private static List<Integer> getBucketMigrateCount(int numColumns, int numBucketBits) {

+        List<Integer> ret = getBucketCount(numColumns++, numBucketBits);

+        int cnt = getNumBuckets(numBucketBits) / numColumns;

+        int rst = getNumBuckets(numBucketBits) % numColumns;

+        for (int i = 0; i < numColumns - 1; ++i) {

+            ret.set(i, ret.get(i) - (cnt + (i < rst ? 1 : 0)));

+        }

+        return ret;

+    }

+

+    /**

+     * Sets the number of columns to distribute to to 1, and resets the content of the internal bucket-to-column map so

+     * that it all buckets point to that single column.

+     */

+    public void reset() {

+        for (int i = 0; i < bucketToColumn.length; ++i) {

+            bucketToColumn[i] = 0;

+        }

+        numColumns = 1;

+    }

+

+    /**

+     * Adds a single column to this bucket distribution object. This will modify the internal bucket-to-column map so

+     * that it takes into account the new column.

+     */

+    private void addColumn() {

+        int newColumns = numColumns + 1;

+        List<Integer> migrate = getBucketMigrateCount(numColumns, numBucketBits);

+        int numBuckets = getNumBuckets(numBucketBits);

+        for (int i = 0; i < numBuckets; ++i) {

+            int old = bucketToColumn[i];

+            if (migrate.get(old) > 0) {

+                bucketToColumn[i] = numColumns; // move this bucket to the new column

+                migrate.set(old, migrate.get(old) - 1);

+            }

+        }

+        numColumns = newColumns;

+    }

+

+    /**

+     * Sets the number of columns to use for this document distribution object. This will reset and setup this object

+     * from scratch. The original number of buckets is maintained.

+     *

+     * @param numColumns The new number of columns to distribute to.

+     */

+    public synchronized void setNumColumns(int numColumns) {

+        if (numColumns < this.numColumns) {

+            reset();

+        }

+        if (numColumns == this.numColumns) {

+            return;

+        }

+        for (int i = numColumns - this.numColumns; --i >= 0; ) {

+            addColumn();

+        }

+    }

+

+    /**

+     * Returns the number of columns to distribute to.

+     *

+     * @return The number of columns.

+     */

+    public int getNumColumns() {

+        return numColumns;

+    }

+

+    /**

+     * Sets the number of buckets to use for this document distribution object. This will reset and setup this object

+     * from scratch. The original number of columns is maintained.

+     *

+     * @param numBucketBits The new number of bits to use for bucket id.

+     */

+    public synchronized void setNumBucketBits(int numBucketBits) {

+        if (numBucketBits == this.numBucketBits) {

+            return;

+        }

+        this.numBucketBits = numBucketBits;

+        bucketToColumn = new int[getNumBuckets(numBucketBits)];

+        int numColumns = this.numColumns;

+        reset();

+        setNumColumns(numColumns);

+    }

+

+    /**

+     * Returns the number of bits used for bucket identifiers.

+     *

+     * @return The number of bits.

+     */

+    public int getNumBucketBits() {

+        return numBucketBits;

+    }

+

+    /**

+     * Returns the number of buckets available using the configured number of bucket bits.

+     *

+     * @return The number of buckets.

+     */

+    public int getNumBuckets() {

+        return getNumBuckets(numBucketBits);

+    }

+

+    /**

+     * This method maps the given bucket id to its corresponding column.

+     *

+     * @param bucketId The bucket whose column to lookup.

+     * @return The column to distribute the bucket to.

+     */

+    public int getColumn(BucketId bucketId) {

+        int ret = (int)(bucketId.getId() & (getNumBuckets(numBucketBits) - 1));

+        if (ret >= bucketToColumn.length) {

+            log.log(Level.SEVERE,

+                    "The bucket distribution map is not in sync with the number of bucket bits. " +

+                    "This should never happen! Distribution is broken!!");

+            return 0;

+        }

+        return bucketToColumn[ret];

+    }

+}

diff --git a/vdslib/src/main/java/com/yahoo/vdslib/DocumentList.java b/vdslib/src/main/java/com/yahoo/vdslib/DocumentList.java
index 76d320102e3..cbe5de78b76 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/DocumentList.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/DocumentList.java
@@ -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.
 package com.yahoo.vdslib;
 
 import com.yahoo.document.DocumentId;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/DocumentSummary.java b/vdslib/src/main/java/com/yahoo/vdslib/DocumentSummary.java
index 970c571850e..27ca82b46dd 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/DocumentSummary.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/DocumentSummary.java
@@ -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.
 package com.yahoo.vdslib;
 import com.yahoo.vespa.objects.BufferSerializer;
 import com.yahoo.vespa.objects.Deserializer;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/DynamicDocumentList.java b/vdslib/src/main/java/com/yahoo/vdslib/DynamicDocumentList.java
index b243f0a3dea..dbc139352b0 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/DynamicDocumentList.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/DynamicDocumentList.java
@@ -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.
 package com.yahoo.vdslib;
 
 import com.yahoo.compress.CompressionType;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/DynamicEntry.java b/vdslib/src/main/java/com/yahoo/vdslib/DynamicEntry.java
index 81226c64604..2aac8e711fc 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/DynamicEntry.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/DynamicEntry.java
@@ -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.
 package com.yahoo.vdslib;
 
 import com.yahoo.document.DocumentOperation;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/Entry.java b/vdslib/src/main/java/com/yahoo/vdslib/Entry.java
index 2ce3822f5a9..8674db00419 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/Entry.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/Entry.java
@@ -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.
 package com.yahoo.vdslib;
 
 import com.yahoo.document.DocumentOperation;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/MetaEntry.java b/vdslib/src/main/java/com/yahoo/vdslib/MetaEntry.java
index d0e75d63ea1..2e5022bba53 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/MetaEntry.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/MetaEntry.java
@@ -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.
 package com.yahoo.vdslib;
 
 import com.yahoo.io.GrowableByteBuffer;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/SearchResult.java b/vdslib/src/main/java/com/yahoo/vdslib/SearchResult.java
index 11ad1df3180..e09fa6f460a 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/SearchResult.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/SearchResult.java
@@ -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.
 package com.yahoo.vdslib;
 import com.yahoo.vespa.objects.BufferSerializer;
 import com.yahoo.vespa.objects.Deserializer;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/VisitorOrdering.java b/vdslib/src/main/java/com/yahoo/vdslib/VisitorOrdering.java
index 5cd7b23e5c4..cd543caa7f1 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/VisitorOrdering.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/VisitorOrdering.java
@@ -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.
 package com.yahoo.vdslib;
 
 public class VisitorOrdering {
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/VisitorStatistics.java b/vdslib/src/main/java/com/yahoo/vdslib/VisitorStatistics.java
index 9eb183e9283..906eb0db58d 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/VisitorStatistics.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/VisitorStatistics.java
@@ -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.
 package com.yahoo.vdslib;
 
 public class VisitorStatistics {
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/ConfiguredNode.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/ConfiguredNode.java
index 0fbf23f7200..dd0ad29f16b 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/ConfiguredNode.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/ConfiguredNode.java
@@ -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.
 package com.yahoo.vdslib.distribution;
 
 /**
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
index 455a58ed140..95b998b1ab5 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
@@ -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.
 package com.yahoo.vdslib.distribution;
 
 import com.yahoo.collections.BobHash;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Group.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Group.java
index a553cfa9e71..7601dd31972 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Group.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Group.java
@@ -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.
 package com.yahoo.vdslib.distribution;
 
 import java.util.*;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/GroupVisitor.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/GroupVisitor.java
index 0bf0a367ffd..493413b4e36 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/GroupVisitor.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/GroupVisitor.java
@@ -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.
 package com.yahoo.vdslib.distribution;
 
 public interface GroupVisitor {
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/RandomGen.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/RandomGen.java
index 09492c7d7a6..9a0a1264529 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/RandomGen.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/RandomGen.java
@@ -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.
 package com.yahoo.vdslib.distribution;
 
 public class RandomGen extends java.util.Random {
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/package-info.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/package-info.java
index 7be87f6fb54..c4dfd2eca11 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/package-info.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/package-info.java
@@ -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.
 @ExportPackage
 package com.yahoo.vdslib.distribution;
 
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/package-info.java b/vdslib/src/main/java/com/yahoo/vdslib/package-info.java
index 9afe8156dbd..7f38edb7ad1 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/package-info.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/package-info.java
@@ -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.
 @ExportPackage
 package com.yahoo.vdslib;
 
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java b/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java
index a6ede3d4fec..0b8a7457e51 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java
@@ -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.
 package com.yahoo.vdslib.state;
 import com.yahoo.text.StringUtilities;
 
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/Diff.java b/vdslib/src/main/java/com/yahoo/vdslib/state/Diff.java
index 7d495b4a2f2..084c2bbb851 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/Diff.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/Diff.java
@@ -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.
 package com.yahoo.vdslib.state;
 
 import java.util.LinkedList;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/DiskState.java b/vdslib/src/main/java/com/yahoo/vdslib/state/DiskState.java
index 1a05f8ab565..e0d9ad533f4 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/DiskState.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/DiskState.java
@@ -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.
 package com.yahoo.vdslib.state;
 
 import com.yahoo.text.StringUtilities;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/Node.java b/vdslib/src/main/java/com/yahoo/vdslib/state/Node.java
index 59af0b4eb84..832120d6b5b 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/Node.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/Node.java
@@ -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.
 package com.yahoo.vdslib.state;
 
 /**
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java b/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java
index f0dc2fbc6e8..15c929fe49d 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java
@@ -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.
 package com.yahoo.vdslib.state;
 
 import com.yahoo.text.StringUtilities;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/NodeType.java b/vdslib/src/main/java/com/yahoo/vdslib/state/NodeType.java
index f099d90c0c7..2c1db1c5cc2 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/NodeType.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/NodeType.java
@@ -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.
 package com.yahoo.vdslib.state;
 
 public enum NodeType {
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/State.java b/vdslib/src/main/java/com/yahoo/vdslib/state/State.java
index 6a6bab2ac66..99323dbc4de 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/State.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/State.java
@@ -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.
 package com.yahoo.vdslib.state;
 
 import java.util.ArrayList;
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/package-info.java b/vdslib/src/main/java/com/yahoo/vdslib/state/package-info.java
index 3ca4fc5d1da..78662d368f2 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/package-info.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/package-info.java
@@ -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.
 @ExportPackage
 package com.yahoo.vdslib.state;