From a9785bfd7b01ddc83ac4b6d8d6a0e9f3222b21d4 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 13 Jun 2017 20:46:46 +0200 Subject: Revert "Copyright header" --- .../yahoo/application/container/impl/ClassLoaderOsgiFramework.scala | 2 +- .../yahoo/application/container/impl/StandaloneContainerRunner.scala | 2 +- .../com/yahoo/container/standalone/CloudConfigYinstVariables.scala | 2 +- .../src/main/scala/com/yahoo/container/standalone/Converter.scala | 4 ++-- .../src/main/scala/com/yahoo/container/standalone/Environment.scala | 2 +- .../src/main/scala/com/yahoo/container/standalone/LocalFileDb.scala | 2 +- .../yahoo/container/standalone/StandaloneContainerApplication.scala | 2 +- .../com/yahoo/container/standalone/StandaloneSubscriberFactory.scala | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'standalone-container/src/main/scala/com/yahoo') diff --git a/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala b/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala index e07957db5a7..5a41462cb48 100644 --- a/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala +++ b/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala @@ -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.application.container.impl import com.yahoo.jdisc.application.{OsgiHeader, OsgiFramework} diff --git a/standalone-container/src/main/scala/com/yahoo/application/container/impl/StandaloneContainerRunner.scala b/standalone-container/src/main/scala/com/yahoo/application/container/impl/StandaloneContainerRunner.scala index 91634250fc5..57f60febb26 100644 --- a/standalone-container/src/main/scala/com/yahoo/application/container/impl/StandaloneContainerRunner.scala +++ b/standalone-container/src/main/scala/com/yahoo/application/container/impl/StandaloneContainerRunner.scala @@ -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.application.container.impl import java.nio.file.Files diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala index 0a888dc1208..f0447d492bc 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/CloudConfigYinstVariables.scala @@ -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.container.standalone import java.util.Optional diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/Converter.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/Converter.scala index 61128347319..443806d014b 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/Converter.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/Converter.scala @@ -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.container.standalone /** @@ -23,4 +23,4 @@ object Converter { implicit val javaBooleanConverter:Converter[java.lang.Boolean] = toConverter(_.toBoolean) -} +} \ No newline at end of file diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/Environment.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/Environment.scala index 4764f4698f0..98671e2addf 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/Environment.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/Environment.scala @@ -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.container.standalone /** diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/LocalFileDb.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/LocalFileDb.scala index c237aa25663..7af08a4685d 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/LocalFileDb.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/LocalFileDb.scala @@ -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.container.standalone import java.io.File diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala index 210394dcf88..c8eb8666bed 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala @@ -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.container.standalone import java.io.{File, IOException} diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala index 5ae300edc22..4ac88eaafae 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala @@ -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.container.standalone import com.yahoo.config.model.test.MockRoot -- cgit v1.2.3