Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_optimize

ee0ac77a · Hongze Cheng · b977626a · 71698b0f · ee0ac77a · ee0ac77a
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

cmake/cmake.version cmake/cmake.version +1 -1

source/dnode/mnode/impl/src/mndMain.c source/dnode/mnode/impl/src/mndMain.c +1 -1

未找到文件。
--- a/cmake/cmake.version
+++ b/cmake/cmake.version
@@ -2,7 +2,7 @@
 IF (DEFINED VERNUMBER)
  SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "3.0.0.0")
+  SET(TD_VER_NUMBER "3.0.0.1")
 ENDIF ()

 IF (DEFINED VERCOMPATIBLE)

--- a/source/dnode/mnode/impl/src/mndMain.c
+++ b/source/dnode/mnode/impl/src/mndMain.c
@@ -122,7 +122,7 @@ static void *mndThreadFp(void *param) {
      mndCalMqRebalance(pMnode);
    }

-    if (lastTime % (tsTelemInterval * 10) == 0) {
+    if (lastTime % (tsTelemInterval * 10) == 1) {
      mndPullupTelem(pMnode);
    }