You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/04/22 02:29:34 UTC
kylin git commit: KYLIN-2560 fix license headers in a few files
Repository: kylin
Updated Branches:
refs/heads/2.0.x 6692f36af -> 94e765a7a
KYLIN-2560 fix license headers in a few files
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/94e765a7
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/94e765a7
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/94e765a7
Branch: refs/heads/2.0.x
Commit: 94e765a7af2b63248e4b86ff44eb4a0ddbe2c772
Parents: 6692f36
Author: Li Yang <li...@apache.org>
Authored: Sat Apr 22 10:29:07 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Sat Apr 22 10:29:17 2017 +0800
----------------------------------------------------------------------
build/bin/kylin_port_replace_util.sh | 18 ++++++++++++++++++
.../kylin-backward-compatibility.properties | 16 ++++++++++++++++
pom.xml | 1 +
webapp/app/js/services/encodings.js | 19 +++++++++++++++++--
4 files changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/94e765a7/build/bin/kylin_port_replace_util.sh
----------------------------------------------------------------------
diff --git a/build/bin/kylin_port_replace_util.sh b/build/bin/kylin_port_replace_util.sh
index 366d8d0..47b0d74 100755
--- a/build/bin/kylin_port_replace_util.sh
+++ b/build/bin/kylin_port_replace_util.sh
@@ -1,4 +1,22 @@
#!/bin/bash
+
+#
+# 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.
+#
+
#exit if find error
# ============================================================================
http://git-wip-us.apache.org/repos/asf/kylin/blob/94e765a7/core-common/src/main/resources/kylin-backward-compatibility.properties
----------------------------------------------------------------------
diff --git a/core-common/src/main/resources/kylin-backward-compatibility.properties b/core-common/src/main/resources/kylin-backward-compatibility.properties
index c7d9cd7..66e6e87 100644
--- a/core-common/src/main/resources/kylin-backward-compatibility.properties
+++ b/core-common/src/main/resources/kylin-backward-compatibility.properties
@@ -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.
+#
### ENV ###
http://git-wip-us.apache.org/repos/asf/kylin/blob/94e765a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 40ccd0c..7985be7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1375,6 +1375,7 @@
<!-- text files without comments -->
<exclude>**/*.csv</exclude>
<exclude>**/*.json</exclude>
+ <exclude>**/*.json.bad</exclude>
<exclude>**/*.md</exclude>
<!-- binary files -->
http://git-wip-us.apache.org/repos/asf/kylin/blob/94e765a7/webapp/app/js/services/encodings.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/services/encodings.js b/webapp/app/js/services/encodings.js
index 99bb091..0de5b09 100644
--- a/webapp/app/js/services/encodings.js
+++ b/webapp/app/js/services/encodings.js
@@ -1,6 +1,21 @@
-/**
- * Created by luguosheng on 17/2/9.
+/*
+ * 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.
*/
+
KylinApp.factory('EncodingService', ['$resource', function ($resource, config) {
return $resource(Config.service.url + 'encodings/valid_encodings', {}, {
getEncodingMap: {method: 'GET', params: {}, isArray: false}