You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/11/20 14:51:17 UTC
[2/2] flink git commit: [hotfix][license] Add missing licenses
[hotfix][license] Add missing licenses
This close #4794.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f0012645
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f0012645
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f0012645
Branch: refs/heads/release-1.4
Commit: f0012645986be200f248e9c469fe69e81bbe8d4b
Parents: 2b4f1b1
Author: yew1eb <ye...@gmail.com>
Authored: Wed Oct 11 02:52:35 2017 +0800
Committer: zentol <ch...@apache.org>
Committed: Mon Nov 20 15:51:04 2017 +0100
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/conf/zoo.cfg | 18 ++++++++++++++++++
.../assets/images/browserconfig.xml | 19 +++++++++++++++++++
.../web-dashboard/web/images/browserconfig.xml | 19 +++++++++++++++++++
pom.xml | 2 --
4 files changed, 56 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f0012645/flink-dist/src/main/flink-bin/conf/zoo.cfg
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/conf/zoo.cfg b/flink-dist/src/main/flink-bin/conf/zoo.cfg
index a14ec66..f598997 100644
--- a/flink-dist/src/main/flink-bin/conf/zoo.cfg
+++ b/flink-dist/src/main/flink-bin/conf/zoo.cfg
@@ -1,3 +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.
+################################################################################
+
# The number of milliseconds of each tick
tickTime=2000
http://git-wip-us.apache.org/repos/asf/flink/blob/f0012645/flink-runtime-web/web-dashboard/assets/images/browserconfig.xml
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/assets/images/browserconfig.xml b/flink-runtime-web/web-dashboard/assets/images/browserconfig.xml
index 81ec113..68bf638 100644
--- a/flink-runtime-web/web-dashboard/assets/images/browserconfig.xml
+++ b/flink-runtime-web/web-dashboard/assets/images/browserconfig.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+
<browserconfig>
<msapplication>
<tile>
http://git-wip-us.apache.org/repos/asf/flink/blob/f0012645/flink-runtime-web/web-dashboard/web/images/browserconfig.xml
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/images/browserconfig.xml b/flink-runtime-web/web-dashboard/web/images/browserconfig.xml
index 81ec113..68bf638 100644
--- a/flink-runtime-web/web-dashboard/web/images/browserconfig.xml
+++ b/flink-runtime-web/web-dashboard/web/images/browserconfig.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+
<browserconfig>
<msapplication>
<tile>
http://git-wip-us.apache.org/repos/asf/flink/blob/f0012645/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 890e7f6..d36ac3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -996,7 +996,6 @@ under the License.
<exclude>flink-runtime-web/web-dashboard/assets/fonts/fontawesome*</exclude>
<!-- web dashboard non-binary image assets -->
- <exclude>flink-runtime-web/web-dashboard/assets/images/browserconfig.xml</exclude>
<exclude>flink-runtime-web/web-dashboard/assets/images/manifest.json</exclude>
<exclude>flink-runtime-web/web-dashboard/assets/images/safari-pinned-tab.svg</exclude>
@@ -1031,7 +1030,6 @@ under the License.
<!-- Configuration Files. -->
<exclude>**/flink-bin/conf/slaves</exclude>
<exclude>**/flink-bin/conf/masters</exclude>
- <exclude>**/flink-bin/conf/zoo.cfg</exclude>
<!-- Administrative files in the main trunk. -->
<exclude>**/README.md</exclude>
<exclude>.github/**</exclude>