Commit Graph

58936 Commits

Author SHA1 Message Date
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
slguan 1414e2ee10 [TBASE-1221] 2019-11-23 09:44:37 +08:00
slguan 862e8ee00b [TBASE-1128] 2019-11-22 23:22:13 +08:00
slguan 87ab685471 [TBASE-1128] 2019-11-22 20:01:22 +08:00
slguan 104455dc8c Merge remote-tracking branch 'origin/develop' into feature/slguan 2019-11-22 19:25:15 +08:00
slguan ada94e72d2 [TBASE-1128] 2019-11-22 19:23:49 +08:00
slguan 33160b6b04
Merge pull request #759 from taosdata/hotfix/tbase-1217
fix TBASE-1217
2019-11-22 18:13:24 +08:00
localvar fe632ad6d8 fix TBASE-1217 2019-11-22 09:58:57 +00:00
plum-lihui 9eb6d73566
Merge pull request #757 from taosdata/feature/liaohj
[tbase-1212]
2019-11-22 15:17:35 +08:00
slguan 026d0b499b [TBASE-1128] 2019-11-22 14:18:41 +08:00
fangpanpan 34276fc062
Merge pull request #758 from taosdata/feature/lihui
[modify packging script]
2019-11-22 12:37:10 +08:00
lihui ccfd17df51 [modify packging script] 2019-11-22 12:26:04 +08:00
haojun Liao 8742300cd5
Merge pull request #756 from taosdata/feature/lihui
[TBASE-1215]
2019-11-22 10:41:01 +08:00
hjxilinx a93e487636 [tbase-1212] 2019-11-22 10:27:50 +08:00
slguan 7725aa1c9a [TBASE-1129] 2019-11-22 00:09:00 +08:00
lihui aeb19d1eb0 [TBASE-1215] 2019-11-21 19:24:06 +08:00
slguan 86ad416657 [TBASE-1129] 2019-11-21 18:58:58 +08:00
slguan d8292d6630 [TBASE-1213] 2019-11-21 18:58:05 +08:00
hzcheng 11dd3efd29
Merge pull request #752 from taosdata/feature/liaohj
Feature/liaohj
2019-11-21 18:42:33 +08:00
hjxilinx 24863d6dc0 [tbase-1212] 2019-11-21 18:28:55 +08:00
Bomin Zhang 8715de7fa2
Merge pull request #755 from taosdata/feature/lihui
[TBASE-1123]
2019-11-21 17:57:57 +08:00
lihui 322abab8c8 [TBASE-1123] 2019-11-21 17:54:13 +08:00
lihui c8921fe916 [TBASE-1123] 2019-11-21 17:38:23 +08:00
fangpanpan a8a7ba3cfb
Merge pull request #753 from taosdata/feature/lihui
[TBASE-1123]
2019-11-21 17:23:59 +08:00