Commit Graph

913 Commits

Author SHA1 Message Date
slguan 2b21a75ae0 #928 2019-12-16 18:59:18 +08:00
fangpanpan 3ed436cce2
Merge pull request #927 from taosdata/feature-master/lihui
[TBASE-1348]
2019-12-16 14:46:57 +08:00
lihui 8a37c33fad [TBASE-1348] 2019-12-16 14:35:23 +08:00
fangpanpan ebce945ee1
Merge pull request #924 from taosdata/feature-master/lihui
[TBASE-1337]
2019-12-16 13:55:54 +08:00
lihui 193d2bc309 [TBASE-1337] 2019-12-16 13:52:30 +08:00
plum-lihui d129e3bf7f
Merge pull request #923 from taosdata/hotfix/#921
#921
2019-12-16 11:45:00 +08:00
slguan 5294542e2c #921 2019-12-16 11:22:40 +08:00
plum-lihui 69db6f24cc
Merge pull request #914 from taosdata/hotfix/TBASE-1273
can drop non-existent database
2019-12-12 16:02:39 +08:00
slguan 7301d83d11 Merge branch 'hotfix/TBASE-1325' 2019-12-10 19:30:08 +08:00
slguan a26f368c21 [TBASE-1325] 2019-12-10 19:18:16 +08:00
slguan 19e7565930
Merge pull request #899 from taosdata/hotfix-#898
Update tscUtil.c
2019-12-10 18:01:13 +08:00
haojun Liao 7538f4e755
Update tscSQLParser.c 2019-12-10 17:57:06 +08:00
haojun Liao e08aa1ab03
Update tscUtil.c
fix bugs in issue #898
2019-12-10 17:45:41 +08:00
slguan 430f1e4303
Merge pull request #891 from taosdata/feature-master/lihui
[TBASE-1142/1319]
2019-12-10 10:44:28 +08:00
lihui 103b8794da [TBASE-1142/1319] 2019-12-10 10:36:12 +08:00
slguan acb19de9d4 can drop non-existent database 2019-12-09 15:52:08 +08:00
slguan b9a62d60dc
Merge pull request #869 from taosdata/hotfix/#868
fix #868
2019-12-07 15:03:45 +08:00
Hongze Cheng 79b2344c47 fix #868 2019-12-07 15:00:22 +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 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 92a9613e7c [TBASE-1284] 2019-12-06 10:14:07 +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
slguan 527027d5f9
Merge pull request #844 from taosdata/feature/liaohj
[tbase-1269]
2019-12-04 10:03:27 +08:00
haojun Liao 893fac9da7
Merge pull request #824 from taosdata/hotfix/restful1
Hotfix/restful1
2019-12-02 21:37:55 +08:00
slguan de5047f4b2
Merge pull request #821 from taosdata/feature/lihui
Feature/lihui
2019-12-02 20:37:41 +08:00
slguan 2002c8e20b rror may occur when reading http chunked body 2019-12-02 20:34:32 +08:00
lihui d468cc5eb2 [TBASE-1271] 2019-12-02 19:01:20 +08:00
slguan 5e2d9325fd
Merge pull request #815 from taosdata/hotfix/#813
Hotfix/#813
2019-12-02 16:19:16 +08:00
Hongze Cheng 167d6cb70e fix #813 2019-12-02 15:47:18 +08:00
plum-lihui d15d76886f
Merge pull request #810 from taosdata/release/v1.6.4.0
fix some release scripts
2019-12-02 13:55:04 +08:00
plum-lihui cd8c4f8e3d
Merge pull request #811 from taosdata/feature/tliu
[TBASE 1270]revise the go connector description
2019-12-02 11:35:14 +08:00
liu0x54 2e60dfb3a0 [TBASE 1270]revise the go connector description 2019-12-02 11:13:33 +08:00
hjxilinx eaa767be1b [tbase-1269] 2019-12-01 21:34:39 +08:00
slguan faca8084e1 resolve conflicts 2019-12-01 13:24:12 +08:00
slguan 6a3b837951 Merge branch 'release/v1.6.4.0'
# Conflicts:
#	src/os/windows/src/twindows.c
#	src/system/src/vnodeImport.c
#	src/util/src/tutil.c
2019-12-01 13:19:13 +08:00
slguan a7f79b508f public v1.6.4.0 2019-12-01 12:27:29 +08:00
slguan 6d27c11e3b Merge branch 'develop' into release/v1.6.4.0 2019-12-01 09:30:23 +08:00
slguan 79fc94f019 [TBASE-1280] 2019-12-01 09:29:58 +08:00
slguan 0224972e63 fix some release scripts 2019-11-30 23:17:58 +08:00
hzcheng 59e60e457f
Merge pull request #809 from taosdata/hotfix/#808
fix #808
2019-11-30 23:14:07 +08:00
Jeff Tao 27f52b8975 fix #808 2019-11-30 22:37:22 +08:00
slguan e86237890e
Merge pull request #807 from taosdata/feature/lihui
[modify the name of the client install package]
2019-11-30 18:27:33 +08:00
huili 6bc4ab252b [modify the name of the client install package] 2019-11-30 18:08:57 +08:00
slguan 5cb0639250
Merge pull request #806 from taosdata/feature/liaohj
fix bug issue #804
2019-11-30 17:00:07 +08:00
hjxilinx 8b549b4eff fix bug issue #804 2019-11-30 16:58:10 +08:00
slguan 558c964995
Merge pull request #805 from taosdata/feature/liaohj
Feature/liaohj
2019-11-30 16:44:13 +08:00