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 2019/07/31 01:53:48 UTC
[incubator-iotdb] branch rel/0.8 updated (4260092 -> 9376a97)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 4260092 Merge pull request #321 from Genius-pig/rel/0.8
new 0db2fd6 Fixed the year in the notice
new 1e7e4b1 Fixed patent number
new 9376a97 Deleted 'SNAPSHOTS' in markdown docs
The 3 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.
Summary of changes:
NOTICE | 6 +++---
docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md | 2 +-
docs/Documentation/UserGuide/8-Tools-Grafana.md | 6 +++---
grafana/readme.md | 6 +++---
grafana/readme_zh.md | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
[incubator-iotdb] 02/03: Fixed patent number
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 1e7e4b1f5eec83ca5708dcd25f037e244b196de7
Author: Zihan Meng <40...@users.noreply.github.com>
AuthorDate: Mon Jul 29 12:01:03 2019 +0800
Fixed patent number
---
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NOTICE b/NOTICE
index a12965e..abc3834 100644
--- a/NOTICE
+++ b/NOTICE
@@ -10,7 +10,7 @@ IoTDB project uses 4 Chinese Patents:
* 201711384490X
* 201810111712.9
* 201711322631.5
-* 201711319331.1
+* 201711319331
According to the Apache 2.0 License. The owner of the patents, Tsinghua University,
grant the users the right to the use of patent under the requirement of Apache 2.0 License.
[incubator-iotdb] 01/03: Fixed the year in the notice
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 0db2fd627eea5ab54e4230fbf11ee71b80da143a
Author: Zihan Meng <40...@users.noreply.github.com>
AuthorDate: Mon Jul 29 11:17:57 2019 +0800
Fixed the year in the notice
---
NOTICE | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/NOTICE b/NOTICE
index 92e8847..a12965e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache IoTDB
-Copyright 2018 and onwards The Apache Software Foundation.
+Copyright 2019 and onwards The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -20,7 +20,7 @@ grant the users the right to the use of patent under the requirement of Apache 2
This product contains a modified portion of 'Apache Hive'
Apache Hive
-Copyright 2008-2018 The Apache Software Foundation
+Copyright 2008-2019 The Apache Software Foundation
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
\ No newline at end of file
[incubator-iotdb] 03/03: Deleted 'SNAPSHOTS' in markdown docs
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 9376a975a2c5a5b05047892b1c75334ff2354da9
Author: Zihan Meng <40...@users.noreply.github.com>
AuthorDate: Mon Jul 29 15:52:17 2019 +0800
Deleted 'SNAPSHOTS' in markdown docs
---
docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md | 2 +-
docs/Documentation/UserGuide/8-Tools-Grafana.md | 6 +++---
grafana/readme.md | 6 +++---
grafana/readme_zh.md | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md b/docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md
index ace7603..42c8919 100644
--- a/docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md
+++ b/docs/Documentation-CHN/UserGuide/8-Tools-Grafana.md
@@ -103,7 +103,7 @@ server.port = 8888
```shell
cd grafana/target/
-java -jar iotdb-grafana-{version}-SNAPSHOT.war
+java -jar iotdb-grafana-{version}.war
. ____ _ __ _ _
/\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \
( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
diff --git a/docs/Documentation/UserGuide/8-Tools-Grafana.md b/docs/Documentation/UserGuide/8-Tools-Grafana.md
index e670d52..771d2e1 100644
--- a/docs/Documentation/UserGuide/8-Tools-Grafana.md
+++ b/docs/Documentation/UserGuide/8-Tools-Grafana.md
@@ -84,7 +84,7 @@ mvn clean package -pl grafana -am -Dmaven.test.skip=true
cd grafana
```
-Copy `application.properties` from `conf/` directory to `target` directory. (Or just make sure that `application.properties` and `iotdb-grafana-{version}-SNAPSHOT.war` are in the same directory.)
+Copy `application.properties` from `conf/` directory to `target` directory. (Or just make sure that `application.properties` and `iotdb-grafana-{version}.war` are in the same directory.)
Edit `application.properties`
@@ -101,13 +101,13 @@ server.port = 8888
```shell
cd grafana/target/
-java -jar iotdb-grafana-{version}-SNAPSHOT.war
+java -jar iotdb-grafana-{version}.war
```
If you see the following output, iotdb-grafana connector is successfully activated.
```shell
-$ java -jar iotdb-grafana-{version}-SNAPSHOT.war
+$ java -jar iotdb-grafana-{version}.war
. ____ _ __ _ _
/\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \
diff --git a/grafana/readme.md b/grafana/readme.md
index df3ea75..7a5f539 100644
--- a/grafana/readme.md
+++ b/grafana/readme.md
@@ -57,7 +57,7 @@ mvn clean package -pl grafana -am -Dmaven.test.skip=true
cd grafana
```
-Copy `application.properties` from `conf/` directory to `target` directory.(Or just make sure that `application.properties` and `iotdb-grafana-{version}-SNAPSHOT.war` are in the same directory.)
+Copy `application.properties` from `conf/` directory to `target` directory.(Or just make sure that `application.properties` and `iotdb-grafana-{version}.war` are in the same directory.)
Edit `application.properties`
```
@@ -73,13 +73,13 @@ server.port = 8888
```shell
cd grafana/target/
-java -jar iotdb-grafana-{version}-SNAPSHOT.war
+java -jar iotdb-grafana-{version}.war
```
If you see the following output, iotdb-grafana connector is successfully activated.
```shell
-$ java -jar iotdb-grafana-{version}-SNAPSHOT.war
+$ java -jar iotdb-grafana-{version}.war
. ____ _ __ _ _
/\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \
diff --git a/grafana/readme_zh.md b/grafana/readme_zh.md
index 3e0f411..be31965 100644
--- a/grafana/readme_zh.md
+++ b/grafana/readme_zh.md
@@ -69,7 +69,7 @@ server.port = 8888
运行后端数据源连接器，在控制台输入
```shell
-$ java -jar iotdb-grafana-{version}-SNAPSHOT.war
+$ java -jar iotdb-grafana-{version}.war
. ____ _ __ _ _
/\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \