Commit Graph

27626 Commits

Author SHA1 Message Date
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
hjxilinx 0d963c5ab7 [jira none] 2019-11-30 15:41:00 +08:00
hjxilinx 15b467ab77 [tbase-1007] 2019-11-30 15:25:43 +08:00
hzcheng 1caa90dc9e
Merge pull request #803 from taosdata/feature/slguan
update some error message
2019-11-30 14:47:30 +08:00
slguan a46b27c2c2 update some error message 2019-11-30 10:20:58 +08:00
Jeff Tao 22fe4b193f
Merge pull request #792 from taosdata/feature/mergeimport
Feature/mergeimport
2019-11-30 09:47:38 +08:00
Bomin Zhang aefc043645
Merge pull request #801 from taosdata/feature/lihui
[TBASE-816]
2019-11-29 18:38:26 +08:00
lihui 2124c23611 [TBASE-816] 2019-11-29 18:22:39 +08:00
Hongze Cheng f06e25fe1a Merge branch 'develop' into feature/mergeimport 2019-11-29 15:24:51 +08:00
Hongze Cheng 92e5e239f6 refact more 2019-11-29 15:15:28 +08:00
Hongze Cheng a51d109adb refact part of code 2019-11-29 14:28:03 +08:00
Hongze Cheng a27fcc52b8 refactor part of code 2019-11-29 11:50:15 +08:00
Hongze Cheng 56bb3121ad refactor part of code 2019-11-29 10:19:08 +08:00
Hongze Cheng 6fabe650af change var name 2019-11-29 09:39:18 +08:00
slguan a5a1b0ee95 Merge branch 'develop' into feature/slguan 2019-11-28 22:51:26 +08:00
slguan 1353cff064 fix issue #626 and [TBASE-1192] 2019-11-28 22:45:35 +08:00
slguan 63a5d22320 fix issue #626 and [TBASE-1192] 2019-11-28 22:29:30 +08:00
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