Commit Graph

7611 Commits

Author SHA1 Message Date
Hui Li 3e15d4616d [TD-1256] 2020-08-31 17:26:03 +08:00
Hui Li 599760c6e3 [TD-1256] 2020-08-31 17:24:28 +08:00
Shengliang Guan 0372187961
Merge pull request #3301 from taosdata/fmaster/lihui
[modify oem macro define]
2020-08-31 13:53:07 +08:00
Hui Li 018feb4101 [TD-181] 2020-08-31 11:39:11 +08:00
Hui Li 8f57775923 [modify oem macro define] 2020-08-31 11:34:55 +08:00
Shengliang Guan 88960d5bb8
Merge pull request #3292 from taosdata/fmaster/lihui
Fmaster/lihui
2020-08-29 16:59:45 +08:00
Hui Li 934f2c473d [TD-1228] 2020-08-29 16:16:02 +08:00
Hui Li 790c28f205 [TD-1228] 2020-08-29 16:07:53 +08:00
Hui Li 2aa54b4ec7 [TD-1228] 2020-08-29 16:04:41 +08:00
Hui Li 50e2dd7531 [TD-1228] 2020-08-29 15:46:50 +08:00
Hui Li 57ec385903 [TD-1228] 2020-08-29 15:45:02 +08:00
Shengliang Guan 29532ffff5
Merge pull request #3289 from taosdata/TD-1280_fix
Td 1280 fix
2020-08-29 15:09:30 +08:00
zyyang 8a455cfd82 update jdbc test cases 2020-08-29 13:52:57 +08:00
zyyang 3f09fcb0b0 change the jdbc test cases 2020-08-29 13:34:52 +08:00
Shengliang Guan b0f219bf17
Merge pull request #3287 from taosdata/develop
Merge from develop into master
2020-08-28 20:47:03 +08:00
Shengliang Guan 70ff6014b4
Merge pull request #3285 from taosdata/hotfix/sync
Hotfix/sync
2020-08-28 18:23:49 +08:00
Shengliang Guan feebfa626e TD-1173 Invalid account permission settings 2020-08-28 08:31:51 +00:00
Shengliang Guan 46d0756242
Merge pull request #3284 from taosdata/feature/os
minor changes
2020-08-28 15:48:54 +08:00
Shengliang Guan 2420c8c5c6 minor changes 2020-08-28 15:48:03 +08:00
Shengliang Guan d09567c82b TD-1257 2020-08-28 06:42:05 +00:00
Shengliang Guan 88dc376ce5
Merge pull request #3281 from taosdata/feature/sangshuduo/add-a-badge-to-indicate-docker-pull-number
add docker repo link
2020-08-28 14:02:03 +08:00
Shengliang Guan 3e9834c907 Merge remote-tracking branch 'origin/develop' into hotfix/sync 2020-08-28 05:51:32 +00:00
Shuduo Sang 413a9a657e add docker repo link 2020-08-28 13:41:01 +08:00
Shengliang Guan 4e944c3acc
Merge pull request #3280 from taosdata/feature/os
Feature/os
2020-08-28 13:17:13 +08:00
Shengliang Guan 332ae098c6 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-28 13:15:33 +08:00
Shengliang Guan 97d095af4a
Merge pull request #3279 from taosdata/master
Master
2020-08-28 13:14:01 +08:00
Shengliang Guan b6c952d700
Merge pull request #3278 from taosdata/fmaster/lihui
[release version modify]
2020-08-28 13:12:46 +08:00
Shengliang Guan 28cef33a72 minor changes 2020-08-28 13:08:34 +08:00
Shengliang Guan e16572e459 Merge remote-tracking branch 'origin/fmaster/lihui' into feature/os 2020-08-28 13:04:25 +08:00
Hui Li 89744f4ba8 [release version modify] 2020-08-28 13:00:53 +08:00
Shengliang Guan ae8fbb6b21 TD-1090 compile error in windows 2020-08-28 11:57:40 +08:00
Shengliang Guan 50e73ebbce
Merge pull request #3277 from zwllxs/patch-1
Update administrator-ch.md
2020-08-28 10:35:18 +08:00
Shengliang Guan 9f158b9d48 minor changes 2020-08-28 10:28:12 +08:00
Shengliang Guan 9e97c25d3c
Merge pull request #3132 from taosdata/feature/query
Feature/query
2020-08-28 10:26:46 +08:00
zwllxs 5242848a82
Update administrator-ch.md 2020-08-28 10:06:01 +08:00
Shengliang Guan 90367ca788 TD-1257 mnode module startup check condition is wrong 2020-08-27 15:21:37 +00:00
Shengliang Guan 5b42f5d586
Merge pull request #3271 from taosdata/master
Merge from master into develop
2020-08-27 22:47:54 +08:00
Haojun Liao 3c45dcdee9 [td-255] replace wcsncpy with memcpy 2020-08-27 22:26:37 +08:00
Shengliang Guan 58408892da minor changes 2020-08-27 21:11:57 +08:00
Shengliang Guan d9faca1c01
Merge pull request #3255 from taosdata/hotfix/sync
Hotfix/sync
2020-08-27 21:08:27 +08:00
Shengliang Guan 037f561c95
Merge pull request #3267 from taosdata/hotfix/TD-857
TD-857
2020-08-27 21:06:56 +08:00
Shengliang Guan 37c2d3eb7d minor changes 2020-08-27 13:06:19 +00:00
yihaoDeng df013fc336 TD-857 2020-08-27 11:13:20 +00:00
Haojun Liao fdbd8fe099 [td-255] update the sim 2020-08-27 18:40:23 +08:00
Haojun Liao 76ad0bc70e [td-255] add check for memory allocation failure. 2020-08-27 18:32:34 +08:00
Shengliang Guan 3d655a7932
Merge pull request #3258 from taosdata/mergetodevelop
Merge from master into develop
2020-08-27 17:22:56 +08:00
Shengliang Guan bd908f4ab0
Merge branch 'develop' into mergetodevelop 2020-08-27 17:22:22 +08:00
Shengliang Guan 9028c1de9a
Merge pull request #3263 from taosdata/hotfix/connrelease
Update mnodeProfile.c
2020-08-27 17:20:29 +08:00
Shengliang Guan c190ea20b6
Merge pull request #3261 from taosdata/fmaster/lihui
[TD-1203]
2020-08-27 17:05:41 +08:00
haojun Liao abc80f352e
Update mnodeProfile.c
Update the mnode connection activity time
2020-08-27 16:28:26 +08:00