You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by lr...@apache.org on 2017/08/04 04:08:36 UTC
incubator-livy git commit: [MINOR] Add License header to
configuration templates
Repository: incubator-livy
Updated Branches:
refs/heads/master 2898d82dd -> 59dee6327
[MINOR] Add License header to configuration templates
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/59dee632
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/59dee632
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/59dee632
Branch: refs/heads/master
Commit: 59dee632742a9e57960c2cab0b9fffb06dea3f4e
Parents: 2898d82
Author: Luciano Resende <lr...@apache.org>
Authored: Thu Aug 3 21:08:27 2017 -0700
Committer: Luciano Resende <lr...@apache.org>
Committed: Thu Aug 3 21:08:27 2017 -0700
----------------------------------------------------------------------
.rat-excludes | 1 -
conf/livy-client.conf.template | 17 +++++++++++++++++
conf/livy.conf.template | 18 +++++++++++++++++-
conf/log4j.properties.template | 1 +
conf/spark-blacklist.conf.template | 16 ++++++++++++++++
5 files changed, 51 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/59dee632/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 6b03fcc..3cd9233 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -1,6 +1,5 @@
.rat-excludes
logs/*
-conf/*
**/*.conf
**/*.json
**/*.md
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/59dee632/conf/livy-client.conf.template
----------------------------------------------------------------------
diff --git a/conf/livy-client.conf.template b/conf/livy-client.conf.template
index 06ad653..1737124 100644
--- a/conf/livy-client.conf.template
+++ b/conf/livy-client.conf.template
@@ -1,4 +1,21 @@
#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
# Configurations for a Livy Client, any configurations set here will override any
# livy or spark-default configurations.
#
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/59dee632/conf/livy.conf.template
----------------------------------------------------------------------
diff --git a/conf/livy.conf.template b/conf/livy.conf.template
index 59fe2a0..2425059 100644
--- a/conf/livy.conf.template
+++ b/conf/livy.conf.template
@@ -1,3 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Use this keystore for the SSL certificate and key.
# livy.keystore =
@@ -122,4 +138,4 @@
# A list of users with comma separated has the permission to view other user's infomation, like
# submitted session state, statement results.
-# livy.server.access-control.view-users =
\ No newline at end of file
+# livy.server.access-control.view-users =
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/59dee632/conf/log4j.properties.template
----------------------------------------------------------------------
diff --git a/conf/log4j.properties.template b/conf/log4j.properties.template
index 18e271c..70b67a6 100644
--- a/conf/log4j.properties.template
+++ b/conf/log4j.properties.template
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/59dee632/conf/spark-blacklist.conf.template
----------------------------------------------------------------------
diff --git a/conf/spark-blacklist.conf.template b/conf/spark-blacklist.conf.template
index b9f0ec2..e371ed2 100644
--- a/conf/spark-blacklist.conf.template
+++ b/conf/spark-blacklist.conf.template
@@ -1,4 +1,20 @@
#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
# Configuration override / blacklist. Defines a list of properties that users are not allowed
# to override when starting Spark sessions.
#