Commit Graph

897 Commits

Author SHA1 Message Date
slguan 27215b3452 [TBASE-1258] 2019-11-28 21:58:12 +08:00
slguan 118861cee1 fix issue #626 and [TBASE-1192] 2019-11-28 21:21:08 +08:00
Hongze Cheng 4aa9c7adc9 change long back to int64_t 2019-11-28 17:07:28 +08:00
slguan dd4f909f42
Merge pull request #797 from taosdata/feature/liaohj
[jira none]only open and memory map one group of files
2019-11-28 16:26:28 +08:00
haojun Liao 3a30848e0b
Merge pull request #796 from taosdata/feature/slguan
Feature/slguan
2019-11-28 16:17:19 +08:00
hjxilinx 96ae0ca224 [jira none]only open and memory map one group of files 2019-11-28 16:15:08 +08:00
slguan 8254aba18a Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan 2019-11-28 14:40:35 +08:00
slguan 4512cf6a16 [TBASE-1252] 2019-11-28 14:22:57 +08:00
slguan f7d21f6c2c
Merge pull request #795 from taosdata/feature/liaohj
Feature/liaohj
2019-11-28 12:50:00 +08:00
hjxilinx 07a670027b [jira none] 2019-11-28 12:02:32 +08:00
hjxilinx 19ceadd6b2 [jira none] 2019-11-28 11:59:45 +08:00
slguan 38558450ba
Merge pull request #793 from taosdata/feature/liaohj
Feature/liaohj
2019-11-28 10:57:42 +08:00
hjxilinx 4466964afc [jira none] 2019-11-28 10:56:06 +08:00
hjxilinx 14c9d204f9 [jira none] 2019-11-28 10:46:20 +08:00
Hongze Cheng 99c6d1ec04 Merge branch 'develop' into feature/mergeimport 2019-11-28 10:44:58 +08:00
Bomin Zhang 7ed65adbd8
Merge pull request #791 from taosdata/feature/lihui
[TBASE-1256]
2019-11-28 10:39:26 +08:00
lihui e3edfccac0 [TBASE-1256] 2019-11-28 10:36:30 +08:00
slguan 178bddaf85
Merge pull request #790 from taosdata/feature/lihui
[TBASE-898]
2019-11-27 19:38:45 +08:00
lihui b74766ab31 [TBASE-898] 2019-11-27 19:35:11 +08:00
slguan b9caf79b31
Merge pull request #789 from taosdata/feature/liaohj
[jira none]
2019-11-27 19:32:20 +08:00
hjxilinx 3078b00872 Merge branch 'develop' into feature/liaohj 2019-11-27 19:30:33 +08:00
hjxilinx 3b97e52cd6 [jira none] 2019-11-27 19:29:28 +08:00
slguan b964a595b4
Merge pull request #788 from taosdata/feature/lihui
Feature/lihui
2019-11-27 19:21:45 +08:00
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