diff --git a/VERSION b/VERSION index e21e727f9..d0c10bc48 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.0 \ No newline at end of file +2.0.0-rc.1 \ No newline at end of file diff --git a/setup/so-functions b/setup/so-functions index 25cbd11d8..dcbd33b1a 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -19,7 +19,7 @@ source ./so-whiptail source ./so-variables source ./so-common-functions -SOVERSION=1.4.0 +SOVERSION=2.0.0-rc.1 accept_salt_key_remote() { systemctl restart salt-minion @@ -689,7 +689,7 @@ docker_registry() { } docker_seed_registry() { - local VERSION="HH$SOVERSION" + local VERSION="$SOVERSION" if ! [ -f /nsm/docker-registry/docker/registry.tar ]; then local TRUSTED_CONTAINERS=(\ @@ -929,7 +929,7 @@ master_static() { # Create a static file for global values printf '%s\n'\ "static:"\ - " soversion: HH$SOVERSION"\ + " soversion: $SOVERSION"\ " hnmaster: $HNMASTER"\ " ntpserver: $NTPSERVER"\ " proxy: $PROXY"\