Commit Graph

927 Commits

Author SHA1 Message Date
slguan 055c8743f1
Update connector-ch.md 2019-12-07 16:04:43 +08:00
haojun Liao 5cbac641ff
Merge pull request #871 from taosdata/feature/ylxie
add client config reference in java connector doc
2019-12-07 15:54:12 +08:00
fangpanpan 83bee30498
Merge pull request #872 from taosdata/feature/lihui
[TBASE-1292]
2019-12-07 15:45:25 +08:00
lihui ded1757cc6 [TBASE-1292] 2019-12-07 15:42:46 +08:00
xieyinglin c482f8aca6 add client config reference in java connector doc 2019-12-07 15:37:30 +08:00
haojun Liao 571f0a708b
Merge pull request #866 from taosdata/feature/fangstatic
correct static warning
2019-12-07 15:12:31 +08:00
haojun Liao 8819938152
Merge pull request #867 from taosdata/feature/ylxie
Feature/ylxie
2019-12-07 15:10:55 +08:00
slguan 376be5b56d
Merge pull request #870 from taosdata/hotfix/#868
fix #868
2019-12-07 15:03:19 +08:00
fang a42cf81e86 correct static error, deference a null pointer 2019-12-07 15:02:24 +08:00
Hongze Cheng 79b2344c47 fix #868 2019-12-07 15:00:22 +08:00
fang 90b9967d6e correct static error, deference a null pointer 2019-12-07 14:58:01 +08:00
fang f71b582fd9 Merge branch 'develop' into feature/fangstatic 2019-12-07 14:02:34 +08:00
xieyinglin 4cde960e72 add java connector doc 2019-12-07 12:05:56 +08:00
xieyinglin 5935a0c4d7 add java connector doc 2019-12-07 12:05:05 +08:00
xieyinglin 35823e97d3 Merge branch 'develop' into feature/ylxie 2019-12-07 11:58:52 +08:00
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
hzcheng b6e668a082
Merge pull request #861 from taosdata/hotfix/TBASE-1284
Hotfix/tbase 1284
2019-12-06 10:25:40 +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
lihui 5a6d376265 [1292] 2019-12-05 17:28:15 +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 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