Commit Graph

7134 Commits

Author SHA1 Message Date
Hui Li 9efc2e11c0 Merge branch 'develop' into hotfix/test 2020-07-31 11:25:43 +08:00
Shengliang Guan f1e01940c9 cmake 2020-07-31 11:23:56 +08:00
liu0x54 3bbec8f87f [TD-1001] update files 2020-07-31 03:23:44 +00:00
liu0x54 9e97d9998b Merge branch 'develop' into feature/pyconn 2020-07-31 03:18:04 +00:00
liu0x54 8da73b3b00 [TD-1001] fix node js connector 2020-07-31 03:16:38 +00:00
Shengliang Guan ee429df86b Merge remote-tracking branch 'origin/develop' into feature/os 2020-07-31 03:07:51 +00:00
Shengliang Guan f5e6f0d7ff
Merge pull request #2818 from taosdata/hotfix/sangshuduo/fix-stable-query-after-reset-case
change error wording determination to comply tdengine's change.
2020-07-31 11:07:39 +08:00
Shengliang Guan 84564fe078 Merge remote-tracking branch 'origin/develop' into feature/os 2020-07-31 03:06:22 +00:00
Shengliang Guan 3155e1ecc5 cmake 2020-07-31 11:02:14 +08:00
Shengliang Guan 381b82dbc3 cmake file 2020-07-31 11:01:26 +08:00
Hongze Cheng 89c8104238 add lock when read 2020-07-31 10:59:57 +08:00
Hongze Cheng 1619faa0c4 make update file group atomic 2020-07-31 10:26:25 +08:00
slguan ee82eb602c TD-992 cmake file for w64 2020-07-31 10:17:15 +08:00
Shuduo Sang e91761c1a7 change error wording determination to comply tdengine's change. 2020-07-31 10:17:02 +08:00
Hongze Cheng ffb2a5482a move load compIdx out 2020-07-31 09:48:26 +08:00
Shengliang Guan 38629578ef
Merge pull request #2817 from taosdata/liuyq-617-patch-1
Add files via upload
2020-07-31 09:47:58 +08:00
Yiqing Liu ec6d9814d2
Add files via upload
更新2.0文档到develop分支
2020-07-31 09:45:22 +08:00
Haojun Liao b52bae71ae [td-225] refactor codes. 2020-07-31 00:54:31 +08:00
Haojun Liao e47e6300e4 [td-225] refactor codes. 2020-07-31 00:49:24 +08:00
Haojun Liao 4a508cdf3e [td-225] refactor codes. 2020-07-31 00:15:59 +08:00
Haojun Liao c2ce0fc4f8 [td-225] refactor codes 2020-07-30 23:47:06 +08:00
liu0x54 2b84d45098 [TD-1001] adapt nodejs connector 2020-07-30 13:58:36 +00:00
Hui Li 1242ae5e1e [modify] 2020-07-30 19:49:26 +08:00
slguan d012c3eb8e [TD-992] cmake file for darwin 2020-07-30 18:44:29 +08:00
Shengliang Guan 8134cedd57
Merge pull request #2816 from taosdata/feature/quorum
return code:1 only when packet is forwarded
2020-07-30 18:31:32 +08:00
Jeff Tao acba26ab51 return code:1 only when packet is forwarded 2020-07-30 10:21:10 +00:00
Shengliang Guan 5c9439ee62 log 2020-07-30 09:57:33 +00:00
Shengliang Guan c378e9455f
Merge pull request #2814 from taosdata/hotfix/sangshuduo/fix-stable-query-after-reset-case
fix stable/query-after-reset.py
2020-07-30 17:47:23 +08:00
Shengliang Guan d95fc974aa
Merge pull request #2815 from taosdata/feature/alert
move 'alert' into tdengine
2020-07-30 17:47:04 +08:00
Shengliang Guan 052a60452c refcount error for http 2020-07-30 09:33:56 +00:00
localvar 54ac068eba td-40: update scripts for release 2020-07-30 17:24:35 +08:00
Haojun Liao ae244c9e84 [td-225] refactor codes. 2020-07-30 17:22:13 +08:00
localvar 5dd0158eda td-40: move 'alert' project into tdengine 2020-07-30 17:19:26 +08:00
Haojun Liao 3b80eb7255 [td-225] refactor codes. 2020-07-30 17:18:15 +08:00
Haojun Liao fa560fd3a7 [td-225] refactor codes 2020-07-30 17:14:17 +08:00
Shengliang Guan 61635dc038 context log 2020-07-30 09:09:15 +00:00
Haojun Liao a09378a4db [td-225] refactors 2020-07-30 17:02:42 +08:00
Shuduo Sang 6c7eab55e5 fix stable/query-after-reset.py
[TD-1032]
2020-07-30 16:50:32 +08:00
Shengliang Guan e3330b6981
Merge pull request #2813 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-07-30 16:21:13 +08:00
Shengliang Guan 5e8af19471
Merge pull request #2811 from taosdata/feature/platform
Feature/platform
2020-07-30 16:18:41 +08:00
Haojun Liao 1dd3d2ba05 [td-225] update the script 2020-07-30 15:57:32 +08:00
Hongze Cheng 0dcee21a19 return success 2020-07-30 15:56:13 +08:00
Shengliang Guan f5a6399021
Merge pull request #2812 from taosdata/hotfix/sangshuduo/change-client-py-alter-dnode-to-id
change alter dnode ep to id.
2020-07-30 15:48:15 +08:00
Haojun Liao d58310d9d7 [td-225] fix bugs in join/union query. 2020-07-30 15:46:50 +08:00
Hongze Cheng ce4c2c203c Merge branch 'develop' into feature/2.0tsdb 2020-07-30 15:44:01 +08:00
Shengliang Guan 4c024aab37 Ensure that the htpp context is valid before release 2020-07-30 07:43:54 +00:00
Shengliang Guan bd79526b67
Merge pull request #2810 from taosdata/fix_jdbc_url_parser
fix JDBC url parser issue
2020-07-30 15:42:17 +08:00
Shengliang Guan 89d6334d2c
Merge pull request #2809 from taosdata/hotfix/test
[modify install]
2020-07-30 15:42:08 +08:00
Shuduo Sang fb9146ad76 change alter dnode ep to id.
[TD-1031]
2020-07-30 15:37:44 +08:00
Hui Li 3cc384a03c [fix bug] 2020-07-30 14:49:18 +08:00