Commit Graph

7926 Commits

Author SHA1 Message Date
Shengliang Guan ff7794c0d6
Merge pull request #3353 from taosdata/feature/query
Feature/query
2020-09-02 17:28:19 +08:00
Shengliang Guan 20c31144fb
Merge pull request #3350 from taosdata/feature/TD-934
TD-934
2020-09-02 17:09:48 +08:00
Haojun Liao bc63c4e0bc [td-225] fix compiler error. 2020-09-02 17:07:44 +08:00
Haojun Liao 35c9252f19 [td-225] merge develop 2020-09-02 16:43:07 +08:00
Shengliang Guan a72318c5db
Merge pull request #3351 from taosdata/feature/crash_gen
TD-1248 TD-1044 TD-1247 fix crash in tcache.c
2020-09-02 16:16:15 +08:00
root d5f380306e TD-1248 TD-1044 TD-1247 fix crash in tcache.c 2020-09-02 15:40:29 +08:00
Shengliang Guan 16b02f36f3
Merge pull request #3348 from taosdata/remove_cases_with_issues
remove tests cases with bugs from daily test
2020-09-02 14:44:54 +08:00
Ping Xiao c1cc5a6f40 remove tests cases with bugs from daily test 2020-09-02 14:41:43 +08:00
Shengliang Guan 916d10b577
Merge pull request #3347 from taosdata/master
Master
2020-09-02 13:44:06 +08:00
Shengliang Guan b5a86eedd2
Merge pull request #3346 from taosdata/fmaster/lihui
[TD-1305]
2020-09-02 13:43:44 +08:00
Hui Li 72199cacdf [TD-1305] 2020-09-02 13:19:16 +08:00
Shengliang Guan d8b0d405e2
Merge pull request #3344 from taosdata/feature/os
Feature/os
2020-09-02 12:56:33 +08:00
Shengliang Guan 2480a753a4
Merge pull request #3342 from taosdata/hjxilinx-patch-1
Update TAOS SQL-ch.md
2020-09-02 12:56:18 +08:00
Shengliang Guan da45887722 TD-1204 2020-09-02 12:03:19 +08:00
Shengliang Guan ecc415bad3 TD-1204 2020-09-02 11:46:54 +08:00
haojun Liao 9a1d009b3a
Update TAOS SQL-ch.md
Fix some typo and expired content in documents.
2020-09-02 11:37:12 +08:00
Haojun Liao b3c76157a1 [td-225] 2020-09-02 10:09:58 +08:00
Haojun Liao 88ba66dd8b [td-1290] 2020-09-02 10:08:35 +08:00
Shengliang Guan 9b9ea6661a
Merge pull request #3338 from taosdata/feature/sangshuduo/snap
Feature/sangshuduo/snap
2020-09-02 09:40:49 +08:00
Shuduo Sang dc991a4745 remove mode of layouts due to review comments. 2020-09-02 01:02:11 +08:00
Shuduo Sang 7e840afee2 fix var/log/taos permission issue. 2020-09-02 00:46:20 +08:00
Shuduo Sang 4723e21af4 add historyfile plug to access .taos_history file. 2020-09-02 00:09:20 +08:00
Shuduo Sang 64b12891a1 Merge branch 'develop' into feature/sangshuduo/snap 2020-09-01 23:51:15 +08:00
Shengliang Guan e2066f5f79
Merge pull request #3336 from taosdata/connection_test_case
add test case
2020-09-01 22:00:48 +08:00
Shengliang Guan 1670cb5c16
Merge pull request #3335 from taosdata/master
Master
2020-09-01 18:11:13 +08:00
Bomin Zhang 89d87300d3 fix td-804 2020-09-01 18:04:05 +08:00
Ping Xiao 1d2e8bf02a TD-1227 add test case 2020-09-01 17:59:04 +08:00
Shengliang Guan d85bb64c06
Merge pull request #3333 from taosdata/fmaster/lihui
[do not get version info using get_version.sh]
2020-09-01 17:51:17 +08:00
Shengliang Guan 44acc06316 TD-1204 2020-09-01 17:48:51 +08:00
Haojun Liao fb1178c452 [td-1302] 2020-09-01 17:35:37 +08:00
Shengliang Guan 992b6febe1 TD-1204 2020-09-01 16:53:47 +08:00
Shengliang Guan 77c5f308a7 TD-1204 2020-09-01 16:45:53 +08:00
Hui Li 3e69309401 [do not get version info using get_version.sh] 2020-09-01 16:11:41 +08:00
Shengliang Guan 5251a7c15f
Merge pull request #3331 from taosdata/fmaster/lihui
[modify taosc name for oem power]
2020-09-01 15:54:20 +08:00
Hui Li 030d1fa459 [modify taosc name for oem power] 2020-09-01 15:40:20 +08:00
Hui Li 5ab467451d [modify taosc name for oem power] 2020-09-01 15:19:20 +08:00
Shengliang Guan eaffad415c
Merge pull request #3329 from taosdata/master
Master
2020-09-01 14:31:38 +08:00
Shengliang Guan f6d58a9049
Merge pull request #3328 from taosdata/fmaster/lihui
[del get version info from version.c]
2020-09-01 14:31:13 +08:00
Shengliang Guan 934726232d
Merge pull request #3327 from taosdata/feature/os
compile in windows
2020-09-01 14:30:55 +08:00
Hui Li 9adf8d2676 [del get version info from version.c] 2020-09-01 14:03:39 +08:00
Shengliang Guan 9ff439408b compile in windows 2020-09-01 13:25:53 +08:00
Shengliang Guan 937974bf5d
Merge pull request #3296 from robotspace/develop
Update query api for Lua connector.
2020-09-01 13:19:28 +08:00
Shengliang Guan 17102c8eac
Merge pull request #3321 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-09-01 13:18:03 +08:00
Shengliang Guan eb9f101bc0
Merge pull request #3318 from taosdata/master
Merge from Master into Develop
2020-09-01 12:34:38 +08:00
Shengliang Guan 8f363aa6a9
Merge pull request #3326 from taosdata/hotfix/test
[TD-1256]
2020-09-01 12:34:21 +08:00
Hui Li 475114f6ca [TD-1256] 2020-09-01 12:30:20 +08:00
Haojun Liao 2ae765caaf [td-1278] 2020-09-01 12:00:00 +08:00
haojun Liao f1f3d9aa60
Merge pull request #3311 from taosdata/feature/TD-1230
Feature/td 1230
2020-09-01 11:56:42 +08:00
Shengliang Guan ac85a5f064
Merge pull request #3319 from taosdata/hotfix/test
Hotfix/test
2020-09-01 11:52:47 +08:00
Shengliang Guan d7eae8ef86
Merge pull request #3324 from taosdata/hotfix/os
compile error in windows
2020-09-01 11:51:59 +08:00