You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2021/01/10 16:07:56 UTC
[iotdb] branch fix_common_issue created (now 70d7bda)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch fix_common_issue
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 70d7bda fix copyright declaim in NOTICE; remove 'incubating' out of README_ZH.md; simplify pull_request_template.md
This branch includes the following new commits:
new 70d7bda fix copyright declaim in NOTICE; remove 'incubating' out of README_ZH.md; simplify pull_request_template.md
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: fix copyright declaim in NOTICE;
remove 'incubating' out of README_ZH.md; simplify pull_request_template.md
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_common_issue
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 70d7bdad0b7c62f679e850e80b0c2e73f65b85cd
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Jan 11 00:07:25 2021 +0800
fix copyright declaim in NOTICE; remove 'incubating' out of README_ZH.md; simplify pull_request_template.md
---
.github/pull_request_template.md | 37 ++-----------------------------------
NOTICE | 2 +-
NOTICE-binary | 2 +-
README_ZH.md | 4 ++--
4 files changed, 6 insertions(+), 39 deletions(-)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6f1fa8c..47578f6 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,41 +1,10 @@
-<!--
-
- 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.
-
--->
-
-<!-- Thanks for trying to help us make Apache IoTDB be the best it can be!
-Please fill out as much of the following information as is possible (where relevant, and remove it
-when irrelevant) to help make the intention and scope of this PR clear in order to ease review. -->
-
## Description
-<!-- Describe the goal of this PR, what problem are you fixing. If there is a corresponding issue,
-it's not necessary to repeat the description here,
-however, you may choose to keep one summary sentence. -->
-
-<!-- Describe your patch: what did you change in code? How did you fix the problem? -->
-
-<!-- If there are several relatively logically separate changes in this PR, create a mini-section
-for each of them. For example: -->
### Content1 ...
+
### Content2 ...
+
### Content3 ...
<!--
@@ -89,5 +58,3 @@ self-review the PR. -->
<hr>
##### Key changed/added classes (or packages if there are too many classes) in this PR
-
-<!-- Template copied and modified from Apache Druid-->
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
index 6dca58b..e983e45 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache IoTDB
-Copyright 2018-2020 The Apache Software Foundation.
+Copyright 2018-2021 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/NOTICE-binary b/NOTICE-binary
index 6dca58b..e983e45 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -1,5 +1,5 @@
Apache IoTDB
-Copyright 2018-2020 The Apache Software Foundation.
+Copyright 2018-2021 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/README_ZH.md b/README_ZH.md
index 611a6e2..250ea57 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -93,7 +93,7 @@ IoTDB提供了三种安装方法，您可以参考以下建议，选择最适合
* 从二进制文件安装。推荐的方法是从官方网站下载二进制文件，您将获得一个开箱即用的二进制发布包。
-* 使用Docker: dockerfile的路径是https://github.com/apache/incubat-iotdb/tree/master/docker/src/main
+* 使用Docker: dockerfile的路径是https://github.com/apache/iotdb/tree/master/docker/src/main
在这篇《快速入门》中，我们简要介绍如何使用源代码安装IoTDB。如需进一步资料，请参阅《用户指南》第3章。
@@ -117,7 +117,7 @@ git checkout release/x.x.x
> mvn clean package -DskipTests
```
-执行完成之后，可以在**distribution/target/apache-iotdb-{project.version}-incubating-bin.zip**找到编译完成的二进制版本(包括服务器和客户端)
+执行完成之后，可以在**distribution/target/apache-iotdb-{project.version}-bin.zip**找到编译完成的二进制版本(包括服务器和客户端)
> 注意:"thrift/target/generated-sources/thrift" 和 "antlr/target/generated-sources/antlr4" 目录需要添加到源代码根中，以免在 IDE 中产生编译错误。