Commit Graph

7011 Commits

Author SHA1 Message Date
Shengliang Guan 7e3cd84df0 TD-1057 2020-08-08 13:04:29 +08:00
Shengliang Guan 0836c2f747
Merge pull request #2982 from taosdata/hotfix/update-broken-link
update broken link in documentation
2020-08-08 12:41:44 +08:00
Bomin Zhang 77443408ad update broken link in documentation 2020-08-08 12:40:33 +08:00
Shengliang Guan a18e287ca5 TD-1057 2020-08-08 11:06:32 +08:00
Shengliang Guan d593a90581 Merge branch 'develop' into feature/os 2020-08-08 09:39:24 +08:00
Shengliang Guan 9152898418 minor changes 2020-08-08 09:38:01 +08:00
Shengliang Guan 87a73142a1 TD-1057 2020-08-07 19:28:05 +08:00
Shengliang Guan 1db9831c5a TD-1057 2020-08-07 19:04:48 +08:00
Shengliang Guan ef2f966da5 TD-1057 2020-08-07 18:59:52 +08:00
Hongze Cheng 17e1c19b81 remove Idx file 2020-08-07 09:30:52 +00:00
Shengliang Guan 8e53280b3c TD-1057 2020-08-07 16:58:55 +08:00
Shengliang Guan 1df8e2d9fa
Merge pull request #2975 from taosdata/hotfix/test
[add error log for flock]
2020-08-07 16:36:29 +08:00
Shengliang Guan c9f221d04b minor compile errors 2020-08-07 16:11:01 +08:00
Shengliang Guan c78e82c2e6 Merge branch 'hotfix/test' of https://github.com/taosdata/TDengine into hotfix/test 2020-08-07 15:55:45 +08:00
Shengliang Guan 5ede107b94 minor changes for cmake 2020-08-07 15:54:51 +08:00
Shengliang Guan fce5d817bc TD-1057 change file format from ansi to unicode 2020-08-07 15:18:54 +08:00
Hui Li 0ba581ec3d [add error log for flock] 2020-08-07 14:48:13 +08:00
Shengliang Guan 7038a9926b
Merge pull request #2973 from taosdata/master
Master
2020-08-07 14:20:45 +08:00
Shengliang Guan 60737e167e
Merge pull request #2972 from taosdata/hotfix/platform
Hotfix/platform
2020-08-07 14:20:10 +08:00
Shengliang Guan 61a755e310 TD-1096 2020-08-07 14:17:33 +08:00
Shengliang Guan c622094fc7 TD-1096 2020-08-07 14:12:41 +08:00
Shengliang Guan 9e415fb91b
Merge pull request #2966 from taosdata/hotfix/test
[add num of init data type ]
2020-08-07 14:09:01 +08:00
Shengliang Guan 719bedcf0a
Merge pull request #2958 from taosdata/feature/os
Feature/os
2020-08-07 14:08:27 +08:00
Shengliang Guan a674c324c8
Merge pull request #2951 from taosdata/hotfix/sync_loss_data
Hotfix/sync loss data
2020-08-07 14:08:07 +08:00
Hongze Cheng d0bea6f927 fix a coredump when rpc msgType is bad 2020-08-07 03:17:45 +00:00
Hongze Cheng 3539dd2b2b Merge branch 'develop' into hotfix/sync_loss_data 2020-08-07 03:10:56 +00:00
Shengliang Guan 79ae33ab72
Merge pull request #2967 from taosdata/feature/crash_gen
Adjusted crash_gen tool to accommodate new default database called log
2020-08-07 11:08:17 +08:00
Steven Li 061a2161ff Adjusted crash_gen tool to accommodate new default database called log 2020-08-07 02:55:41 +00:00
Hui Li 1059b6d544 [add num of init data type ] 2020-08-07 10:41:46 +08:00
Shengliang Guan 78b3d1f271
Merge pull request #2962 from taosdata/hotfix/master2develop
Master
2020-08-06 22:14:35 +08:00
Shengliang Guan df83409f93
Merge branch 'develop' into hotfix/master2develop 2020-08-06 22:13:55 +08:00
Shengliang Guan dd00a93e62
Merge pull request #2957 from taosdata/update_taos_sql
update taos sql md file
2020-08-06 21:56:19 +08:00
Shengliang Guan 5e2b65b434
Merge pull request #2960 from taosdata/patch/default-conf
update default configuration
2020-08-06 21:55:56 +08:00
Shengliang Guan 0d51e90953 TD-1057 2020-08-06 21:52:44 +08:00
Bomin Zhang fd45fbdeed update default configuration 2020-08-06 20:54:31 +08:00
Shengliang Guan b750ab1ef3 Merge branch 'feature/os' of https://github.com/taosdata/TDengine into feature/os 2020-08-06 18:43:50 +08:00
Shengliang Guan 9744ac5fc8 TD-1057 2020-08-06 18:43:30 +08:00
Shengliang Guan 1dc751200a TD-1057 2020-08-06 18:07:24 +08:00
Ping Xiao 6cd6e5c382 update taos sql md file 2020-08-06 17:59:33 +08:00
Hongze Cheng b8e3385ce3 initialize variable 2020-08-06 16:31:47 +08:00
Hongze Cheng 6d35cf19b4 fix part of option setting error 2020-08-06 16:01:23 +08:00
Shengliang Guan 9b1aa21dee
Merge pull request #2952 from taosdata/hotfix/fix_java_connector
fixbug java connector
2020-08-06 15:57:50 +08:00
Shengliang Guan 34ca1063cf Merge branch 'feature/os' of https://github.com/taosdata/TDengine into feature/os 2020-08-06 15:56:17 +08:00
Shengliang Guan 8aa61269df Merge from develop into feature/os 2020-08-06 07:33:05 +00:00
Hongze Cheng 7e63eb0d45 fix log database coredump bug 2020-08-06 15:33:01 +08:00
Shengliang Guan dbd4c222fb
Merge pull request #2949 from taosdata/feature/pyconn
Feature/pyconn
2020-08-06 15:30:29 +08:00
Shengliang Guan 4d42ec1b22 TD-1057 2020-08-06 15:12:05 +08:00
Hongze Cheng 85e7ea51ac Merge branch 'develop' into hotfix/sync_loss_data 2020-08-06 15:03:36 +08:00
Hongze Cheng 081e7120c6 make action atomic 2020-08-06 14:04:55 +08:00
Tao Liu 4411189242 [TD-1063] fix bugs 2020-08-06 06:01:19 +00:00