From a84e7e88923c211d6bcdc56929ade99d86813bb6 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 14 Jun 2017 17:57:50 +0200 Subject: Revert "Update copyright headers" --- metrics/src/main/java/com/yahoo/metrics/ConsumerSpec.java | 2 +- metrics/src/main/java/com/yahoo/metrics/CountMetric.java | 2 +- metrics/src/main/java/com/yahoo/metrics/DoubleValue.java | 2 +- metrics/src/main/java/com/yahoo/metrics/EventLogger.java | 2 +- metrics/src/main/java/com/yahoo/metrics/JoinBehavior.java | 2 +- metrics/src/main/java/com/yahoo/metrics/LongValue.java | 2 +- metrics/src/main/java/com/yahoo/metrics/Metric.java | 2 +- metrics/src/main/java/com/yahoo/metrics/MetricManager.java | 2 +- metrics/src/main/java/com/yahoo/metrics/MetricSet.java | 2 +- metrics/src/main/java/com/yahoo/metrics/MetricSnapshot.java | 2 +- metrics/src/main/java/com/yahoo/metrics/MetricSnapshotSet.java | 2 +- metrics/src/main/java/com/yahoo/metrics/MetricVisitor.java | 2 +- metrics/src/main/java/com/yahoo/metrics/SimpleMetricSet.java | 2 +- metrics/src/main/java/com/yahoo/metrics/SumMetric.java | 2 +- metrics/src/main/java/com/yahoo/metrics/Timer.java | 2 +- metrics/src/main/java/com/yahoo/metrics/ValueMetric.java | 2 +- metrics/src/main/java/com/yahoo/metrics/VespaLogEventLogger.java | 2 +- metrics/src/main/java/com/yahoo/metrics/util/HasCopy.java | 2 +- metrics/src/main/java/com/yahoo/metrics/util/MetricValueKeeper.java | 2 +- metrics/src/main/java/com/yahoo/metrics/util/MetricValueSet.java | 2 +- .../src/main/java/com/yahoo/metrics/util/SimpleMetricValueKeeper.java | 2 +- .../java/com/yahoo/metrics/util/ThreadLocalDirectoryValueKeeper.java | 2 +- metrics/src/main/java/com/yahoo/metrics/util/ValueType.java | 2 +- metrics/src/main/metrics-with-dependencies.xml | 2 +- metrics/src/test/java/com/yahoo/metrics/AveragedDoubleValueMetric.java | 2 +- metrics/src/test/java/com/yahoo/metrics/AveragedLongValueMetric.java | 2 +- metrics/src/test/java/com/yahoo/metrics/CountMetricTest.java | 2 +- metrics/src/test/java/com/yahoo/metrics/DummyTimer.java | 2 +- metrics/src/test/java/com/yahoo/metrics/MetricManagerTest.java | 2 +- metrics/src/test/java/com/yahoo/metrics/MetricSetTest.java | 2 +- metrics/src/test/java/com/yahoo/metrics/SumMetricTest.java | 2 +- metrics/src/test/java/com/yahoo/metrics/SummedDoubleValueMetric.java | 2 +- metrics/src/test/java/com/yahoo/metrics/SummedLongValueMetric.java | 2 +- metrics/src/test/java/com/yahoo/metrics/ValueMetricTest.java | 2 +- metrics/src/tests/CMakeLists.txt | 2 +- metrics/src/tests/countmetrictest.cpp | 2 +- metrics/src/tests/loadmetrictest.cpp | 2 +- metrics/src/tests/metric_timer_test.cpp | 2 +- metrics/src/tests/metricmanagertest.cpp | 2 +- metrics/src/tests/metricsettest.cpp | 2 +- metrics/src/tests/metrictest.cpp | 2 +- metrics/src/tests/snapshottest.cpp | 2 +- metrics/src/tests/stresstest.cpp | 2 +- metrics/src/tests/summetrictest.cpp | 2 +- metrics/src/tests/testrunner.cpp | 2 +- metrics/src/tests/valuemetrictest.cpp | 2 +- metrics/src/vespa/metrics/CMakeLists.txt | 2 +- metrics/src/vespa/metrics/countmetric.cpp | 2 +- metrics/src/vespa/metrics/countmetric.h | 2 +- metrics/src/vespa/metrics/countmetric.hpp | 2 +- metrics/src/vespa/metrics/countmetricvalues.cpp | 2 +- metrics/src/vespa/metrics/countmetricvalues.h | 2 +- metrics/src/vespa/metrics/countmetricvalues.hpp | 2 +- metrics/src/vespa/metrics/jsonwriter.cpp | 2 +- metrics/src/vespa/metrics/jsonwriter.h | 2 +- metrics/src/vespa/metrics/loadmetric.cpp | 2 +- metrics/src/vespa/metrics/loadmetric.h | 2 +- metrics/src/vespa/metrics/loadmetric.hpp | 2 +- metrics/src/vespa/metrics/loadtype.h | 2 +- metrics/src/vespa/metrics/memoryconsumption.cpp | 2 +- metrics/src/vespa/metrics/memoryconsumption.h | 2 +- metrics/src/vespa/metrics/metric.cpp | 2 +- metrics/src/vespa/metrics/metric.h | 2 +- metrics/src/vespa/metrics/metricmanager.cpp | 2 +- metrics/src/vespa/metrics/metricmanager.h | 2 +- metrics/src/vespa/metrics/metrics.h | 2 +- metrics/src/vespa/metrics/metricset.cpp | 2 +- metrics/src/vespa/metrics/metricset.h | 2 +- metrics/src/vespa/metrics/metricsmanager.def | 2 +- metrics/src/vespa/metrics/metricsnapshot.cpp | 2 +- metrics/src/vespa/metrics/metricsnapshot.h | 2 +- metrics/src/vespa/metrics/metrictimer.cpp | 2 +- metrics/src/vespa/metrics/metrictimer.h | 2 +- metrics/src/vespa/metrics/metricvalueset.cpp | 2 +- metrics/src/vespa/metrics/metricvalueset.h | 2 +- metrics/src/vespa/metrics/metricvalueset.hpp | 2 +- metrics/src/vespa/metrics/namehash.cpp | 2 +- metrics/src/vespa/metrics/namehash.h | 2 +- metrics/src/vespa/metrics/printutils.cpp | 2 +- metrics/src/vespa/metrics/printutils.h | 2 +- metrics/src/vespa/metrics/state_api_adapter.cpp | 2 +- metrics/src/vespa/metrics/state_api_adapter.h | 2 +- metrics/src/vespa/metrics/summetric.cpp | 2 +- metrics/src/vespa/metrics/summetric.h | 2 +- metrics/src/vespa/metrics/summetric.hpp | 2 +- metrics/src/vespa/metrics/textwriter.cpp | 2 +- metrics/src/vespa/metrics/textwriter.h | 2 +- metrics/src/vespa/metrics/updatehook.h | 2 +- metrics/src/vespa/metrics/valuemetric.cpp | 2 +- metrics/src/vespa/metrics/valuemetric.h | 2 +- metrics/src/vespa/metrics/valuemetric.hpp | 2 +- metrics/src/vespa/metrics/valuemetricvalues.cpp | 2 +- metrics/src/vespa/metrics/valuemetricvalues.h | 2 +- metrics/src/vespa/metrics/valuemetricvalues.hpp | 2 +- metrics/src/vespa/metrics/xmlwriter.cpp | 2 +- metrics/src/vespa/metrics/xmlwriter.h | 2 +- 96 files changed, 96 insertions(+), 96 deletions(-) (limited to 'metrics/src') diff --git a/metrics/src/main/java/com/yahoo/metrics/ConsumerSpec.java b/metrics/src/main/java/com/yahoo/metrics/ConsumerSpec.java index f97d8fd85ee..ec6963bef30 100644 --- a/metrics/src/main/java/com/yahoo/metrics/ConsumerSpec.java +++ b/metrics/src/main/java/com/yahoo/metrics/ConsumerSpec.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.metrics; import java.util.HashSet; diff --git a/metrics/src/main/java/com/yahoo/metrics/CountMetric.java b/metrics/src/main/java/com/yahoo/metrics/CountMetric.java index 6d28a83aa0b..409866e4040 100644 --- a/metrics/src/main/java/com/yahoo/metrics/CountMetric.java +++ b/metrics/src/main/java/com/yahoo/metrics/CountMetric.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.metrics; import com.yahoo.metrics.util.MetricValueSet; diff --git a/metrics/src/main/java/com/yahoo/metrics/DoubleValue.java b/metrics/src/main/java/com/yahoo/metrics/DoubleValue.java index 76a559cd150..6309e4a9ea2 100644 --- a/metrics/src/main/java/com/yahoo/metrics/DoubleValue.java +++ b/metrics/src/main/java/com/yahoo/metrics/DoubleValue.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.metrics; import com.yahoo.metrics.util.ValueType; diff --git a/metrics/src/main/java/com/yahoo/metrics/EventLogger.java b/metrics/src/main/java/com/yahoo/metrics/EventLogger.java index 3798b0e2e55..15ebb2ed0ef 100644 --- a/metrics/src/main/java/com/yahoo/metrics/EventLogger.java +++ b/metrics/src/main/java/com/yahoo/metrics/EventLogger.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.metrics; public interface EventLogger { diff --git a/metrics/src/main/java/com/yahoo/metrics/JoinBehavior.java b/metrics/src/main/java/com/yahoo/metrics/JoinBehavior.java index d995e116dd0..eb8f5a540aa 100644 --- a/metrics/src/main/java/com/yahoo/metrics/JoinBehavior.java +++ b/metrics/src/main/java/com/yahoo/metrics/JoinBehavior.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.metrics; /** diff --git a/metrics/src/main/java/com/yahoo/metrics/LongValue.java b/metrics/src/main/java/com/yahoo/metrics/LongValue.java index 1f925559d89..29a8202f845 100644 --- a/metrics/src/main/java/com/yahoo/metrics/LongValue.java +++ b/metrics/src/main/java/com/yahoo/metrics/LongValue.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.metrics; import com.yahoo.metrics.util.ValueType; diff --git a/metrics/src/main/java/com/yahoo/metrics/Metric.java b/metrics/src/main/java/com/yahoo/metrics/Metric.java index ff86662247a..0ef7dfbcd0a 100644 --- a/metrics/src/main/java/com/yahoo/metrics/Metric.java +++ b/metrics/src/main/java/com/yahoo/metrics/Metric.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.metrics; import com.yahoo.text.XMLWriter; diff --git a/metrics/src/main/java/com/yahoo/metrics/MetricManager.java b/metrics/src/main/java/com/yahoo/metrics/MetricManager.java index 110e5e137d0..b44205660de 100644 --- a/metrics/src/main/java/com/yahoo/metrics/MetricManager.java +++ b/metrics/src/main/java/com/yahoo/metrics/MetricManager.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.metrics; import com.yahoo.collections.Pair; diff --git a/metrics/src/main/java/com/yahoo/metrics/MetricSet.java b/metrics/src/main/java/com/yahoo/metrics/MetricSet.java index 5305002782d..f10834d93cc 100644 --- a/metrics/src/main/java/com/yahoo/metrics/MetricSet.java +++ b/metrics/src/main/java/com/yahoo/metrics/MetricSet.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.metrics; import com.yahoo.text.XMLWriter; diff --git a/metrics/src/main/java/com/yahoo/metrics/MetricSnapshot.java b/metrics/src/main/java/com/yahoo/metrics/MetricSnapshot.java index b64330ddbc7..cd02b170b4a 100644 --- a/metrics/src/main/java/com/yahoo/metrics/MetricSnapshot.java +++ b/metrics/src/main/java/com/yahoo/metrics/MetricSnapshot.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.metrics; import com.yahoo.text.XMLWriter; diff --git a/metrics/src/main/java/com/yahoo/metrics/MetricSnapshotSet.java b/metrics/src/main/java/com/yahoo/metrics/MetricSnapshotSet.java index 2cb07cf7dbe..e65f1db8fb4 100644 --- a/metrics/src/main/java/com/yahoo/metrics/MetricSnapshotSet.java +++ b/metrics/src/main/java/com/yahoo/metrics/MetricSnapshotSet.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.metrics; /** diff --git a/metrics/src/main/java/com/yahoo/metrics/MetricVisitor.java b/metrics/src/main/java/com/yahoo/metrics/MetricVisitor.java index c26d28caf83..f9d3473bbf9 100644 --- a/metrics/src/main/java/com/yahoo/metrics/MetricVisitor.java +++ b/metrics/src/main/java/com/yahoo/metrics/MetricVisitor.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.metrics; public abstract class MetricVisitor { diff --git a/metrics/src/main/java/com/yahoo/metrics/SimpleMetricSet.java b/metrics/src/main/java/com/yahoo/metrics/SimpleMetricSet.java index c6671cc07d9..2eab3c6635e 100644 --- a/metrics/src/main/java/com/yahoo/metrics/SimpleMetricSet.java +++ b/metrics/src/main/java/com/yahoo/metrics/SimpleMetricSet.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.metrics; /** diff --git a/metrics/src/main/java/com/yahoo/metrics/SumMetric.java b/metrics/src/main/java/com/yahoo/metrics/SumMetric.java index 3607ea7939b..cc6d693ce1f 100644 --- a/metrics/src/main/java/com/yahoo/metrics/SumMetric.java +++ b/metrics/src/main/java/com/yahoo/metrics/SumMetric.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. /** * @class metrics::CounterMetric * @ingroup metrics diff --git a/metrics/src/main/java/com/yahoo/metrics/Timer.java b/metrics/src/main/java/com/yahoo/metrics/Timer.java index 0e980b816b9..12258ebfeb1 100644 --- a/metrics/src/main/java/com/yahoo/metrics/Timer.java +++ b/metrics/src/main/java/com/yahoo/metrics/Timer.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.metrics; /** diff --git a/metrics/src/main/java/com/yahoo/metrics/ValueMetric.java b/metrics/src/main/java/com/yahoo/metrics/ValueMetric.java index d1d68b771d4..629aec6a14d 100644 --- a/metrics/src/main/java/com/yahoo/metrics/ValueMetric.java +++ b/metrics/src/main/java/com/yahoo/metrics/ValueMetric.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.metrics; import com.yahoo.log.LogLevel; diff --git a/metrics/src/main/java/com/yahoo/metrics/VespaLogEventLogger.java b/metrics/src/main/java/com/yahoo/metrics/VespaLogEventLogger.java index a2ee2133b13..aa2698c92fb 100644 --- a/metrics/src/main/java/com/yahoo/metrics/VespaLogEventLogger.java +++ b/metrics/src/main/java/com/yahoo/metrics/VespaLogEventLogger.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.metrics; import com.yahoo.log.event.Event; diff --git a/metrics/src/main/java/com/yahoo/metrics/util/HasCopy.java b/metrics/src/main/java/com/yahoo/metrics/util/HasCopy.java index c4b53b24adc..497f640e0fe 100644 --- a/metrics/src/main/java/com/yahoo/metrics/util/HasCopy.java +++ b/metrics/src/main/java/com/yahoo/metrics/util/HasCopy.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.metrics.util; public interface HasCopy { diff --git a/metrics/src/main/java/com/yahoo/metrics/util/MetricValueKeeper.java b/metrics/src/main/java/com/yahoo/metrics/util/MetricValueKeeper.java index c40b57c29fb..65bd5abdd3e 100644 --- a/metrics/src/main/java/com/yahoo/metrics/util/MetricValueKeeper.java +++ b/metrics/src/main/java/com/yahoo/metrics/util/MetricValueKeeper.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.metrics.util; import com.yahoo.metrics.JoinBehavior; diff --git a/metrics/src/main/java/com/yahoo/metrics/util/MetricValueSet.java b/metrics/src/main/java/com/yahoo/metrics/util/MetricValueSet.java index 0ba3138f3d7..e04c4b4eb25 100644 --- a/metrics/src/main/java/com/yahoo/metrics/util/MetricValueSet.java +++ b/metrics/src/main/java/com/yahoo/metrics/util/MetricValueSet.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. /** * \class MetricValueSet * \ingroup metrics diff --git a/metrics/src/main/java/com/yahoo/metrics/util/SimpleMetricValueKeeper.java b/metrics/src/main/java/com/yahoo/metrics/util/SimpleMetricValueKeeper.java index bf5b18f782e..f3a3e64beb6 100644 --- a/metrics/src/main/java/com/yahoo/metrics/util/SimpleMetricValueKeeper.java +++ b/metrics/src/main/java/com/yahoo/metrics/util/SimpleMetricValueKeeper.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.metrics.util; import java.util.Collection; diff --git a/metrics/src/main/java/com/yahoo/metrics/util/ThreadLocalDirectoryValueKeeper.java b/metrics/src/main/java/com/yahoo/metrics/util/ThreadLocalDirectoryValueKeeper.java index a6ef28eac0f..72dcef377d0 100644 --- a/metrics/src/main/java/com/yahoo/metrics/util/ThreadLocalDirectoryValueKeeper.java +++ b/metrics/src/main/java/com/yahoo/metrics/util/ThreadLocalDirectoryValueKeeper.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.metrics.util; import com.yahoo.concurrent.ThreadLocalDirectory; diff --git a/metrics/src/main/java/com/yahoo/metrics/util/ValueType.java b/metrics/src/main/java/com/yahoo/metrics/util/ValueType.java index e9c8e27b613..b777e213406 100644 --- a/metrics/src/main/java/com/yahoo/metrics/util/ValueType.java +++ b/metrics/src/main/java/com/yahoo/metrics/util/ValueType.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.metrics.util; import com.yahoo.metrics.JoinBehavior; diff --git a/metrics/src/main/metrics-with-dependencies.xml b/metrics/src/main/metrics-with-dependencies.xml index 3b76662ebed..f16f31e0398 100644 --- a/metrics/src/main/metrics-with-dependencies.xml +++ b/metrics/src/main/metrics-with-dependencies.xml @@ -1,4 +1,4 @@ - + jar-with-dependencies diff --git a/metrics/src/test/java/com/yahoo/metrics/AveragedDoubleValueMetric.java b/metrics/src/test/java/com/yahoo/metrics/AveragedDoubleValueMetric.java index fc32ab39c71..933f1ec5fa0 100644 --- a/metrics/src/test/java/com/yahoo/metrics/AveragedDoubleValueMetric.java +++ b/metrics/src/test/java/com/yahoo/metrics/AveragedDoubleValueMetric.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.metrics; /** diff --git a/metrics/src/test/java/com/yahoo/metrics/AveragedLongValueMetric.java b/metrics/src/test/java/com/yahoo/metrics/AveragedLongValueMetric.java index 5f743c6c75f..a1abfced548 100644 --- a/metrics/src/test/java/com/yahoo/metrics/AveragedLongValueMetric.java +++ b/metrics/src/test/java/com/yahoo/metrics/AveragedLongValueMetric.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.metrics; /** diff --git a/metrics/src/test/java/com/yahoo/metrics/CountMetricTest.java b/metrics/src/test/java/com/yahoo/metrics/CountMetricTest.java index c066814b557..ad09e289b0f 100644 --- a/metrics/src/test/java/com/yahoo/metrics/CountMetricTest.java +++ b/metrics/src/test/java/com/yahoo/metrics/CountMetricTest.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.metrics; import junit.framework.TestCase; diff --git a/metrics/src/test/java/com/yahoo/metrics/DummyTimer.java b/metrics/src/test/java/com/yahoo/metrics/DummyTimer.java index 7cba2f6d42c..8264d8e00eb 100644 --- a/metrics/src/test/java/com/yahoo/metrics/DummyTimer.java +++ b/metrics/src/test/java/com/yahoo/metrics/DummyTimer.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.metrics; /** diff --git a/metrics/src/test/java/com/yahoo/metrics/MetricManagerTest.java b/metrics/src/test/java/com/yahoo/metrics/MetricManagerTest.java index 6ee4f5b55c2..dad476d2bdb 100644 --- a/metrics/src/test/java/com/yahoo/metrics/MetricManagerTest.java +++ b/metrics/src/test/java/com/yahoo/metrics/MetricManagerTest.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.metrics; import org.junit.Test; diff --git a/metrics/src/test/java/com/yahoo/metrics/MetricSetTest.java b/metrics/src/test/java/com/yahoo/metrics/MetricSetTest.java index 177a2bbb993..c9b85566cea 100644 --- a/metrics/src/test/java/com/yahoo/metrics/MetricSetTest.java +++ b/metrics/src/test/java/com/yahoo/metrics/MetricSetTest.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.metrics; import junit.framework.TestCase; diff --git a/metrics/src/test/java/com/yahoo/metrics/SumMetricTest.java b/metrics/src/test/java/com/yahoo/metrics/SumMetricTest.java index eda3c532c19..09204a66454 100644 --- a/metrics/src/test/java/com/yahoo/metrics/SumMetricTest.java +++ b/metrics/src/test/java/com/yahoo/metrics/SumMetricTest.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.metrics; import junit.framework.TestCase; diff --git a/metrics/src/test/java/com/yahoo/metrics/SummedDoubleValueMetric.java b/metrics/src/test/java/com/yahoo/metrics/SummedDoubleValueMetric.java index 4996186a26e..a869348b332 100644 --- a/metrics/src/test/java/com/yahoo/metrics/SummedDoubleValueMetric.java +++ b/metrics/src/test/java/com/yahoo/metrics/SummedDoubleValueMetric.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.metrics; /** diff --git a/metrics/src/test/java/com/yahoo/metrics/SummedLongValueMetric.java b/metrics/src/test/java/com/yahoo/metrics/SummedLongValueMetric.java index 82ba169dec3..d08abe6f242 100644 --- a/metrics/src/test/java/com/yahoo/metrics/SummedLongValueMetric.java +++ b/metrics/src/test/java/com/yahoo/metrics/SummedLongValueMetric.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.metrics; /** diff --git a/metrics/src/test/java/com/yahoo/metrics/ValueMetricTest.java b/metrics/src/test/java/com/yahoo/metrics/ValueMetricTest.java index 1054dacdcbb..4758888b0c8 100644 --- a/metrics/src/test/java/com/yahoo/metrics/ValueMetricTest.java +++ b/metrics/src/test/java/com/yahoo/metrics/ValueMetricTest.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.metrics; import junit.framework.TestCase; diff --git a/metrics/src/tests/CMakeLists.txt b/metrics/src/tests/CMakeLists.txt index af13bd2ce0b..7e0414b1ca1 100644 --- a/metrics/src/tests/CMakeLists.txt +++ b/metrics/src/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_executable(metrics_testrunner_app TEST SOURCES testrunner.cpp diff --git a/metrics/src/tests/countmetrictest.cpp b/metrics/src/tests/countmetrictest.cpp index 8ef551ead53..8a26d7d6dc5 100644 --- a/metrics/src/tests/countmetrictest.cpp +++ b/metrics/src/tests/countmetrictest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/metrics/src/tests/loadmetrictest.cpp b/metrics/src/tests/loadmetrictest.cpp index 2bdb47add3f..b8eac5b4e94 100644 --- a/metrics/src/tests/loadmetrictest.cpp +++ b/metrics/src/tests/loadmetrictest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include #include diff --git a/metrics/src/tests/metric_timer_test.cpp b/metrics/src/tests/metric_timer_test.cpp index 0721f2202ac..48ba2f932df 100644 --- a/metrics/src/tests/metric_timer_test.cpp +++ b/metrics/src/tests/metric_timer_test.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp index a086cf70ca9..e4a2761cd73 100644 --- a/metrics/src/tests/metricmanagertest.cpp +++ b/metrics/src/tests/metricmanagertest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/metrics/src/tests/metricsettest.cpp b/metrics/src/tests/metricsettest.cpp index 3deddfc2507..2b45bd049e0 100644 --- a/metrics/src/tests/metricsettest.cpp +++ b/metrics/src/tests/metricsettest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/metrics/src/tests/metrictest.cpp b/metrics/src/tests/metrictest.cpp index 04f6b6e85b4..f232f9b69aa 100644 --- a/metrics/src/tests/metrictest.cpp +++ b/metrics/src/tests/metrictest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include #include diff --git a/metrics/src/tests/snapshottest.cpp b/metrics/src/tests/snapshottest.cpp index ab624bb5731..5c13a0f82b6 100644 --- a/metrics/src/tests/snapshottest.cpp +++ b/metrics/src/tests/snapshottest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/metrics/src/tests/stresstest.cpp b/metrics/src/tests/stresstest.cpp index 0c06ca70aec..70194ecd861 100644 --- a/metrics/src/tests/stresstest.cpp +++ b/metrics/src/tests/stresstest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/metrics/src/tests/summetrictest.cpp b/metrics/src/tests/summetrictest.cpp index 8cc622d622a..b3bb1518ba0 100644 --- a/metrics/src/tests/summetrictest.cpp +++ b/metrics/src/tests/summetrictest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/metrics/src/tests/testrunner.cpp b/metrics/src/tests/testrunner.cpp index 9f871997873..9bf86e3276a 100644 --- a/metrics/src/tests/testrunner.cpp +++ b/metrics/src/tests/testrunner.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include diff --git a/metrics/src/tests/valuemetrictest.cpp b/metrics/src/tests/valuemetrictest.cpp index 745edf44081..b06b6806a8b 100644 --- a/metrics/src/tests/valuemetrictest.cpp +++ b/metrics/src/tests/valuemetrictest.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include #include diff --git a/metrics/src/vespa/metrics/CMakeLists.txt b/metrics/src/vespa/metrics/CMakeLists.txt index 4e7558fcfde..f93c1fb63c8 100644 --- a/metrics/src/vespa/metrics/CMakeLists.txt +++ b/metrics/src/vespa/metrics/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(metrics SOURCES countmetric.cpp diff --git a/metrics/src/vespa/metrics/countmetric.cpp b/metrics/src/vespa/metrics/countmetric.cpp index a19b14f9545..f62d068c40a 100644 --- a/metrics/src/vespa/metrics/countmetric.cpp +++ b/metrics/src/vespa/metrics/countmetric.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "countmetric.hpp" #include diff --git a/metrics/src/vespa/metrics/countmetric.h b/metrics/src/vespa/metrics/countmetric.h index 4de1674c5ed..a72a229b8b8 100644 --- a/metrics/src/vespa/metrics/countmetric.h +++ b/metrics/src/vespa/metrics/countmetric.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class CountMetric * \ingroup metrics diff --git a/metrics/src/vespa/metrics/countmetric.hpp b/metrics/src/vespa/metrics/countmetric.hpp index 516f6c660b6..836c50dc2b3 100644 --- a/metrics/src/vespa/metrics/countmetric.hpp +++ b/metrics/src/vespa/metrics/countmetric.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "countmetric.h" diff --git a/metrics/src/vespa/metrics/countmetricvalues.cpp b/metrics/src/vespa/metrics/countmetricvalues.cpp index 7fe3bb5b8ca..6be0f6a72d1 100644 --- a/metrics/src/vespa/metrics/countmetricvalues.cpp +++ b/metrics/src/vespa/metrics/countmetricvalues.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "countmetricvalues.hpp" diff --git a/metrics/src/vespa/metrics/countmetricvalues.h b/metrics/src/vespa/metrics/countmetricvalues.h index 226d1a53ddb..210668972a9 100644 --- a/metrics/src/vespa/metrics/countmetricvalues.h +++ b/metrics/src/vespa/metrics/countmetricvalues.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class CountMetric * \ingroup metrics diff --git a/metrics/src/vespa/metrics/countmetricvalues.hpp b/metrics/src/vespa/metrics/countmetricvalues.hpp index 15732a7c1d5..3d94b0b23ee 100644 --- a/metrics/src/vespa/metrics/countmetricvalues.hpp +++ b/metrics/src/vespa/metrics/countmetricvalues.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "countmetricvalues.h" diff --git a/metrics/src/vespa/metrics/jsonwriter.cpp b/metrics/src/vespa/metrics/jsonwriter.cpp index d0b269a1521..0847a5a1624 100644 --- a/metrics/src/vespa/metrics/jsonwriter.cpp +++ b/metrics/src/vespa/metrics/jsonwriter.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include #include diff --git a/metrics/src/vespa/metrics/jsonwriter.h b/metrics/src/vespa/metrics/jsonwriter.h index 07fdc9c22c2..43f19ffd268 100644 --- a/metrics/src/vespa/metrics/jsonwriter.h +++ b/metrics/src/vespa/metrics/jsonwriter.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/metrics/src/vespa/metrics/loadmetric.cpp b/metrics/src/vespa/metrics/loadmetric.cpp index 94fc2b9db7c..861b1256bff 100644 --- a/metrics/src/vespa/metrics/loadmetric.cpp +++ b/metrics/src/vespa/metrics/loadmetric.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "loadmetric.hpp" #include "valuemetric.h" #include "countmetric.h" diff --git a/metrics/src/vespa/metrics/loadmetric.h b/metrics/src/vespa/metrics/loadmetric.h index 8a637325a69..2aec4cb7383 100644 --- a/metrics/src/vespa/metrics/loadmetric.h +++ b/metrics/src/vespa/metrics/loadmetric.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \file loadmetric.h * \ingroup metrics diff --git a/metrics/src/vespa/metrics/loadmetric.hpp b/metrics/src/vespa/metrics/loadmetric.hpp index 781a26a718d..3741783180e 100644 --- a/metrics/src/vespa/metrics/loadmetric.hpp +++ b/metrics/src/vespa/metrics/loadmetric.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "loadmetric.h" diff --git a/metrics/src/vespa/metrics/loadtype.h b/metrics/src/vespa/metrics/loadtype.h index 7d802ebf456..60a50b2a69b 100644 --- a/metrics/src/vespa/metrics/loadtype.h +++ b/metrics/src/vespa/metrics/loadtype.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/metrics/src/vespa/metrics/memoryconsumption.cpp b/metrics/src/vespa/metrics/memoryconsumption.cpp index 7cfda8f28af..31748b836c4 100644 --- a/metrics/src/vespa/metrics/memoryconsumption.cpp +++ b/metrics/src/vespa/metrics/memoryconsumption.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "memoryconsumption.h" #include #include diff --git a/metrics/src/vespa/metrics/memoryconsumption.h b/metrics/src/vespa/metrics/memoryconsumption.h index 8ac724b7a43..a456e9ae8e0 100644 --- a/metrics/src/vespa/metrics/memoryconsumption.h +++ b/metrics/src/vespa/metrics/memoryconsumption.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class metrics::MemoryConsumption * \ingroup metrics diff --git a/metrics/src/vespa/metrics/metric.cpp b/metrics/src/vespa/metrics/metric.cpp index 42096031486..0c99409a8bb 100644 --- a/metrics/src/vespa/metrics/metric.cpp +++ b/metrics/src/vespa/metrics/metric.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "metric.h" #include "countmetric.h" diff --git a/metrics/src/vespa/metrics/metric.h b/metrics/src/vespa/metrics/metric.h index 7819dc5f012..fe698618d48 100644 --- a/metrics/src/vespa/metrics/metric.h +++ b/metrics/src/vespa/metrics/metric.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp index c1bcc126623..c352f0ee5ab 100644 --- a/metrics/src/vespa/metrics/metricmanager.cpp +++ b/metrics/src/vespa/metrics/metricmanager.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "metricmanager.h" #include "countmetric.h" diff --git a/metrics/src/vespa/metrics/metricmanager.h b/metrics/src/vespa/metrics/metricmanager.h index 7aeca264328..58a8fd4c45a 100644 --- a/metrics/src/vespa/metrics/metricmanager.h +++ b/metrics/src/vespa/metrics/metricmanager.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class metrics::MetricManager * diff --git a/metrics/src/vespa/metrics/metrics.h b/metrics/src/vespa/metrics/metrics.h index 256dc9fe3b4..db18bbefdbf 100644 --- a/metrics/src/vespa/metrics/metrics.h +++ b/metrics/src/vespa/metrics/metrics.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * File to include if you want to get all the most used metrics classes * included. diff --git a/metrics/src/vespa/metrics/metricset.cpp b/metrics/src/vespa/metrics/metricset.cpp index 0bc2f3363dc..c9acbaafce2 100644 --- a/metrics/src/vespa/metrics/metricset.cpp +++ b/metrics/src/vespa/metrics/metricset.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "metricset.h" #include "memoryconsumption.h" diff --git a/metrics/src/vespa/metrics/metricset.h b/metrics/src/vespa/metrics/metricset.h index 519ea71d67f..f96ba5085b0 100644 --- a/metrics/src/vespa/metrics/metricset.h +++ b/metrics/src/vespa/metrics/metricset.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class metrics::MetricSet * \ingroup metrics diff --git a/metrics/src/vespa/metrics/metricsmanager.def b/metrics/src/vespa/metrics/metricsmanager.def index 11e00eda286..fdf6d1b78e5 100644 --- a/metrics/src/vespa/metrics/metricsmanager.def +++ b/metrics/src/vespa/metrics/metricsmanager.def @@ -1,4 +1,4 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. version=4 namespace=metrics diff --git a/metrics/src/vespa/metrics/metricsnapshot.cpp b/metrics/src/vespa/metrics/metricsnapshot.cpp index 78fbf6e57a2..1625de3b106 100644 --- a/metrics/src/vespa/metrics/metricsnapshot.cpp +++ b/metrics/src/vespa/metrics/metricsnapshot.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "metricsnapshot.h" #include "metricmanager.h" #include diff --git a/metrics/src/vespa/metrics/metricsnapshot.h b/metrics/src/vespa/metrics/metricsnapshot.h index 4cf8d113743..121099ccf3e 100644 --- a/metrics/src/vespa/metrics/metricsnapshot.h +++ b/metrics/src/vespa/metrics/metricsnapshot.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class metrics::MetricSnapshot diff --git a/metrics/src/vespa/metrics/metrictimer.cpp b/metrics/src/vespa/metrics/metrictimer.cpp index 1c5672a4060..cb291e9c686 100644 --- a/metrics/src/vespa/metrics/metrictimer.cpp +++ b/metrics/src/vespa/metrics/metrictimer.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include namespace metrics { diff --git a/metrics/src/vespa/metrics/metrictimer.h b/metrics/src/vespa/metrics/metrictimer.h index 096ba3e27af..bd1782f299f 100644 --- a/metrics/src/vespa/metrics/metrictimer.h +++ b/metrics/src/vespa/metrics/metrictimer.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class MetricTimer * @ingruop metrics diff --git a/metrics/src/vespa/metrics/metricvalueset.cpp b/metrics/src/vespa/metrics/metricvalueset.cpp index 0171c9abb7e..bb243dfff36 100644 --- a/metrics/src/vespa/metrics/metricvalueset.cpp +++ b/metrics/src/vespa/metrics/metricvalueset.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "metricvalueset.hpp" #include "valuemetricvalues.h" diff --git a/metrics/src/vespa/metrics/metricvalueset.h b/metrics/src/vespa/metrics/metricvalueset.h index 41498b6503c..e934a5cdb6f 100644 --- a/metrics/src/vespa/metrics/metricvalueset.h +++ b/metrics/src/vespa/metrics/metricvalueset.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class MetricValueSet * \ingroup metrics diff --git a/metrics/src/vespa/metrics/metricvalueset.hpp b/metrics/src/vespa/metrics/metricvalueset.hpp index 8c5b32afcf8..be62bab3f1e 100644 --- a/metrics/src/vespa/metrics/metricvalueset.hpp +++ b/metrics/src/vespa/metrics/metricvalueset.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "metricvalueset.h" diff --git a/metrics/src/vespa/metrics/namehash.cpp b/metrics/src/vespa/metrics/namehash.cpp index bd0b3a05697..d957656a731 100644 --- a/metrics/src/vespa/metrics/namehash.cpp +++ b/metrics/src/vespa/metrics/namehash.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "namehash.h" #include "memoryconsumption.h" diff --git a/metrics/src/vespa/metrics/namehash.h b/metrics/src/vespa/metrics/namehash.h index 94b4c984f6b..ee1bc3e52a8 100644 --- a/metrics/src/vespa/metrics/namehash.h +++ b/metrics/src/vespa/metrics/namehash.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * \class metrics::NameHash * \ingroup metrics diff --git a/metrics/src/vespa/metrics/printutils.cpp b/metrics/src/vespa/metrics/printutils.cpp index 974a4523366..2209ebd5da7 100644 --- a/metrics/src/vespa/metrics/printutils.cpp +++ b/metrics/src/vespa/metrics/printutils.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "printutils.h" #include diff --git a/metrics/src/vespa/metrics/printutils.h b/metrics/src/vespa/metrics/printutils.h index a580ad809be..93c0750a2e3 100644 --- a/metrics/src/vespa/metrics/printutils.h +++ b/metrics/src/vespa/metrics/printutils.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * This file contains utility functions to help print out metric snapshots in diff --git a/metrics/src/vespa/metrics/state_api_adapter.cpp b/metrics/src/vespa/metrics/state_api_adapter.cpp index ebb4fb4fd49..d675d3fa763 100644 --- a/metrics/src/vespa/metrics/state_api_adapter.cpp +++ b/metrics/src/vespa/metrics/state_api_adapter.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "jsonwriter.h" #include "state_api_adapter.h" #include "metricmanager.h" diff --git a/metrics/src/vespa/metrics/state_api_adapter.h b/metrics/src/vespa/metrics/state_api_adapter.h index ccf7e73471e..df3175dd614 100644 --- a/metrics/src/vespa/metrics/state_api_adapter.h +++ b/metrics/src/vespa/metrics/state_api_adapter.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/metrics/src/vespa/metrics/summetric.cpp b/metrics/src/vespa/metrics/summetric.cpp index 6cfdcded143..bb75e9dc36c 100644 --- a/metrics/src/vespa/metrics/summetric.cpp +++ b/metrics/src/vespa/metrics/summetric.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "summetric.hpp" #include "valuemetric.h" diff --git a/metrics/src/vespa/metrics/summetric.h b/metrics/src/vespa/metrics/summetric.h index 784ae1f20e7..04ae1454a50 100644 --- a/metrics/src/vespa/metrics/summetric.h +++ b/metrics/src/vespa/metrics/summetric.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class metrics::CounterMetric * @ingroup metrics diff --git a/metrics/src/vespa/metrics/summetric.hpp b/metrics/src/vespa/metrics/summetric.hpp index 484d4f08169..3e85aa0e215 100644 --- a/metrics/src/vespa/metrics/summetric.hpp +++ b/metrics/src/vespa/metrics/summetric.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "summetric.h" diff --git a/metrics/src/vespa/metrics/textwriter.cpp b/metrics/src/vespa/metrics/textwriter.cpp index 9ce1005821f..c016ef1145b 100644 --- a/metrics/src/vespa/metrics/textwriter.cpp +++ b/metrics/src/vespa/metrics/textwriter.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "textwriter.h" #include "countmetric.h" diff --git a/metrics/src/vespa/metrics/textwriter.h b/metrics/src/vespa/metrics/textwriter.h index c4267f07197..8d87a13ce51 100644 --- a/metrics/src/vespa/metrics/textwriter.h +++ b/metrics/src/vespa/metrics/textwriter.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/metrics/src/vespa/metrics/updatehook.h b/metrics/src/vespa/metrics/updatehook.h index 031b36a1e5a..20d7c502a45 100644 --- a/metrics/src/vespa/metrics/updatehook.h +++ b/metrics/src/vespa/metrics/updatehook.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include diff --git a/metrics/src/vespa/metrics/valuemetric.cpp b/metrics/src/vespa/metrics/valuemetric.cpp index 04b442829ed..0a90b392151 100644 --- a/metrics/src/vespa/metrics/valuemetric.cpp +++ b/metrics/src/vespa/metrics/valuemetric.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "valuemetric.hpp" #include diff --git a/metrics/src/vespa/metrics/valuemetric.h b/metrics/src/vespa/metrics/valuemetric.h index f25f9006da7..56bed68c6f3 100644 --- a/metrics/src/vespa/metrics/valuemetric.h +++ b/metrics/src/vespa/metrics/valuemetric.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class metrics::ValueMetric * @ingroup metrics diff --git a/metrics/src/vespa/metrics/valuemetric.hpp b/metrics/src/vespa/metrics/valuemetric.hpp index 18c7837efb8..b09f35e3272 100644 --- a/metrics/src/vespa/metrics/valuemetric.hpp +++ b/metrics/src/vespa/metrics/valuemetric.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "valuemetric.h" diff --git a/metrics/src/vespa/metrics/valuemetricvalues.cpp b/metrics/src/vespa/metrics/valuemetricvalues.cpp index 12928db08dd..bab66bfa346 100644 --- a/metrics/src/vespa/metrics/valuemetricvalues.cpp +++ b/metrics/src/vespa/metrics/valuemetricvalues.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "valuemetricvalues.hpp" namespace metrics { diff --git a/metrics/src/vespa/metrics/valuemetricvalues.h b/metrics/src/vespa/metrics/valuemetricvalues.h index 6422ab1b263..347205ebe75 100644 --- a/metrics/src/vespa/metrics/valuemetricvalues.h +++ b/metrics/src/vespa/metrics/valuemetricvalues.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * @class metrics::ValueMetric * @ingroup metrics diff --git a/metrics/src/vespa/metrics/valuemetricvalues.hpp b/metrics/src/vespa/metrics/valuemetricvalues.hpp index 9f63898d4f3..e7f3e9e3239 100644 --- a/metrics/src/vespa/metrics/valuemetricvalues.hpp +++ b/metrics/src/vespa/metrics/valuemetricvalues.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once #include "valuemetricvalues.h" diff --git a/metrics/src/vespa/metrics/xmlwriter.cpp b/metrics/src/vespa/metrics/xmlwriter.cpp index 197ffdd1e3d..4a998b79294 100644 --- a/metrics/src/vespa/metrics/xmlwriter.cpp +++ b/metrics/src/vespa/metrics/xmlwriter.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "xmlwriter.h" #include "countmetric.h" diff --git a/metrics/src/vespa/metrics/xmlwriter.h b/metrics/src/vespa/metrics/xmlwriter.h index fbaf59d2ecd..c937d36ccf1 100644 --- a/metrics/src/vespa/metrics/xmlwriter.h +++ b/metrics/src/vespa/metrics/xmlwriter.h @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -- cgit v1.2.3