Commit Graph

27626 Commits

Author SHA1 Message Date
lihui 6489482064 [TBASE-898] 2019-11-27 19:19:45 +08:00
lihui 8be1568dfb Merge branch 'develop' into feature/lihui 2019-11-27 19:18:00 +08:00
slguan 8835fa9d05
Merge pull request #787 from taosdata/feature/liaohj
[jira none]
2019-11-27 19:11:40 +08:00
hjxilinx 0c0c7e271d [jira none] 2019-11-27 19:09:36 +08:00
slguan 279ac97029
Merge pull request #785 from taosdata/feature/detect-mem-leak
Feature/detect mem leak
2019-11-27 18:56:15 +08:00
slguan 574f9d4c74
Merge pull request #786 from taosdata/feature/liaohj
[tbase-874]
2019-11-27 18:53:31 +08:00
hjxilinx f0b93abbde [tbase-874] 2019-11-27 18:47:59 +08:00
haojun Liao 7570c7ff70
Merge pull request #784 from taosdata/feature/slguan
Handling cluster bugs
2019-11-27 18:36:44 +08:00
slguan a68ca3f031 Merge branch 'develop' into feature/slguan 2019-11-27 18:29:50 +08:00
slguan 5bec721de7 [TBASE-1229] 2019-11-27 16:05:38 +08:00
slguan 45ec74b6e1 remove some logs 2019-11-27 15:56:12 +08:00
lihui 40c1d4d4b0 Merge branch 'develop' into feature/lihui 2019-11-27 13:07:26 +08:00
fangpanpan e39bd6793b
Merge pull request #780 from taosdata/feature/lihui
[NONE]
2019-11-27 13:06:58 +08:00
lihui ad979353bd [NONE] 2019-11-27 13:03:34 +08:00
haojun Liao 3d59166816
Merge pull request #779 from taosdata/feature/slguan
Windows compilation, cluster stability modification
2019-11-27 10:08:53 +08:00
slguan 495bb3094b Merge branch 'develop' into feature/slguan 2019-11-27 09:45:25 +08:00
slguan 903b88a5e1
Merge pull request #777 from taosdata/feature/lihui
[TBASE-570]
2019-11-26 22:53:05 +08:00
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