From 49eec69f444862567582dda2031a56fd2200b836 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Wed, 13 Nov 2013 14:54:24 +0100 Subject: [PATCH 01/12] Feature #2345: Open vSwitch drivers now managed the VLAN_TAGGED_ID parameter. This parameter is not yet sent from the core. --- src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb index c731aee9ca..a6534bc427 100644 --- a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb +++ b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb @@ -37,7 +37,10 @@ class OpenvSwitchVLAN < OpenNebulaNetwork @nic = nic # Apply VLAN - tag_vlan if @nic[:vlan] == "YES" + if @nic[:vlan] == "YES" + tag_vlan + tag_trunk_vlans + end # Prevent Mac-spoofing mac_spoofing @@ -79,6 +82,19 @@ class OpenvSwitchVLAN < OpenNebulaNetwork run cmd end + def tag_trunk_vlans + range = @nic[:vlan_tagged_id] + if range? range + ovs_vsctl_cmd = "#{COMMANDS[:ovs_vsctl]} set Port #{@nic[:tap]}" + + cmd = "#{ovs_vsctl_cmd} trunks=#{range}" + run cmd + + cmd = "#{ovs_vsctl_cmd} vlan_mode=native-untagged" + run cmd + end + end + def mac_spoofing add_flow("in_port=#{port},arp,dl_src=#{@nic[:mac]}",:drop,45000) add_flow("in_port=#{port},arp,dl_src=#{@nic[:mac]},nw_src=#{@nic[:ip]}",:normal,46000) @@ -165,6 +181,6 @@ class OpenvSwitchVLAN < OpenNebulaNetwork end def range?(range) - !range.match(/^\d+(,\d+)*$/).nil? + !range.to_s.match(/^\d+(,\d+)*$/).nil? end end From dd60e0bd46ab334c3d548e57615e6a5db8466e17 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 14 Nov 2013 17:04:43 +0100 Subject: [PATCH 02/12] bug #2443: Update storage information for System datastore in info panel (cherry picked from commit 4274ce545f956028053c009f2df00f1316e7c983) --- src/sunstone/public/js/plugins/datastores-tab.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 39e4245e61..ccb19294fb 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -740,7 +740,7 @@ function updateDatastoreInfo(request,ds){ cluster_str = insert_cluster_dropdown("Datastore",info.ID,info.CLUSTER,info.CLUSTER_ID); } - var is_system = (info.TYPE == 1) + var is_system_ssh = (info.TEMPLATE.SHARED == "NO") var info_tab_content = '
\
\ @@ -773,15 +773,15 @@ function updateDatastoreInfo(request,ds){ '+tr("Capacity")+'\\ \ ' + tr("Total") + '\ - '+(is_system ? '-' : humanize_size_from_mb(info.TOTAL_MB))+'\ + '+(is_system_ssh ? '-' : humanize_size_from_mb(info.TOTAL_MB))+'\ \ \ ' + tr("Used") + '\ - '+(is_system ? '-' : humanize_size_from_mb(info.USED_MB))+'\ + '+(is_system_ssh ? '-' : humanize_size_from_mb(info.USED_MB))+'\ \ \ ' + tr("Free") + '\ - '+(is_system ? '-' : humanize_size_from_mb(info.FREE_MB))+'\ + '+(is_system_ssh ? '-' : humanize_size_from_mb(info.FREE_MB))+'\ \ \ ' From a960d939369117d5861cd8bd4cd34b00570be94a Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 14 Nov 2013 17:19:51 +0100 Subject: [PATCH 03/12] feature #2455: Do not recreate the vnc tokens dir if it already exists(cherry picked from commit d4cb2599620f0fab732f50be31b001de4b625347) --- src/sunstone/OpenNebulaVNC.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb index 92e59c1da5..15bd2c0061 100644 --- a/src/sunstone/OpenNebulaVNC.rb +++ b/src/sunstone/OpenNebulaVNC.rb @@ -267,7 +267,6 @@ class OpenNebulaVNC Dir.glob("#{@token_folder}/*").each do |file| File.delete(file) end - Dir.rmdir(@token_folder) rescue => e @logger.error "Error deleting token folder" @logger.error e.message From cf4e95ab5c96b502ecad8aefcfd925228b699a9c Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 14 Nov 2013 17:31:25 +0100 Subject: [PATCH 04/12] feature #2454: Add ipv6 option to novnc(cherry picked from commit 21ca0b49fc3c29bd7a2b3e9feada22d26092e1b4) --- src/sunstone/OpenNebulaVNC.rb | 6 ++++++ src/sunstone/etc/sunstone-server.conf | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb index 15bd2c0061..2026cd0920 100644 --- a/src/sunstone/OpenNebulaVNC.rb +++ b/src/sunstone/OpenNebulaVNC.rb @@ -80,6 +80,8 @@ class OpenNebulaVNC @proxy_path = File.join(SHARE_LOCATION, "websockify/websocketproxy.py") @proxy_port = config[:vnc_proxy_port] + @proxy_ipv6 = config[:vnc_proxy_ipv6] + @wss = config[:vnc_proxy_support_wss] @lock_file = NOVNC_LOCK_FILE @@ -113,6 +115,10 @@ class OpenNebulaVNC proxy_options << " --ssl-only" if @wss == "only" end + if @proxy_ipv6 + proxy_options << " -6" + end + cmd ="python #{@proxy_path} #{proxy_options} #{@proxy_port}" begin diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf index 26755ed0c2..ad8a4d05d1 100644 --- a/src/sunstone/etc/sunstone-server.conf +++ b/src/sunstone/etc/sunstone-server.conf @@ -81,10 +81,12 @@ # supported. # vnc_proxy_cert: Certificate to encrypt wss connections. # vnc_proxy_key: Key for wss connections. Only necessary if not included in cert. +# vnc_proxy_ipv6: Enable ipv6 support for novnc-server :vnc_proxy_port: 29876 :vnc_proxy_support_wss: no :vnc_proxy_cert: :vnc_proxy_key: +:vnc_proxy_ipv6: false # Default language setting From 874c7da3a30d7e86f36956bdcbfa27a2892c43ca Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 14 Nov 2013 17:44:20 +0100 Subject: [PATCH 05/12] bug #2448: In the datastores tab if you select the element 101 the action is applied to element 1(cherry picked from commit d03736ad88726ffe9e23cc50e6cbf93a3b2ffaf0) --- src/sunstone/public/js/plugins/datastores-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index ccb19294fb..feaf167988 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -497,7 +497,7 @@ var datastore_actions = { type: "multiple", call: function(params, success){ var cluster = params.data.extra_param; - var ds = params.data.id[0]; + var ds = params.data.id; if (cluster == -1){ //get cluster name From 7bcefc9008f9f018b125c07f4c22a6a0477fce83 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 15 Nov 2013 11:07:22 +0100 Subject: [PATCH 06/12] Bug #2444: fs_lvm does not work with DATASTORE_LOCATION --- src/tm_mad/fs_lvm/clone | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/tm_mad/fs_lvm/clone b/src/tm_mad/fs_lvm/clone index 07dd1062ac..6515661dad 100755 --- a/src/tm_mad/fs_lvm/clone +++ b/src/tm_mad/fs_lvm/clone @@ -42,13 +42,17 @@ source ${DRIVER_PATH}/../../datastore/libfs.sh # Set dst path and dir #------------------------------------------------------------------------------- -SRC_HOST=`arg_host $SRC` -SRC_PATH=`arg_path $SRC` - DST_PATH=`arg_path $DST` DST_HOST=`arg_host $DST` DST_DIR=`dirname $DST_PATH` +SRC_ARG_PATH=`arg_path $SRC` + +DST_DS_PATH="$(dirname $(dirname $(dirname $DST_PATH)))" +SRC_DS_PATH="$(dirname $(dirname $SRC_ARG_PATH))" + +SRC_PATH="${DST_DS_PATH}${SRC_ARG_PATH##$SRC_DS_PATH}" + DS_SYS_ID=$(echo $DST_DIR | $AWK -F '/' '{print $(NF-1)}') SIZE=`file_size $SRC_PATH` From 8099694f04a381dde9d0e08b954a722ec6574c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 14 Nov 2013 16:58:01 +0100 Subject: [PATCH 07/12] Bug #2278: Reset cpu and memory monitorization to 0 when the VM exits the running state (cherry picked from commit 3ece9dacdf1f412cb0412d56c5367adc3894088d) --- src/lcm/LifeCycleActions.cc | 3 +++ src/lcm/LifeCycleStates.cc | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index 88703058aa..bc1a38d50e 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -855,6 +855,9 @@ void LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose, int& imag vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_etime(the_time); diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index 5991d36541..b466f12aa9 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -47,6 +47,9 @@ void LifeCycleManager::save_success_action(int vid) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_previous_etime(the_time); @@ -85,6 +88,9 @@ void LifeCycleManager::save_success_action(int vid) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_running_etime(the_time); @@ -115,6 +121,9 @@ void LifeCycleManager::save_success_action(int vid) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_epilog_stime(the_time); @@ -509,6 +518,9 @@ void LifeCycleManager::shutdown_success_action(int vid) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_epilog_stime(the_time); @@ -519,6 +531,7 @@ void LifeCycleManager::shutdown_success_action(int vid) vmpool->update_history(vm); + // TODO CARLOS vm->log("LCM", Log::INFO, "New VM state is EPILOG"); //---------------------------------------------------- @@ -533,6 +546,9 @@ void LifeCycleManager::shutdown_success_action(int vid) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_running_etime(the_time); @@ -559,6 +575,9 @@ void LifeCycleManager::shutdown_success_action(int vid) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_epilog_stime(the_time); @@ -987,6 +1006,9 @@ void LifeCycleManager::cancel_success_action(int vid) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_reason(History::USER); @@ -1013,6 +1035,9 @@ void LifeCycleManager::cancel_success_action(int vid) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_epilog_stime(the_time); @@ -1037,6 +1062,9 @@ void LifeCycleManager::cancel_success_action(int vid) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_running_etime(the_time); @@ -1172,6 +1200,9 @@ void LifeCycleManager::monitor_suspend_action(int vid) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_running_etime(the_time); @@ -1255,6 +1286,9 @@ void LifeCycleManager::failure_action(VirtualMachine * vm) vm->delete_snapshots(); + map empty; + vm->update_info(0, 0, -1, -1, empty); + vmpool->update(vm); vm->set_etime(the_time); From 04c5f008a63b99969cc00f0881280580986c16e8 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 15 Nov 2013 10:42:03 +0100 Subject: [PATCH 08/12] Bug #2278: Removed unneeded comment (cherry picked from commit eb946b47509d672dac69bef87d2bdbeafa90dba8) --- src/lcm/LifeCycleStates.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index b466f12aa9..2a0d8a49f9 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -531,7 +531,6 @@ void LifeCycleManager::shutdown_success_action(int vid) vmpool->update_history(vm); - // TODO CARLOS vm->log("LCM", Log::INFO, "New VM state is EPILOG"); //---------------------------------------------------- From 96b5cd4276d7300976c9f33554e5f0d4481af884 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 15 Nov 2013 14:32:03 +0100 Subject: [PATCH 09/12] Bump to version 4.3.85 --- include/Nebula.h | 4 ++-- share/rubygems/generate | 2 +- share/scripts/context-packages/generate.sh | 2 +- src/cloud/common/CloudClient.rb | 2 +- src/oca/java/src/org/opennebula/client/OneSystem.java | 2 +- src/oca/ruby/opennebula.rb | 2 +- src/onedb/fsck.rb | 2 +- src/ozones/Server/templates/index.html | 2 +- src/ozones/Server/templates/login.html | 2 +- src/sunstone/views/index.erb | 2 +- src/sunstone/views/login.erb | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/Nebula.h b/include/Nebula.h index 55c3b07526..facb3a577b 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -357,12 +357,12 @@ public: */ static string version() { - return "OpenNebula 4.3.80"; + return "OpenNebula 4.3.85"; }; static string db_version() { - return "4.3.80"; + return "4.3.85"; } /** diff --git a/share/rubygems/generate b/share/rubygems/generate index 704b61ebb0..421bc56259 100755 --- a/share/rubygems/generate +++ b/share/rubygems/generate @@ -21,7 +21,7 @@ require 'tmpdir' DEFAULTS={ - :version => "4.3.80", + :version => "4.3.85", :date => Time.now.strftime("%Y-%m-%d"), :dependencies => [] } diff --git a/share/scripts/context-packages/generate.sh b/share/scripts/context-packages/generate.sh index 0b3e090080..a3db086dc4 100755 --- a/share/scripts/context-packages/generate.sh +++ b/share/scripts/context-packages/generate.sh @@ -16,7 +16,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -VERSION=${VERSION:-4.3.80} +VERSION=${VERSION:-4.3.85} MAINTAINER=${MAINTAINER:-C12G Labs } LICENSE=${LICENSE:-Apache 2.0} PACKAGE_NAME=${PACKAGE_NAME:-one-context} diff --git a/src/cloud/common/CloudClient.rb b/src/cloud/common/CloudClient.rb index 36aaa86459..7bf2c88a97 100644 --- a/src/cloud/common/CloudClient.rb +++ b/src/cloud/common/CloudClient.rb @@ -50,7 +50,7 @@ end module CloudClient # OpenNebula version - VERSION = '4.3.80' + VERSION = '4.3.85' # ######################################################################### # Default location for the authentication file diff --git a/src/oca/java/src/org/opennebula/client/OneSystem.java b/src/oca/java/src/org/opennebula/client/OneSystem.java index f899167940..712fd3a25a 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 = "4.3.80"; + public static final String VERSION = "4.3.85"; public OneSystem(Client client) { diff --git a/src/oca/ruby/opennebula.rb b/src/oca/ruby/opennebula.rb index 5e9feea709..f2284994a3 100644 --- a/src/oca/ruby/opennebula.rb +++ b/src/oca/ruby/opennebula.rb @@ -54,5 +54,5 @@ require 'opennebula/system' module OpenNebula # OpenNebula version - VERSION = '4.3.80' + VERSION = '4.3.85' end diff --git a/src/onedb/fsck.rb b/src/onedb/fsck.rb index e222fc5c1e..0805b10842 100644 --- a/src/onedb/fsck.rb +++ b/src/onedb/fsck.rb @@ -20,7 +20,7 @@ require 'ipaddr' require 'set' module OneDBFsck - VERSION = "4.3.80" + VERSION = "4.3.85" def db_version VERSION diff --git a/src/ozones/Server/templates/index.html b/src/ozones/Server/templates/index.html index 91397897a8..6431fab246 100644 --- a/src/ozones/Server/templates/index.html +++ b/src/ozones/Server/templates/index.html @@ -65,7 +65,7 @@
diff --git a/src/ozones/Server/templates/login.html b/src/ozones/Server/templates/login.html index 18b7580f56..c72449c6b8 100644 --- a/src/ozones/Server/templates/login.html +++ b/src/ozones/Server/templates/login.html @@ -49,7 +49,7 @@
diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index 41972cffb1..0eb6c4bfe2 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -86,7 +86,7 @@
diff --git a/src/sunstone/views/login.erb b/src/sunstone/views/login.erb index 6a554260f2..78b1d95989 100644 --- a/src/sunstone/views/login.erb +++ b/src/sunstone/views/login.erb @@ -26,7 +26,7 @@ From d793cc6fa45e13ce52644cedcf3a2825e402c9ca Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 15 Nov 2013 14:36:00 +0100 Subject: [PATCH 10/12] refresh man pages --- share/man/econe-allocate-address.1 | 2 +- share/man/econe-associate-address.1 | 2 +- share/man/econe-attach-volume.1 | 2 +- share/man/econe-create-keypair.1 | 2 +- share/man/econe-create-volume.1 | 2 +- share/man/econe-delete-keypair.1 | 2 +- share/man/econe-delete-volume.1 | 2 +- share/man/econe-describe-addresses.1 | 2 +- share/man/econe-describe-images.1 | 2 +- share/man/econe-describe-instances.1 | 2 +- share/man/econe-describe-keypairs.1 | 2 +- share/man/econe-describe-volumes.1 | 2 +- share/man/econe-detach-volume.1 | 2 +- share/man/econe-disassociate-address.1 | 2 +- share/man/econe-reboot-instances.1 | 2 +- share/man/econe-register.1 | 2 +- share/man/econe-release-address.1 | 2 +- share/man/econe-run-instances.1 | 2 +- share/man/econe-start-instances.1 | 2 +- share/man/econe-stop-instances.1 | 2 +- share/man/econe-terminate-instances.1 | 2 +- share/man/econe-upload.1 | 2 +- share/man/occi-compute.1 | 2 +- share/man/occi-instance-type.1 | 2 +- share/man/occi-network.1 | 2 +- share/man/occi-storage.1 | 2 +- share/man/oneacct.1 | 2 +- share/man/oneacl.1 | 2 +- share/man/onecluster.1 | 2 +- share/man/onedatastore.1 | 2 +- share/man/oneflow-template.1 | 2 +- share/man/oneflow.1 | 2 +- share/man/onegroup.1 | 2 +- share/man/onehost.1 | 2 +- share/man/oneimage.1 | 2 +- share/man/onetemplate.1 | 2 +- share/man/oneuser.1 | 2 +- share/man/onevdc.1 | 2 +- share/man/onevm.1 | 2 +- share/man/onevnet.1 | 2 +- share/man/onezone.1 | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/share/man/econe-allocate-address.1 b/share/man/econe-allocate-address.1 index a7f4ec3fe9..b66695eb7c 100644 --- a/share/man/econe-allocate-address.1 +++ b/share/man/econe-allocate-address.1 @@ -39,7 +39,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-associate-address.1 b/share/man/econe-associate-address.1 index 3c4a4f4af0..cf5e288dce 100644 --- a/share/man/econe-associate-address.1 +++ b/share/man/econe-associate-address.1 @@ -42,7 +42,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-attach-volume.1 b/share/man/econe-attach-volume.1 index d03c978176..33993d6e08 100644 --- a/share/man/econe-attach-volume.1 +++ b/share/man/econe-attach-volume.1 @@ -45,7 +45,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-create-keypair.1 b/share/man/econe-create-keypair.1 index 5ab1c04788..8a9b5263a2 100644 --- a/share/man/econe-create-keypair.1 +++ b/share/man/econe-create-keypair.1 @@ -42,7 +42,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-create-volume.1 b/share/man/econe-create-volume.1 index 3c8ee7d8c8..e364ed8b90 100644 --- a/share/man/econe-create-volume.1 +++ b/share/man/econe-create-volume.1 @@ -40,7 +40,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-delete-keypair.1 b/share/man/econe-delete-keypair.1 index 1a18b9a7e8..9edcd2c719 100644 --- a/share/man/econe-delete-keypair.1 +++ b/share/man/econe-delete-keypair.1 @@ -42,7 +42,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-delete-volume.1 b/share/man/econe-delete-volume.1 index abb9f963e4..65433c1f90 100644 --- a/share/man/econe-delete-volume.1 +++ b/share/man/econe-delete-volume.1 @@ -42,7 +42,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-describe-addresses.1 b/share/man/econe-describe-addresses.1 index 30f364f914..9c93602bc8 100644 --- a/share/man/econe-describe-addresses.1 +++ b/share/man/econe-describe-addresses.1 @@ -39,7 +39,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-describe-images.1 b/share/man/econe-describe-images.1 index 8e1d72d86e..90424ee825 100644 --- a/share/man/econe-describe-images.1 +++ b/share/man/econe-describe-images.1 @@ -36,7 +36,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-describe-instances.1 b/share/man/econe-describe-instances.1 index e55c5ee35e..5038b2b104 100644 --- a/share/man/econe-describe-instances.1 +++ b/share/man/econe-describe-instances.1 @@ -39,7 +39,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-describe-keypairs.1 b/share/man/econe-describe-keypairs.1 index 095f41a7d7..3510f0367d 100644 --- a/share/man/econe-describe-keypairs.1 +++ b/share/man/econe-describe-keypairs.1 @@ -39,7 +39,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-describe-volumes.1 b/share/man/econe-describe-volumes.1 index 68a3b61cc4..f5fd1fbc9e 100644 --- a/share/man/econe-describe-volumes.1 +++ b/share/man/econe-describe-volumes.1 @@ -39,7 +39,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-detach-volume.1 b/share/man/econe-detach-volume.1 index 3c9da37db2..22ab5d7269 100644 --- a/share/man/econe-detach-volume.1 +++ b/share/man/econe-detach-volume.1 @@ -45,7 +45,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-disassociate-address.1 b/share/man/econe-disassociate-address.1 index 9b343137da..b937a61658 100644 --- a/share/man/econe-disassociate-address.1 +++ b/share/man/econe-disassociate-address.1 @@ -42,7 +42,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-reboot-instances.1 b/share/man/econe-reboot-instances.1 index fc9d9d8738..1d51be6937 100644 --- a/share/man/econe-reboot-instances.1 +++ b/share/man/econe-reboot-instances.1 @@ -45,7 +45,7 @@ instance_id The IDs of instances, comma\-separated .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-register.1 b/share/man/econe-register.1 index 80062bf9f4..6df3f9c2f4 100644 --- a/share/man/econe-register.1 +++ b/share/man/econe-register.1 @@ -42,7 +42,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-release-address.1 b/share/man/econe-release-address.1 index fc242a7db4..478347cd33 100644 --- a/share/man/econe-release-address.1 +++ b/share/man/econe-release-address.1 @@ -42,7 +42,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-run-instances.1 b/share/man/econe-run-instances.1 index 56137cdc8c..49b8265831 100644 --- a/share/man/econe-run-instances.1 +++ b/share/man/econe-run-instances.1 @@ -53,7 +53,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-start-instances.1 b/share/man/econe-start-instances.1 index 303368490d..d94f9beeea 100644 --- a/share/man/econe-start-instances.1 +++ b/share/man/econe-start-instances.1 @@ -45,7 +45,7 @@ instance_id The IDs of instances, comma\-separated .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-stop-instances.1 b/share/man/econe-stop-instances.1 index 5acf052348..f1f7b549e2 100644 --- a/share/man/econe-stop-instances.1 +++ b/share/man/econe-stop-instances.1 @@ -45,7 +45,7 @@ instance_id The IDs of instances, comma\-separated .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-terminate-instances.1 b/share/man/econe-terminate-instances.1 index bb93403485..2a6084a8e8 100644 --- a/share/man/econe-terminate-instances.1 +++ b/share/man/econe-terminate-instances.1 @@ -45,7 +45,7 @@ instance_id The IDs of instances, comma\-separated .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/econe-upload.1 b/share/man/econe-upload.1 index 9c0855ab00..ce042a73f9 100644 --- a/share/man/econe-upload.1 +++ b/share/man/econe-upload.1 @@ -43,7 +43,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/occi-compute.1 b/share/man/occi-compute.1 index cc062dcd4f..30bf33be05 100644 --- a/share/man/occi-compute.1 +++ b/share/man/occi-compute.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "November 2013" "OpenNebula 4.3.80" "User Commands" +.TH OPENNEBULA "1" "November 2013" "OpenNebula 4.3.85" "User Commands" .SH NAME OpenNebula \- OCCI Manage Compute .SH SYNOPSIS diff --git a/share/man/occi-instance-type.1 b/share/man/occi-instance-type.1 index bd05910d5e..abe598da51 100644 --- a/share/man/occi-instance-type.1 +++ b/share/man/occi-instance-type.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "November 2013" "OpenNebula 4.3.80" "User Commands" +.TH OPENNEBULA "1" "November 2013" "OpenNebula 4.3.85" "User Commands" .SH NAME OpenNebula \- OCCI Manage Instance .SH SYNOPSIS diff --git a/share/man/occi-network.1 b/share/man/occi-network.1 index 0f5805a76a..8a53b582d2 100644 --- a/share/man/occi-network.1 +++ b/share/man/occi-network.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "November 2013" "OpenNebula 4.3.80" "User Commands" +.TH OPENNEBULA "1" "November 2013" "OpenNebula 4.3.85" "User Commands" .SH NAME OpenNebula \- OCCI Manage Network .SH SYNOPSIS diff --git a/share/man/occi-storage.1 b/share/man/occi-storage.1 index c4351eac23..75d863f5ad 100644 --- a/share/man/occi-storage.1 +++ b/share/man/occi-storage.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "November 2013" "OpenNebula 4.3.80" "User Commands" +.TH OPENNEBULA "1" "November 2013" "OpenNebula 4.3.85" "User Commands" .SH NAME OpenNebula \- OCCI Manage Storage .SH SYNOPSIS diff --git a/share/man/oneacct.1 b/share/man/oneacct.1 index 4579640924..579c355054 100644 --- a/share/man/oneacct.1 +++ b/share/man/oneacct.1 @@ -46,7 +46,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/oneacl.1 b/share/man/oneacl.1 index 699501a975..4278271b3d 100644 --- a/share/man/oneacl.1 +++ b/share/man/oneacl.1 @@ -54,7 +54,7 @@ aclid_list Comma\-separated list of OpenNebula ACL names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/onecluster.1 b/share/man/onecluster.1 index 0945f7ad01..a42cc334a2 100644 --- a/share/man/onecluster.1 +++ b/share/man/onecluster.1 @@ -99,7 +99,7 @@ datastoreid OpenNebula DATASTORE name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/onedatastore.1 b/share/man/onedatastore.1 index 2746b67d8a..134d938525 100644 --- a/share/man/onedatastore.1 +++ b/share/man/onedatastore.1 @@ -91,7 +91,7 @@ userid OpenNebula USER name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/oneflow-template.1 b/share/man/oneflow-template.1 index fa0d8ec66a..2d4a09d8d2 100644 --- a/share/man/oneflow-template.1 +++ b/share/man/oneflow-template.1 @@ -84,7 +84,7 @@ templateid_list Comma\-separated list of OpenNebula SERVICE TEMPLATE names or id .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/oneflow.1 b/share/man/oneflow.1 index 4cb0858e2e..978da19d4e 100644 --- a/share/man/oneflow.1 +++ b/share/man/oneflow.1 @@ -94,7 +94,7 @@ vm_action Actions supported: shutdown, shutdown\-hard, undeploy, undeploy\-hard, .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/onegroup.1 b/share/man/onegroup.1 index 613a3e6d7e..df4760320f 100644 --- a/share/man/onegroup.1 +++ b/share/man/onegroup.1 @@ -74,7 +74,7 @@ groupid_list Comma\-separated list of OpenNebula GROUP names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/onehost.1 b/share/man/onehost.1 index 421245eb06..c5c6f8764e 100644 --- a/share/man/onehost.1 +++ b/share/man/onehost.1 @@ -91,7 +91,7 @@ hostid_list Comma\-separated list of OpenNebula HOST names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/oneimage.1 b/share/man/oneimage.1 index 629d091eda..43462bbdc1 100644 --- a/share/man/oneimage.1 +++ b/share/man/oneimage.1 @@ -161,7 +161,7 @@ type Image type: OS, CDROM, DATABLOCK, KERNEL, RAMDISK, CONTEXT .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/onetemplate.1 b/share/man/onetemplate.1 index 7530df210b..d4d73cf8e5 100644 --- a/share/man/onetemplate.1 +++ b/share/man/onetemplate.1 @@ -162,7 +162,7 @@ filterflag a, all all the known VMTEMPLATEs m, mine the VMTEMPLATE belonging to .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/oneuser.1 b/share/man/oneuser.1 index ae468ca8a0..442eab503c 100644 --- a/share/man/oneuser.1 +++ b/share/man/oneuser.1 @@ -147,7 +147,7 @@ password User password .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/onevdc.1 b/share/man/onevdc.1 index 204d5b92f0..91036a1fd8 100644 --- a/share/man/onevdc.1 +++ b/share/man/onevdc.1 @@ -63,7 +63,7 @@ vdcid VDC ID .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/onevm.1 b/share/man/onevm.1 index b4be574fc1..cc590fb801 100644 --- a/share/man/onevm.1 +++ b/share/man/onevm.1 @@ -518,7 +518,7 @@ diskid Integer .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/onevnet.1 b/share/man/onevnet.1 index 715453fb98..3474aec9f7 100644 --- a/share/man/onevnet.1 +++ b/share/man/onevnet.1 @@ -104,7 +104,7 @@ filterflag a, all all the known VNETs m, mine the VNET belonging to the user in .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 diff --git a/share/man/onezone.1 b/share/man/onezone.1 index 1f7368d944..981b51a489 100644 --- a/share/man/onezone.1 +++ b/share/man/onezone.1 @@ -53,7 +53,7 @@ zoneid Zone ID .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.3\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.3\.85 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs . .P Licensed under the Apache License, Version 2\.0 (the "License"); you may not use this file except in compliance with the License\. You may obtain a copy of the License at http://www\.apache\.org/licenses/LICENSE\-2\.0 From 456cc4e263e41f232e1bbb34adbb7a1f75cd86b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 15 Nov 2013 15:03:30 +0100 Subject: [PATCH 11/12] Add migrator to 4.3.85 (cherry picked from commit d4572f66a06e3d8af72e473806d205c4a9dbdef5) --- install.sh | 1 + src/onedb/4.3.80_to_4.3.85.rb | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/onedb/4.3.80_to_4.3.85.rb diff --git a/install.sh b/install.sh index 147f41b81c..020578ef6f 100755 --- a/install.sh +++ b/install.sh @@ -1152,6 +1152,7 @@ ONEDB_MIGRATOR_FILES="src/onedb/2.0_to_2.9.80.rb \ src/onedb/4.0.1_to_4.1.80.rb \ src/onedb/4.1.80_to_4.2.0.rb \ src/onedb/4.2.0_to_4.3.80.rb \ + src/onedb/4.3.80_to_4.3.85.rb \ src/onedb/fsck.rb \ src/onedb/onedb.rb \ src/onedb/onedb_backend.rb" diff --git a/src/onedb/4.3.80_to_4.3.85.rb b/src/onedb/4.3.80_to_4.3.85.rb new file mode 100644 index 0000000000..98d3b1bcee --- /dev/null +++ b/src/onedb/4.3.80_to_4.3.85.rb @@ -0,0 +1,29 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +#--------------------------------------------------------------------------- # + +module Migrator + def db_version + "4.3.85" + end + + def one_version + "OpenNebula 4.3.85" + end + + def up + return true + end +end From ae9e580d41f6cf7f14362eabbc7fcb649193a58e Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 15 Nov 2013 16:43:21 +0100 Subject: [PATCH 12/12] Feature #2345: add VLAN_TAGGED_ID to the list of image inherited attributes --- share/etc/oned.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/etc/oned.conf b/share/etc/oned.conf index ab1f51500e..b1e37fa22c 100644 --- a/share/etc/oned.conf +++ b/share/etc/oned.conf @@ -697,3 +697,5 @@ IMAGE_RESTRICTED_ATTR = "SOURCE" INHERIT_DATASTORE_ATTR = "CEPH_HOST" INHERIT_DATASTORE_ATTR = "CEPH_SECRET" + +INHERIT_VNET_ATTR = "VLAN_TAGGED_ID"