Commit Graph

648 Commits

Author SHA1 Message Date
slguan ada94e72d2 [TBASE-1128] 2019-11-22 19:23:49 +08:00
slguan 026d0b499b [TBASE-1128] 2019-11-22 14:18:41 +08:00
slguan 7725aa1c9a [TBASE-1129] 2019-11-22 00:09:00 +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
slguan 2ae838b690 [TBASE-1129] 2019-11-20 23:20:19 +08:00
slguan 507ee7c3c7 [TBASE-1129] 2019-11-20 19:36:35 +08:00
slguan d320f26135 [TBASE-1128] 2019-11-20 14:17:35 +08:00
slguan 0eeae78538 [TBASE-1128] 2019-11-20 11:44:09 +08:00
slguan eb6be38711 remove some un necessary logs 2019-11-19 14:53:25 +08:00
slguan 5506dbe136 Merge branch 'develop' into feature/slguan 2019-11-19 14:24:25 +08:00
slguan d0a3a288a2 [TBASE-1186] 2019-11-19 14:23:47 +08:00
hzcheng a7b8c71ae3
Merge pull request #743 from taosdata/hotfix/#742
fix #742
2019-11-19 10:59:37 +08:00
Jeff Tao 1f953a0f63 fix #742
unCommittedBlocks shall be decreased by one
2019-11-19 10:36:39 +08:00
Jeff Tao 78158e32a5 fix #742 2019-11-19 10:31:53 +08:00
hzcheng 1f2465982a
Merge pull request #744 from taosdata/jtao1735-patch-1
add number list for the super table example
2019-11-18 21:57:14 +08:00
Jeff Tao fa3f34dcda
Update Super Table-ch.md 2019-11-18 21:53:20 +08:00
slguan 54e7aef8e6 [TBASE-1186] 2019-11-18 21:50:05 +08:00
Jeff Tao d731fc0dbf fix #742 2019-11-18 21:36:53 +08:00
slguan 6b77a4e11f Merge branch 'develop' into release/v1.6.4.0 2019-11-18 17:45:11 +08:00
slguan 8527587b49 [TBASE-1186] 2019-11-18 17:44:36 +08:00
slguan dbb888c117
Merge pull request #740 from taosdata/feature/bmzhang
fix TBASE-1176
2019-11-18 16:33:49 +08:00
localvar d458545cce fix TBASE-1176 2019-11-18 06:29:11 +00:00
fangpanpan 6240637a39
Merge pull request #739 from taosdata/feature/lihui
[TBASE-1123]
2019-11-18 14:14:27 +08:00
lihui 3fe4650924 [TBASE-1123] 2019-11-18 13:52:46 +08:00
fangpanpan 60032c4ccd
Merge pull request #737 from taosdata/feature/lihui
[TBASE-1123]
2019-11-18 12:11:42 +08:00
lihui f2cbef3fe1 [TBASE-1123] 2019-11-18 11:35:34 +08:00
plum-lihui b1bb894e63
Merge pull request #734 from taosdata/feature/slguan
Feature/slguan
2019-11-16 17:08:20 +08:00
slguan 5e48daf58f Merge branch 'develop' into feature/slguan 2019-11-16 16:56:14 +08:00
slguan 8c55d4860a [TBASE-1164] 2019-11-16 16:55:41 +08:00
slguan 7aeacaf67f
Merge pull request #733 from taosdata/feature/liaohj
Feature/liaohj
2019-11-16 15:44:11 +08:00
slguan a702f5efc0
Merge pull request #732 from taosdata/hotfix/many_files
add an assert for debug purpose
2019-11-16 15:42:19 +08:00
hjxilinx c302d338e7 refactor code, reorganize the header files 2019-11-16 15:30:28 +08:00
slguan d146221608
Merge pull request #731 from taosdata/feature/lihui
Feature/lihui
2019-11-16 14:39:28 +08:00
Hongze Cheng 6e7b3cf17a add an assert for debug purpose 2019-11-16 14:36:54 +08:00
lihui 55ed99d78e [add taoserror.h] 2019-11-16 13:39:51 +08:00
lihui 1efed1e01b [add taoserror.h] 2019-11-16 13:37:05 +08:00
lihui edbf603ee4 [change return error result] 2019-11-16 13:35:46 +08:00
slguan 9c7fb6b00f [TBASE-1161] 2019-11-16 11:29:19 +08:00
hjxilinx 4156af7c0d Merge branch 'develop' into feature/liaohj 2019-11-16 10:43:47 +08:00
slguan b08e41ed35
Merge pull request #730 from taosdata/feature/liaohj
Feature/liaohj
2019-11-16 10:43:10 +08:00
hjxilinx 4e7e75b7ad 4] 2019-11-16 10:39:47 +08:00
hjxilinx de2ef67b06 [TBASE-1165] 2019-11-16 10:35:12 +08:00
slguan d276b59c43 Merge branch 'develop' into feature/slguan 2019-11-15 22:28:38 +08:00
slguan 6b4a9223a7 Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan 2019-11-15 22:28:19 +08:00
slguan 460bc57a30 In some cases, "mgmt node is gone“ error will occur 2019-11-15 22:28:03 +08:00
plum-lihui ac94df49f1
Merge pull request #728 from taosdata/feature/slguan
[TBASE-1155]
2019-11-15 19:04:40 +08:00
slguan 95955cb474 [TBASE-1155] 2019-11-15 19:01:01 +08:00
slguan 601ae0551c
Merge pull request #722 from malongcn/develop
按时间周期聚合查询 中 WHERE后面的name 改为 location
2019-11-15 18:02:22 +08:00
slguan 2ed9150616
Merge pull request #726 from taosdata/feature/liaohj
[tbase-1147]
2019-11-15 18:01:58 +08:00