Merge pull request #3625 from tronprotocol/version/GreatVoyage-v4.1.1-2046-gc465c9ee4

Version/great voyage v4.1.1 2046 gc465c9ee4

Author: eodiandie

framework/src/main/java/org/tron/program/Version.java

@@ -2,8 +2,8 @@
 
 public class Version {
 
-  public static final String VERSION_NAME = "GreatVoyage-v4.1.0-1-g635526cc6";
-  public static final String VERSION_CODE = "13215";
+  public static final String VERSION_NAME = "GreatVoyage-v4.1.1-2046-gc465c9ee4";
+  public static final String VERSION_CODE = "15262";
   private static final String VERSION = "4.1.1";
 
   public static String getVersion() {

ver.sh

@@ -25,7 +25,7 @@ fi
 
 
 versionPath="src/main/java/org/tron/program/Version.java"
-sed -i -e "s/versionName.*$/versionName = \"$versionName\";/g;s/versionCode.*$/versionCode = \"$versionCode\";/g" $versionPath
+sed -i -e "s/VERSION_NAME.*$/VERSION_NAME = \"$versionName\";/g;s/VERSION_CODE.*$/VERSION_CODE = \"$versionCode\";/g" $versionPath
 git add $versionPath
 git commit -m "update a new version. version name:$versionName,version code:$versionCode"
 git push origin $versionBranch