[GitHub] houshengbo closed pull request #3626: Add ASF license headers to all Scala .conf files.

[GitBox <gi...@apache.org>]

houshengbo closed pull request #3626: Add ASF license headers to all Scala .conf files.
URL: https://github.com/apache/incubator-openwhisk/pull/3626
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.scalafmt.conf b/.scalafmt.conf
index 0dc41ec0b2..7084efe600 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,6 +1,9 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 style = intellij
 danglingParentheses = false
 maxColumn = 120
 docstrings = JavaDoc
 rewrite.rules = [SortImports]
-project.git = true
\ No newline at end of file
+project.git = true
diff --git a/common/scala/src/main/resources/application.conf b/common/scala/src/main/resources/application.conf
index ea4bd46340..c61a60c546 100644
--- a/common/scala/src/main/resources/application.conf
+++ b/common/scala/src/main/resources/application.conf
@@ -1,3 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 # default application configuration file for akka
 include "logging"
 
diff --git a/common/scala/src/main/resources/logging.conf b/common/scala/src/main/resources/logging.conf
index 1882262c4f..46b9fc9e42 100644
--- a/common/scala/src/main/resources/logging.conf
+++ b/common/scala/src/main/resources/logging.conf
@@ -1,3 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 akka {
   loglevel = "DEBUG"
   loggers = ["akka.event.slf4j.Slf4jLogger"]
diff --git a/common/scala/src/main/resources/reference.conf b/common/scala/src/main/resources/reference.conf
index 8048d43bd4..35cf4f09a5 100644
--- a/common/scala/src/main/resources/reference.conf
+++ b/common/scala/src/main/resources/reference.conf
@@ -1,3 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 whisk.spi {
   ArtifactStoreProvider = whisk.core.database.CouchDbStoreProvider
   MessagingProvider = whisk.connector.kafka.KafkaMessagingProvider
diff --git a/core/controller/src/main/resources/application.conf b/core/controller/src/main/resources/application.conf
index e72bbc3b38..faec173231 100644
--- a/core/controller/src/main/resources/application.conf
+++ b/core/controller/src/main/resources/application.conf
@@ -1,3 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 # common logging configuration see common scala
 include "logging"
 include "akka-http-version"
diff --git a/core/controller/src/main/resources/reference.conf b/core/controller/src/main/resources/reference.conf
index ec7cd8a4cd..85712a4141 100644
--- a/core/controller/src/main/resources/reference.conf
+++ b/core/controller/src/main/resources/reference.conf
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
 
 whisk {
   cluster {
diff --git a/core/invoker/src/main/resources/application.conf b/core/invoker/src/main/resources/application.conf
index aaff48f287..ebd45e5838 100644
--- a/core/invoker/src/main/resources/application.conf
+++ b/core/invoker/src/main/resources/application.conf
@@ -1,3 +1,6 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
 # common logging configuration see common scala
 include "logging"
 include "akka-http-version"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services