xieyinglin
|
6a24427b99
|
add .mvn/ to .gitignore
|
2019-12-07 11:55:12 +08:00 |
|
xieyinglin
|
51c0f58ce6
|
edit ignore
|
2019-12-07 11:51:37 +08:00 |
slguan
|
14ab4c7543
|
correct static warning
|
2019-12-07 11:45:25 +08:00 |
|
xieyinglin
|
f7bf02d958
|
Merge branch 'feature/ylxie' into develop
|
2019-12-07 11:12:57 +08:00 |
|
xieyinglin
|
752b365c71
|
add some notice
|
2019-12-06 18:11:23 +08:00 |
plum-lihui
|
861e36f5e9
|
Merge pull request #865 from taosdata/hotfix/fix-wrong-log
fix wrong log in timer
|
2019-12-06 17:50:34 +08:00 |
localvar
|
7e1cb6fd55
|
fix wrong log in timer
|
2019-12-06 09:47:23 +00:00 |
|
xieyinglin
|
c18296cc57
|
edit the title
|
2019-12-06 17:32:22 +08:00 |
|
xieyinglin
|
6f69f07ecb
|
edit style
|
2019-12-06 17:22:23 +08:00 |
|
xieyinglin
|
57604a7198
|
edit title
|
2019-12-06 17:16:07 +08:00 |
fangpanpan
|
7154df7695
|
Merge pull request #864 from taosdata/feature/lihui
[version pos]
|
2019-12-06 17:06:22 +08:00 |
lihui
|
1e9f100473
|
[version pos]
|
2019-12-06 17:03:53 +08:00 |
|
xieyinglin
|
b040187161
|
add jdbc demo
|
2019-12-06 16:50:51 +08:00 |
|
fangpanpan
|
bcc03bad21
|
Merge pull request #863 from taosdata/release/v1.6.4.2
Release/v1.6.4.2
|
2019-12-06 14:24:58 +08:00 |
|
slguan
|
c972e1ca8f
|
version.c
|
2019-12-06 13:59:39 +08:00 |
|
slguan
|
cbdeb351df
|
version.c
|
2019-12-06 13:53:26 +08:00 |
hzcheng
|
b6e668a082
|
Merge pull request #861 from taosdata/hotfix/TBASE-1284
Hotfix/tbase 1284
|
2019-12-06 10:25:40 +08:00 |
|
hzcheng
|
514f2ed512
|
Merge pull request #860 from taosdata/hotfix/TBASE-1284
[TBASE-1284]
|
2019-12-06 10:25:12 +08:00 |
|
slguan
|
a56b019a25
|
[TBASE-1284]
|
2019-12-06 10:21:27 +08:00 |
|
slguan
|
3dc06fc223
|
Merge pull request #859 from taosdata/feature/lihui
[1292]
|
2019-12-06 10:15:57 +08:00 |
|
slguan
|
92a9613e7c
|
[TBASE-1284]
|
2019-12-06 10:14:07 +08:00 |
hjxilinx
|
1a5ae0d1c3
|
[tbase-1282]
|
2019-12-06 10:10:33 +08:00 |
|
hjxilinx
|
8de14a0c7d
|
[tbase-1282]
|
2019-12-06 10:08:42 +08:00 |
|
slguan
|
6864dcb57f
|
add some log for jdbc
|
2019-12-05 18:02:45 +08:00 |
|
lihui
|
5a6d376265
|
[1292]
|
2019-12-05 17:28:15 +08:00 |
|
slguan
|
528de8e6bf
|
Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan
|
2019-12-05 16:56:57 +08:00 |
|
slguan
|
6fb9ee3395
|
Merge branch 'develop' into feature/slguan
|
2019-12-05 16:50:34 +08:00 |
|
slguan
|
341d186e4b
|
Merge pull request #858 from taosdata/hotfix/#856
Hotfix/#856
|
2019-12-05 15:47:16 +08:00 |
|
slguan
|
a425bb51c6
|
Merge pull request #857 from taosdata/hotfix/#856
fix #856
|
2019-12-05 15:46:37 +08:00 |
|
Hongze Cheng
|
cff3009a41
|
fix #856
|
2019-12-05 15:40:09 +08:00 |
|
Bomin Zhang
|
0b40d39df2
|
Merge pull request #855 from taosdata/feature/lihui
[TBASE-1288]
|
2019-12-05 11:16:30 +08:00 |
|
plum-lihui
|
8357e5c371
|
Merge pull request #854 from taosdata/feature/fangdoc
Feature/fangdoc
|
2019-12-05 11:15:16 +08:00 |
|
lihui
|
60629d31d6
|
[TBASE-1288]
|
2019-12-05 11:05:14 +08:00 |
fang
|
2a6cfdfbab
|
Merge branch 'feature/fangdoc' of https://github.com/taosdata/TDengine into feature/fangdoc
|
2019-12-05 10:08:29 +08:00 |
|
fang
|
a0b79bd771
|
python connector user guide
|
2019-12-05 10:06:56 +08:00 |
|
slguan
|
39ace3f38e
|
fix some log errors
|
2019-12-05 09:31:42 +08:00 |
|
slguan
|
b908772583
|
Merge pull request #849 from taosdata/feature/liaohj
Feature/liaohj
|
2019-12-04 18:44:50 +08:00 |
|
hjxilinx
|
372ac9c27d
|
[tbase-1282]
|
2019-12-04 18:38:31 +08:00 |
|
hjxilinx
|
30975a7432
|
[tbase-1189]
|
2019-12-04 18:36:40 +08:00 |
|
hjxilinx
|
ae9a948ba3
|
[tbase-897]
|
2019-12-04 18:35:10 +08:00 |
|
hjxilinx
|
888ddaeba4
|
add timezone configuration in the taos.cfg
|
2019-12-04 18:29:44 +08:00 |
|
fangpanpan
|
1207eb1f91
|
Merge pull request #847 from taosdata/feature/lihui
Feature/lihui
|
2019-12-04 16:13:04 +08:00 |
|
lihui
|
886b9aac4b
|
[TBASE-816]
|
2019-12-04 16:10:18 +08:00 |
|
lihui
|
63f6d35e68
|
Merge branch 'develop' into feature/lihui
|
2019-12-04 16:09:15 +08:00 |
|
lihui
|
641c1e44d0
|
[TBASE-816]
|
2019-12-04 16:07:25 +08:00 |
|
plum-lihui
|
54b0d8f5dc
|
Merge pull request #830 from Allenscript/fix_raspbian_compile_atomic_not_found_error
fix compile for raspbian on RaspberryPI 4B atomic not found error
|
2019-12-04 16:06:39 +08:00 |
|
slguan
|
54ebcfd719
|
Merge pull request #846 from taosdata/hjxilinx-patch-2-1
Hjxilinx patch 2 1
|
2019-12-04 16:06:01 +08:00 |
|
slguan
|
c78474e95d
|
Merge branch 'develop' into hjxilinx-patch-2-1
|
2019-12-04 16:05:53 +08:00 |
haojun Liao
|
24a8e3a65b
|
Update administrator-ch.md
|
2019-12-04 15:56:59 +08:00 |
|
fangpanpan
|
fd684bf212
|
Merge pull request #843 from taosdata/hjxilinx-patch-2
Update administrator-ch.md
|
2019-12-04 15:13:22 +08:00 |