Merge branch 'master' into hotfix/TD-10602-2

Jenkinsfile

@@ -450,35 +450,35 @@ pipeline {
           }
         } 
         
-        stage('build'){
-          agent{label " wintest "}
-          steps {
-            pre_test()
-            script{             
-                while(win_stop == 0){
-                  sleep(1)
-                  }
-              }
-            }
-        }
-        stage('test'){
-          agent{label "win"}
-          steps{
+        // stage('build'){
+        //   agent{label " wintest "}
+        //   steps {
+        //     pre_test()
+        //     script{             
+        //         while(win_stop == 0){
+        //           sleep(1)
+        //           }
+        //       }
+        //     }
+        // }
+        // stage('test'){
+        //   agent{label "win"}
+        //   steps{
             
-            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                pre_test_win()
-                timeout(time: 20, unit: 'MINUTES'){
-                bat'''
-                cd C:\\workspace\\TDinternal\\community\\tests\\pytest
-                .\\test-all.bat Wintest
-                '''
-                }
-            }     
-            script{
-              win_stop=1
-            }
-          }
-        }
+        //     catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+        //         pre_test_win()
+        //         timeout(time: 20, unit: 'MINUTES'){
+        //         bat'''
+        //         cd C:\\workspace\\TDinternal\\community\\tests\\pytest
+        //         .\\test-all.bat Wintest
+        //         '''
+        //         }
+        //     }     
+        //     script{
+        //       win_stop=1
+        //     }
+        //   }
+        // }
           
                
     }

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.2.0.5")
+  SET(TD_VER_NUMBER "2.2.1.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

packaging/release.sh

@@ -209,7 +209,7 @@ else
   exit 1
 fi
 
-make
+make -j8
 
 cd ${curr_dir}
 

snap/snapcraft.yaml

 name: tdengine
 base: core18
-version: '2.2.0.5'
+version: '2.2.1.0'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
@@ -72,7 +72,7 @@ parts:
       - usr/bin/taosd
       - usr/bin/taos
       - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.2.0.5
+      - usr/lib/libtaos.so.2.2.1.0
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so