Merge pull request #1311 from subutai-io/dev

for release
subutai-io · Jul 4, 2018 · 40d238d · 40d238d
2 parents c72833d + 35f71e4
commit 40d238d
Show file tree

Hide file tree

Showing 7 changed files with 1,694 additions and 1,626 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 # Change Log
 
+## [7.1.3] 7/04/2018
+# BUG FIXES:
+* Critical bug fixed when CC does not record configuration file on Linux machines
+
 ## [7.1.2] 6/29/2018
 # IMPROVEMENTS:
 * Added validator for ssh key names

diff --git a/SubutaiControlCenter_en_US.ts b/SubutaiControlCenter_en_US.ts
diff --git a/SubutaiControlCenter_pt_BR.ts b/SubutaiControlCenter_pt_BR.ts
diff --git a/SubutaiControlCenter_ru_RU.ts b/SubutaiControlCenter_ru_RU.ts
diff --git a/main.cpp b/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char* argv[]) {
 
   QCommandLineParser cmd_parser;
   cmd_parser.setApplicationDescription(QObject::tr(
-      "This Control Center application should help users to work with hub"));
+      "This Control Center application should help users to work with bazaar"));
 
   cmd_parser.addHelpOption();
   // version

diff --git a/upload.sh b/upload.sh
@@ -1,4 +1,5 @@
 BRANCH=$1
+VERSION=$(cat /home/travis/build/subutai-io/control-center/version)
 OS=$(uname)
 PKGNAME=""
 BINNAME=""
@@ -26,10 +27,11 @@ upload_cdn (){
 
     echo "Uploading file..."
 
-    ID=$(curl -sk -H "token: $TOKEN" -Ffile=@$1 -Ftoken=$TOKEN "$2/raw/upload")
+    ID=$(curl -sk -H "token: $TOKEN" -Ffile=@$1 -Fversion=$3 -Ftoken=$TOKEN "$2/raw/upload")
 
     echo "File uploaded with ID $ID"
     echo "URL: $2"
+    echo "VERSION: $3"
     echo "Signing file..."
 
     SIGN=$(echo $ID | gpg --clearsign --no-tty -u $EMAIL)
@@ -86,8 +88,8 @@ case $BRANCH in
         if [ $OS = Linux ]
         then
         URL=https://cdn.subutai.io:8338/kurjun/rest
-        upload_cdn subutai_control_center_bin/$PKGNAME $URL
-        upload_cdn subutai_control_center_bin/$BINNAME $URL
+        upload_cdn subutai_control_center_bin/$PKGNAME $URL $VERSION
+        upload_cdn subutai_control_center_bin/$BINNAME $URL $VERSION
         fi
         ;;
 esac

diff --git a/version b/version
@@ -1 +1 @@
-7.1.2
+7.1.3