Commit Graph

857 Commits

Author SHA1 Message Date
slguan 8c2ecd3e98
Merge pull request #776 from taosdata/feature/liaohj
Feature/liaohj
2019-11-26 22:52:04 +08:00
slguan bb4cdad92c Handle syntax errors in windows compilation 2019-11-26 22:45:07 +08:00
slguan 2f0ab1ac86 version.c 2019-11-26 21:57:29 +08:00
hjxilinx d9aa3d519c add the config option in the taos.cfg file 2019-11-26 21:34:18 +08:00
slguan fcd1316531 [TBASE-1229] 2019-11-26 19:26:32 +08:00
slguan b0f2738ebe [TBASE-1229] 2019-11-26 19:10:40 +08:00
lihui f73aaccb57 [TBASE-570] 2019-11-26 18:30:40 +08:00
slguan b419d1a0b0 [TBASE-1246] 2019-11-26 18:17:38 +08:00
Hongze Cheng ed253f2a2a fix a small bug 2019-11-26 17:47:29 +08:00
hjxilinx 178f5771f6 [jira none] 2019-11-26 17:27:30 +08:00
slguan 62971c0c03 [TBASE-1229] 2019-11-26 17:03:51 +08:00
hjxilinx 0509744973 [jira none] refactor codes 2019-11-26 16:19:31 +08:00
hjxilinx fbe9b5f852 [tbase-933] 2019-11-26 14:30:36 +08:00
Hongze Cheng 0ba6a7cdbf Merge branch 'develop' into feature/mergeimport 2019-11-26 10:06:40 +08:00
slguan 9f18522556 Merge branch 'develop' into feature/slguan 2019-11-26 09:16:56 +08:00
slguan bb5a0f8241
Merge pull request #771 from taosdata/feature/liaohj
Feature/liaohj
2019-11-26 09:14:37 +08:00
slguan befbfcc06a [TBASE-1236] 2019-11-25 22:27:25 +08:00
hjxilinx a48c13aaf1 [tbase-1225] 2019-11-25 18:06:37 +08:00
Hongze Cheng a3464134c8 fix small bug 2019-11-25 17:42:39 +08:00
hjxilinx cdaa3871a1 refactor code 2019-11-25 17:22:17 +08:00
slguan 72ce043d35
Merge pull request #770 from taosdata/feature/liaohj
Feature/liaohj
2019-11-25 16:27:37 +08:00
hjxilinx aceeed3b01 [tbase-1007] 2019-11-25 16:21:05 +08:00
Hongze Cheng 7d1da2127f a quick fix 2019-11-25 15:37:37 +08:00
haojun Liao 40617f5dd1
Merge pull request #769 from taosdata/feature/slguan
Solve the bug of incomplete vnode deletion and vpeer synchronization
2019-11-25 15:29:37 +08:00
Hongze Cheng 50c507c870 refactor error code return 2019-11-25 15:25:04 +08:00
slguan b96fdff863 Merge branch 'develop' into feature/slguan 2019-11-25 15:05:16 +08:00
slguan ac2ea8b4d0
Merge pull request #768 from taosdata/feature/liaohj
Feature/liaohj
2019-11-25 15:04:28 +08:00
slguan db8f5a849d [TBASE-1235] 2019-11-25 14:58:59 +08:00
slguan af036b8776 [TBASE-1235] 2019-11-25 14:45:29 +08:00
hjxilinx 22619e2d55 Merge branch 'develop' into feature/liaohj 2019-11-25 13:31:28 +08:00
slguan cbf8014c76 Merge branch 'develop' into feature/slguan 2019-11-25 13:27:27 +08:00
hjxilinx edd7ce2213 add error code if the query msg is not valid 2019-11-25 13:24:13 +08:00
hjxilinx 6c2cf34693 refactor some codes. 2019-11-25 13:23:05 +08:00
Hongze Cheng 534aa8b11d fix modification error 2019-11-25 10:04:48 +08:00
plum-lihui 0e9e6beee9
Merge pull request #767 from taosdata/hotfix/tbase-1233
fix tbase-1233: go connector cause client crash
2019-11-25 09:43:36 +08:00
slguan 0457d50708 [TBASE-1228] 2019-11-25 09:40:29 +08:00
localvar 69c8df7119 fix tbase-1233: go connector cause client crash 2019-11-25 09:37:38 +08:00
slguan 5e007a8e3e [TBASE-1230] 2019-11-24 19:48:46 +08:00
slguan 960aae4f09 [TBASE-1218] 2019-11-23 22:42:31 +08:00
fangpanpan cab25efd34
Merge pull request #763 from stevel032/github/761
Partial fix of #761, corrected bad characters
2019-11-23 17:55:40 +08:00
Hongze Cheng 528b601287 Fix TBASE-1114 2019-11-23 17:07:43 +08:00
slguan 00a8a0bd35
Merge pull request #766 from taosdata/feature/lihui
[TBASE-1215 ROLLBACK]
2019-11-23 15:28:10 +08:00
lihui 27657f2eb4 [TBASE-1215 ROLLBACK] 2019-11-23 15:26:33 +08:00
haojun Liao 91cd701d4d
Merge pull request #765 from taosdata/feature/slguan
rollback storage structure modification
2019-11-23 13:56:33 +08:00
haojun Liao be99073f3f
Merge pull request #764 from taosdata/feature/lihui
Feature/lihui
2019-11-23 13:55:20 +08:00
slguan 11370c913f [TBASE-1128] 2019-11-23 13:47:43 +08:00
lihui 6eeb797cb3 [TBASE-1215] 2019-11-23 11:59:27 +08:00
lihui 30773c4ed2 [TBASE-1215] 2019-11-23 11:30:11 +08:00
haojun Liao 553df7ff5c
Merge pull request #762 from taosdata/feature/slguan
Added some comments and solved some cluster bugs
2019-11-23 11:00:33 +08:00
Steven Li b7ba65c3c1 Partial fix of #761, corrected bad characters 2019-11-22 18:47:04 -08:00