Commit Graph

27626 Commits

Author SHA1 Message Date
plum-lihui bea55c4246 Merge pull request #1205 from taosdata/beta/v1.6.6.0
for windows compile
2020-02-10 16:12:15 +08:00
huili bcda954fb5 [modify default for aarch32] 2020-02-10 16:09:32 +08:00
hjxilinx 3b334b0a72 Merge branch 'develop' into feature/liaohj 2020-02-10 15:22:20 +08:00
hjxilinx 5517322290 fix bugs found in regression test. 2020-02-10 15:20:00 +08:00
slguan 0e6dfe292a for windows compile 2020-02-10 11:43:48 +08:00
plum-lihui e7bc44baa5
Merge pull request #1204 from taosdata/beta/v1.6.6.0
for windows compile
2020-02-10 10:50:51 +08:00
slguan b581aaf164 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-10 08:56:49 +08:00
hjxilinx 79b0ff88fb fix query bugs. 2020-02-10 03:28:11 +08:00
hjxilinx fbe202ce41 fix bugs in regression test. 2020-02-10 00:08:01 +08:00
hjxilinx 23b2c91727 fix sliding set bug. 2020-02-09 22:44:52 +08:00
slguan 8cb0846544 #1177 2020-02-09 22:34:57 +08:00
slguan 11e82045d9 for windows compile 2020-02-09 22:27:15 +08:00
Bomin Zhang 1d49be652e
Merge pull request #1203 from taosdata/feature/lihui
[#1201]
2020-02-09 18:48:21 +08:00
huili 58c9fafab6 [#1201] 2020-02-09 18:39:00 +08:00
hjxilinx 5f45a1d6ba refactor codes 2020-02-09 17:18:48 +08:00
hjxilinx 51b0ffd5f2 refactor codes 2020-02-09 17:17:35 +08:00
hjxilinx 5c8b408a9a refactor codes 2020-02-09 17:11:19 +08:00
hjxilinx d1f5edb65e refactor codes 2020-02-09 17:06:22 +08:00
hjxilinx 2129bc1e56 refactor codes 2020-02-09 17:02:59 +08:00
Bomin Zhang 4ab60b2e2a Merge pull request #1202 from taosdata/feature/lihui
Feature/lihui
2020-02-09 16:50:24 +08:00
huili f9f349551a [#1201] 2020-02-09 16:43:40 +08:00
huili 2b1947feb8 Merge branch 'develop' into feature/lihui 2020-02-09 16:40:17 +08:00
Hongze Cheng 2da826f955 more 2020-02-09 14:58:06 +08:00
Bomin Zhang d4894c9f03 Merge pull request #1200 from taosdata/feature/lihui
Feature/lihui
2020-02-09 12:30:01 +08:00
lihui 69bbb5fcbb [#1199] 2020-02-09 12:19:03 +08:00
lihui 6c99896f85 Merge branch 'feature/lihui' of https://github.com/taosdata/TDengine into feature/lihui 2020-02-09 12:13:07 +08:00
lihui 842bdc50c6 [modify pkg name] 2020-02-09 12:07:59 +08:00
huili a08f5e878b Merge branch 'develop' into feature/lihui 2020-02-09 08:53:13 +08:00
slguan 473586ef77 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-08 20:45:03 +08:00
Hongze Cheng e4535ab88a more 2020-02-08 20:10:19 +08:00
Hongze Cheng 194ffc9438 more 2020-02-08 18:58:46 +08:00
slguan 1e1b70540d #1177 2020-02-08 15:39:03 +08:00
hjxilinx 160fd22802 remove redundant codes 2020-02-08 14:09:10 +08:00
hjxilinx 26e4efe539 refactor code for query intermeidate buffer. 2020-02-07 23:45:41 +08:00
slguan dd44e5f994 #1177 2020-02-07 15:24:54 +08:00
slguan 2f84afb6c7 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-07 12:58:08 +08:00
slguan da47eeecd2 #1177 2020-02-07 12:58:01 +08:00
Hongze Cheng b4b600a123 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-07 09:53:53 +08:00
Hongze Cheng 5c9ff5b775 more 2020-02-07 09:53:40 +08:00
slguan aaeac496c5 #1177 2020-02-07 09:26:09 +08:00
slguan 877fb6224f Merge branch 'develop' into 2.0 2020-02-07 08:12:25 +08:00
slguan 126453b378 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-07 08:07:24 +08:00
slguan d6ed76059b #1177 2020-02-07 08:07:08 +08:00
slguan 78d9ffd72c #1177 2020-02-06 21:28:17 +08:00
slguan 2abbf43606 #1177 2020-02-06 21:01:23 +08:00
slguan 7db5696bd6
Merge pull request #1194 from sangshuduo/fix-mac-build
fix build issue on Mac
2020-02-06 20:13:57 +08:00
Shuduo Sang eb1e63b5ad fix build issue on Mac 2020-02-06 18:46:22 +08:00
Hongze Cheng 68d4eb2c18 more 2020-02-06 17:23:12 +08:00
Hongze Cheng 2ad90daa5f more 2020-02-06 16:42:39 +08:00
Hongze Cheng 3198baec27 more 2020-02-06 10:58:52 +08:00