From 009ca508b8ebab4a1e1339144c630967e45fb90f Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Mon, 4 Dec 2017 18:10:04 +0100 Subject: [PATCH 1/4] Bump to version 5.4.5 (#1561) * Bump to version 5.4.4 * Bump to version 5.4.5 --- include/Nebula.h | 2 +- share/onegate/onegate | 2 +- share/rubygems/generate | 2 +- src/cloud/common/CloudClient.rb | 2 +- src/im_mad/remotes/VERSION | 2 +- src/oca/java/src/org/opennebula/client/OneSystem.java | 2 +- src/oca/ruby/opennebula.rb | 2 +- src/sunstone/views/index.erb | 2 +- src/sunstone/views/login.erb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/Nebula.h b/include/Nebula.h index 20b2dad949..cc3b2f06b1 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -357,7 +357,7 @@ public: */ static string code_version() { - return "5.4.4"; // bump version + return "5.4.5"; // bump version } /** diff --git a/share/onegate/onegate b/share/onegate/onegate index db5cb25f50..89ead8da29 100755 --- a/share/onegate/onegate +++ b/share/onegate/onegate @@ -13,7 +13,7 @@ require 'pp' module CloudClient # OpenNebula version - VERSION = '5.4.4' + VERSION = '5.4.5' # ######################################################################### # Default location for the authentication file diff --git a/share/rubygems/generate b/share/rubygems/generate index 1cdb5fa337..f75d46e629 100755 --- a/share/rubygems/generate +++ b/share/rubygems/generate @@ -19,7 +19,7 @@ require 'fileutils' require 'tmpdir' -VERSION = "5.4.4" +VERSION = "5.4.5" def version v = VERSION diff --git a/src/cloud/common/CloudClient.rb b/src/cloud/common/CloudClient.rb index 565e1cd340..b790464508 100644 --- a/src/cloud/common/CloudClient.rb +++ b/src/cloud/common/CloudClient.rb @@ -50,7 +50,7 @@ end module CloudClient # OpenNebula version - VERSION = '5.4.4' + VERSION = '5.4.5' # ######################################################################### # Default location for the authentication file diff --git a/src/im_mad/remotes/VERSION b/src/im_mad/remotes/VERSION index 3238344b3b..3caaea5547 100644 --- a/src/im_mad/remotes/VERSION +++ b/src/im_mad/remotes/VERSION @@ -1 +1 @@ -5.4.4 \ No newline at end of file +5.4.5 \ No newline at end of file diff --git a/src/oca/java/src/org/opennebula/client/OneSystem.java b/src/oca/java/src/org/opennebula/client/OneSystem.java index 767c39c8f4..2f264f6158 100644 --- a/src/oca/java/src/org/opennebula/client/OneSystem.java +++ b/src/oca/java/src/org/opennebula/client/OneSystem.java @@ -32,7 +32,7 @@ public class OneSystem private static final String GROUP_QUOTA_INFO = "groupquota.info"; private static final String GROUP_QUOTA_UPDATE = "groupquota.update"; - public static final String VERSION = "5.4.4"; + public static final String VERSION = "5.4.5"; public OneSystem(Client client) { diff --git a/src/oca/ruby/opennebula.rb b/src/oca/ruby/opennebula.rb index 3fa30b60b7..5324029422 100644 --- a/src/oca/ruby/opennebula.rb +++ b/src/oca/ruby/opennebula.rb @@ -69,5 +69,5 @@ require 'opennebula/vm_group_pool' module OpenNebula # OpenNebula version - VERSION = '5.4.4' + VERSION = '5.4.5' end diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index a0b6da8574..fa467a8114 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -81,7 +81,7 @@ diff --git a/src/sunstone/views/login.erb b/src/sunstone/views/login.erb index f454af7ca7..b153bd11e8 100644 --- a/src/sunstone/views/login.erb +++ b/src/sunstone/views/login.erb @@ -28,7 +28,7 @@ <% end %> ' + '').appendTo($(".disksContainer", disksContext)); if (disks_base) { + disks_base[disk_id].SIZE = disk.SIZE; diskContext.data('template_disk', disks_base[disk_id]); } @@ -222,14 +223,17 @@ define(function(require){ disk = $(this).data("template_disk"); var fields = WizardFields.retrieve(this); - - if (fields.SIZE != undefined){ - disk['SIZE'] = fields.SIZE; + if (disk["SIZE"] && fields["SIZE"] && disk["SIZE"] === fields["SIZE"]){ + delete disk["SIZE"]; + disks.push(disk); + } + else if (fields.SIZE != undefined){ + var size = $.extend(true, [], fields.SIZE); + var size = size.join(""); + var diskAux = $.extend(true, {}, disk); + diskAux["SIZE"] = fields.SIZE; + disks.push(diskAux); } - } - - if (disk) { - disks.push(disk); } }); From ce5d4a314b55b147425873e6e92c8e0abd600d1f Mon Sep 17 00:00:00 2001 From: Abel Coronado Date: Tue, 12 Dec 2017 12:33:34 +0100 Subject: [PATCH 4/4] B #1562: sunstone-server rc handling broken (#1576) (cherry picked from commit 042e64bf1d6642dde0f95fc97fffed5e7296357c) --- src/sunstone/bin/sunstone-server | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/sunstone/bin/sunstone-server b/src/sunstone/bin/sunstone-server index 614992b8d6..162a0973bb 100755 --- a/src/sunstone/bin/sunstone-server +++ b/src/sunstone/bin/sunstone-server @@ -128,8 +128,8 @@ stop() [ "$novnc" = "1" ] && $NOVNC_SERVER stop if [ ! -f $SUNSTONE_PID ]; then - echo "Couldn't find sunstone-server process pid." - exit 1 + echo "Couldn't find sunstone-server process pid." >&2 + return 1 fi # Kill the sunstone daemon @@ -140,6 +140,7 @@ stop() rm -f $SUNSTONE_PID &> /dev/null echo "sunstone-server stopped" + return 0 } case "$1" in @@ -149,9 +150,10 @@ case "$1" in ;; stop) stop -n + exit $? ;; restart) - stop -n + stop -n 2> /dev/null setup start -n ;; @@ -163,7 +165,7 @@ case "$1" in stop ;; restart-sunstone) - stop + stop -n 2> /dev/null setup start ;;