xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
8,776 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

8776 Commits

Author SHA1 Message Date
Haojun Liao 66ab0cd04c [td-225] 2020-10-13 11:47:45 +08:00
Haojun Liao c6479a148a [td-225] merge develop 2020-10-13 11:35:40 +08:00
Haojun Liao 25ee3b480b [td-225] refactor client code 2020-10-13 11:18:11 +08:00
Hui Li 92739569cb [TD-1601] 2020-10-13 10:54:21 +08:00
Shengliang Guan c85c597b97 TD-1652 2020-10-13 10:14:51 +08:00
Shengliang Guan b604ed1370
Merge pull request #3820 from taosdata/boxiaobj-patch-7 
Minor format adjustment
 2020-10-13 09:47:38 +08:00
Bo Xiao 57199e31c5
Minor format adjustment 
Minor format adjustment for indent 4 characters.
 2020-10-13 08:42:55 +08:00
yihaoDeng 1e0c3e521f Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-10-12 19:28:31 +00:00
yihaoDeng 2fd7ac5f50 TD-1688 2020-10-12 17:35:43 +00:00
yihaoDeng 61477aa067 Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-10-12 17:04:29 +00:00
Shengliang Guan 2566b8baa4
Merge pull request #3798 from taosdata/boxiaobj-patch-6-1 
Delete second EP, add maxBinaryDisplayWidth
 2020-10-12 22:20:35 +08:00
Shengliang Guan 97d8756582
Merge pull request #3794 from taosdata/patch/TD-1669 
TD-1669
 2020-10-12 22:17:41 +08:00
Shengliang Guan f079aa7599 Merge remote-tracking branch 'origin/develop' into patch/TD-1669 2020-10-12 12:18:25 +00:00
Shengliang Guan 83f02fe202
Merge pull request #3816 from taosdata/hotfix/test 
Hotfix/test
 2020-10-12 20:16:33 +08:00
Shengliang Guan 8eb559e6a3
Merge pull request #3817 from taosdata/master 
Merge from master into develop
 2020-10-12 20:16:06 +08:00
Shengliang Guan 4d30dc9db1 TD-1657 2020-10-12 12:08:19 +00:00
Hui Li 5d64e7ed53 [TD-1625] 2020-10-12 18:43:14 +08:00
Shengliang Guan d08caf9fa5
Merge pull request #3814 from taosdata/release/s103 
Release/s103 merge to master
 2020-10-12 18:36:43 +08:00
Hui Li 2f9b68a977 [TD-1625] 2020-10-12 18:30:00 +08:00
Hui Li fa874237b2 [TD-1625] 2020-10-12 18:27:43 +08:00
Shengliang Guan 1abffd94be TD-1671 2020-10-12 10:18:16 +00:00
Hui Li f01c0e7630 update the version.inc 2020-10-12 17:57:32 +08:00
Shengliang Guan d8600ae91a
Merge pull request #3810 from taosdata/bugfix/td-1675 
[TD-1675]<fix>: #3768: server and client crash when drop a subscribed super table
 2020-10-12 17:56:00 +08:00
Shengliang Guan ab05adab4f
Merge pull request #3796 from taosdata/hotfix/TD-1665 
TD-1665
 2020-10-12 17:55:35 +08:00
Shengliang Guan ccfed462dd TD-1671 2020-10-12 09:10:57 +00:00
Shengliang Guan d477429414 TD-1670 2020-10-12 07:55:41 +00:00
Hongze Cheng 9e8508d2a7 TD-1682 2020-10-12 07:55:08 +00:00
Shengliang Guan afb4aff651 TD-1671 2020-10-12 07:28:35 +00:00
Bomin Zhang ab1ee97122 fix td-1675 2020-10-12 14:56:46 +08:00
Hui Li fec9531bc3 change dockerfile for install package with version 2020-10-12 14:31:20 +08:00
Shengliang Guan 1b59ce04e9 TD-1671 2020-10-12 05:43:16 +00:00
Bo Xiao 6f3f083fa5
Delete second EP, add maxBinaryDisplayWidth 
Delete second EP, add maxBinaryDisplayWidth and add indent
 2020-10-12 09:44:36 +08:00
Jeff Tao f7656ec7f7 Merge branch 'patch/TD-1669' of https://github.com/taosdata/TDengine into patch/TD-1669 2020-10-11 14:51:08 +00:00
Jeff Tao 77d2880d42 check the sync forward timer 2020-10-11 14:48:56 +00:00
yihaoDeng cfb09b8c2b Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-10-11 14:13:22 +00:00
Shengliang Guan 86a2019fa8 Merge remote-tracking branch 'origin/develop' into patch/TD-1669 2020-10-11 21:23:55 +08:00
Shengliang Guan b43ffec586 TD-1671 2020-10-11 21:17:38 +08:00
Jeff Tao cec8091faf Merge branch 'develop' into patch/TD-1669 2020-10-11 09:51:14 +00:00
Shengliang Guan 82b21d6eef
Merge pull request #3585 from taosdata/feature/crash_gen 
Added valgrind memory check to crash_gen tool
 2020-10-11 17:46:51 +08:00
Shengliang Guan 2159c68e9a TD-1672 2020-10-11 16:39:52 +08:00
Shengliang Guan b772c35b45 TD-1673 2020-10-11 08:11:13 +00:00
Shengliang Guan 6f549a28fd Merge remote-tracking branch 'origin/feature/crash' into patch/TD-1669 2020-10-11 15:55:02 +08:00
Shengliang Guan ccb8ab9328 TD-1670 2020-10-11 07:51:17 +00:00
yihaoDeng f25158733f TD-1665 2020-10-11 04:38:43 +00:00
Jeff Tao 0825ce995e add debug info for sync 2020-10-11 03:52:37 +00:00
Steven Li 76dc969f4d Merge remote-tracking branch 'origin/develop' into feature/crash_gen 2020-10-11 02:42:55 +00:00
Steven Li ac673e3bbd Adjusted crash_gen tool to direct output/error to files under --valgrind 2020-10-11 02:42:31 +00:00
Steven Li 32ea796dab Allow 0xB error for crash_gen tool, per TD-1648 2020-10-11 02:36:49 +00:00
Jeff Tao 8ebbfedba7 TD-1669 
fix the bug for both TD-1669 and partial TD-1641
 2020-10-11 02:26:46 +00:00
Shengliang Guan 16782bff86
Merge pull request #3784 from taosdata/feature/TD-1476 
change the taos-jdbcdriver to 2.0.8
 2020-10-11 10:03:30 +08:00