From 664f240060b03df99e25097b41df2b9b3e363c9d Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 29 Sep 2011 16:50:24 +0200 Subject: [PATCH 1/2] Changed README file to 3.0 (cherry picked from commit b11b7b5290ffe89bf3d7f477d34fea78aaa3114f) --- README.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2480dac71f..7f0cc5b5f4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ distributed data center infrastructures. Complete documentation can be found at - http://opennebula.org/documentation:rel2.4 + http://opennebula.org/documentation:rel3.0 ## INSTALLATION @@ -35,6 +35,14 @@ Additionally, to build OpenNebula from source you need: * **bison** >= 2.3 (optional, only needed to rebuild the parsers) * **libxml2-dev** +### RUBY LIBRARIES REQUIREMENTS + +A set of gem requirements are needed to make several components work. We +include a handy script to install them and the requirements. It is located at +`share/install_gems/install_gems` and you should use it to install the +required gems. You have more information at: + + http://opennebula.org/documentation:rel3.0:compile ### OPTIONAL PACKAGES @@ -104,6 +112,8 @@ where **install_options** can be one or more of: -d target installation directory. If defined, it will specified the path for the self-contained install. If not defined, the installation will be performed system wide + -c only install client utilities: OpenNebula cli, occi and ec2 + client files -r remove Opennebula, only useful if -d was not specified, otherwise rm -rf $ONE_LOCATION would do the job -h prints installer help @@ -111,7 +121,8 @@ where **install_options** can be one or more of: ## CONFIGURATION -Information on how to configure OpenNebula is located at http://opennebula.org/documentation:rel2.4 +Information on how to configure OpenNebula is located at +http://opennebula.org/documentation:rel3.0:cg ## CONTACT From 0ecdaf52580a15904c85b1c3aab4a1cbe246e714 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 28 Sep 2011 17:38:43 +0200 Subject: [PATCH 2/2] oZones GUI: Replace * with grayed-out names for non unique hosts in VDC dialogs (cherry picked from commit 10eea8036aed7ab25d9b230e376046b060bfec1b) --- src/ozones/Server/public/js/plugins/vdcs-tab.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ozones/Server/public/js/plugins/vdcs-tab.js b/src/ozones/Server/public/js/plugins/vdcs-tab.js index aa35e31931..4564886c96 100644 --- a/src/ozones/Server/public/js/plugins/vdcs-tab.js +++ b/src/ozones/Server/public/js/plugins/vdcs-tab.js @@ -49,7 +49,7 @@ var create_vdc_tmpl =
\ \ \ -
Allows hosts belonging to other VDCs to be re-added to this one. They will appear marked with * in the list.
\ +
Allows hosts belonging to other VDCs to be re-added to this one. They will appear greyed-out in the lists.
\
\ \ \ @@ -77,7 +77,7 @@ var update_vdc_tmpl =
\ \ \ -
Allows hosts belonging to other VDCs to be re-added to this one. They will appear marked with * in the list.
\ +
Allows hosts belonging to other VDCs to be re-added to this one. They will appear greyed-out in the list.
\
\ \ \ @@ -326,7 +326,7 @@ function fillHostList(req, host_list_json){ free = isHostFree(this.HOST.ID,zone_id); if (force || free){ - list+='
  • '+(free? this.HOST.NAME : this.HOST.NAME+'*')+'
  • '; + list+='
  • '+(free? this.HOST.NAME : ''+this.HOST.NAME+'')+'
  • '; } }); $('div#create_vdc_dialog #vdc_available_hosts_list').html(list); @@ -367,7 +367,7 @@ function fillUpdateHostList(req, host_list_json){ free = isHostFree(this.HOST.ID,zone_id); if (force || free){ - list+='
  • '+(free? this.HOST.NAME : this.HOST.NAME+'*')+'
  • '; + list+='
  • '+(free? this.HOST.NAME : ''+this.HOST.NAME+'')+'
  • '; } }); @@ -404,7 +404,7 @@ function setupCreateVDCDialog(){ dialog.dialog({ autoOpen: false, modal: true, - width: 500 + width: 420 }); $('button',dialog).button(); @@ -495,7 +495,7 @@ function setupUpdateVDCDialog(){ dialog.dialog({ autoOpen: false, modal: true, - width: 500 + width: 420 }); $('button',dialog).button();