diff --git a/include/Nebula.h b/include/Nebula.h index f9f8c303a8..1bab2d21b6 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -298,12 +298,12 @@ public: static string version() { - return "OpenNebula 3.5.0"; + return "OpenNebula 3.5.80"; }; static string db_version() { - return "3.5.0"; + return "3.5.80"; } void start(); diff --git a/share/man/econe-describe-images.1 b/share/man/econe-describe-images.1 index 7af74a81be..0207a5bda4 100644 --- a/share/man/econe-describe-images.1 +++ b/share/man/econe-describe-images.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "March 2012" "OpenNebula 3.5.0" "User Commands" +.TH OPENNEBULA "1" "June 2012" "OpenNebula 3.5.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-describe-images .SH SYNOPSIS diff --git a/share/man/econe-describe-instances.1 b/share/man/econe-describe-instances.1 index 23e157a111..382e60db5f 100644 --- a/share/man/econe-describe-instances.1 +++ b/share/man/econe-describe-instances.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "March 2012" "OpenNebula 3.5.0" "User Commands" +.TH OPENNEBULA "1" "June 2012" "OpenNebula 3.5.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-describe-instances .SH SYNOPSIS diff --git a/share/man/econe-register.1 b/share/man/econe-register.1 index b17e29c90f..7d3d14ba41 100644 --- a/share/man/econe-register.1 +++ b/share/man/econe-register.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "March 2012" "OpenNebula 3.5.0" "User Commands" +.TH OPENNEBULA "1" "June 2012" "OpenNebula 3.5.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-register .SH SYNOPSIS diff --git a/share/man/econe-run-instances.1 b/share/man/econe-run-instances.1 index 405f2a79dd..0813a49f7d 100644 --- a/share/man/econe-run-instances.1 +++ b/share/man/econe-run-instances.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "March 2012" "OpenNebula 3.5.0" "User Commands" +.TH OPENNEBULA "1" "June 2012" "OpenNebula 3.5.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-run-instances .SH SYNOPSIS diff --git a/share/man/econe-terminate-instances.1 b/share/man/econe-terminate-instances.1 index 5fee6cf92a..ad8cf48d38 100644 --- a/share/man/econe-terminate-instances.1 +++ b/share/man/econe-terminate-instances.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "March 2012" "OpenNebula 3.5.0" "User Commands" +.TH OPENNEBULA "1" "June 2012" "OpenNebula 3.5.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-terminate-instances .SH SYNOPSIS diff --git a/share/man/econe-upload.1 b/share/man/econe-upload.1 index ffc04e0047..a9928f9291 100644 --- a/share/man/econe-upload.1 +++ b/share/man/econe-upload.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. -.TH OPENNEBULA "1" "September 2011" "OpenNebula 3.5.0" "User Commands" +.TH OPENNEBULA "1" "June 2012" "OpenNebula 3.5.80" "User Commands" .SH NAME OpenNebula \- OpenNebula econe-upload .SH SYNOPSIS @@ -35,7 +35,7 @@ Use 'multipart\-post' library instead of Curb/Curl .PP IMAGE\-PATH: Path to the image to upload .SH COPYRIGHT -Copyright 2002\-2011, OpenNebula Project Leads (OpenNebula.org) +Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula.org) .PP 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 diff --git a/share/man/occi-compute.1 b/share/man/occi-compute.1 index cd46f6878b..10284c0b43 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" "March 2012" "OpenNebula 3.5.0" "User Commands" +.TH OPENNEBULA "1" "June 2012" "OpenNebula 3.5.80" "User Commands" .SH NAME OpenNebula \- OpenNebula occi-compute .SH SYNOPSIS @@ -32,6 +32,10 @@ Sets a timeout for the http connection \fB\-\-debug\fR, \fB\-D\fR .IP Enables verbosity +.PP +\fB\-\-verbose\fR +.IP +Show resources in verbose mode .SH COMMANDS .TP \fBcreate\fR diff --git a/share/man/occi-network.1 b/share/man/occi-network.1 index 68118c5f10..9564f78021 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" "March 2012" "OpenNebula 3.5.0" "User Commands" +.TH OPENNEBULA "1" "June 2012" "OpenNebula 3.5.80" "User Commands" .SH NAME OpenNebula \- OpenNebula occi-network .SH SYNOPSIS @@ -33,9 +33,13 @@ Sets a timeout for the http connection .IP Enables verbosity .PP -\fB\-\-multipart\fR, \fB\-M\fR +\fB\-\-verbose\fR .IP -Use 'multipart\-post' library instead of Curb/Curl +Show resources in verbose mode +.PP +\fB\-\-plain\fR +.IP +The password provided will not be hashed .SH COMMANDS .TP \fBcreate\fR diff --git a/share/man/occi-storage.1 b/share/man/occi-storage.1 index c803603360..11e3f8ae41 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" "March 2012" "OpenNebula 3.5.0" "User Commands" +.TH OPENNEBULA "1" "June 2012" "OpenNebula 3.5.80" "User Commands" .SH NAME OpenNebula \- OpenNebula occi-storage .SH SYNOPSIS @@ -36,6 +36,14 @@ Enables verbosity \fB\-\-multipart\fR, \fB\-M\fR .IP Use 'multipart\-post' library instead of Curb/Curl +.PP +\fB\-\-verbose\fR +.IP +Show resources in verbose mode +.PP +\fB\-\-plain\fR +.IP +The password provided will not be hashed .SH COMMANDS .TP \fBcreate\fR diff --git a/share/man/oneacl.1 b/share/man/oneacl.1 index af945d3381..d2f6b61554 100644 --- a/share/man/oneacl.1 +++ b/share/man/oneacl.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEACL" "1" "April 2012" "" "oneacl(1) -- manages OpenNebula ACLs" +.TH "ONEACL" "1" "June 2012" "" "oneacl(1) -- manages OpenNebula ACLs" . .SH "NAME" \fBoneacl\fR @@ -128,7 +128,7 @@ Comma\-separated list of OpenNebula ACL names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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 fec2ec9e34..ba732a0a41 100644 --- a/share/man/onecluster.1 +++ b/share/man/onecluster.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONECLUSTER" "1" "April 2012" "" "onecluster(1) -- manages OpenNebula clusters" +.TH "ONECLUSTER" "1" "June 2012" "" "onecluster(1) -- manages OpenNebula clusters" . .SH "NAME" \fBonecluster\fR @@ -286,7 +286,7 @@ OpenNebula DATASTORE name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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 ceedf9ab6e..e080285ce8 100644 --- a/share/man/onedatastore.1 +++ b/share/man/onedatastore.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEDATASTORE" "1" "April 2012" "" "onedatastore(1) -- manages OpenNebula datastores" +.TH "ONEDATASTORE" "1" "June 2012" "" "onedatastore(1) -- manages OpenNebula datastores" . .SH "NAME" \fBonedatastore\fR @@ -128,13 +128,14 @@ valid options: xml . .IP "\(bu" 4 -update \fIdatastoreid\fR +update \fIdatastoreid\fR [\fIfile\fR] . .IP "" 4 . .nf -Launches the system editor to modify and update the template contents +Update the template contents\. If a path is not provided the editor will +be launched to modify the current content\. . .fi . @@ -260,7 +261,7 @@ OpenNebula USER name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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/onedb.1 b/share/man/onedb.1 index f15019c661..2c28e9d06a 100644 --- a/share/man/onedb.1 +++ b/share/man/onedb.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEDB" "1" "April 2012" "" "onedb(1) -- OpenNebula database migration tool" +.TH "ONEDB" "1" "June 2012" "" "onedb(1) -- OpenNebula database migration tool" . .SH "NAME" \fBonedb\fR diff --git a/share/man/onegroup.1 b/share/man/onegroup.1 index b65de5c82c..a640c57434 100644 --- a/share/man/onegroup.1 +++ b/share/man/onegroup.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEGROUP" "1" "April 2012" "" "onegroup(1) -- manages OpenNebula groups" +.TH "ONEGROUP" "1" "June 2012" "" "onegroup(1) -- manages OpenNebula groups" . .SH "NAME" \fBonegroup\fR @@ -82,6 +82,21 @@ valid options: xml . .IP "" 0 +. +.IP "\(bu" 4 +quota \fIgroupid\fR [\fIfile\fR] +. +.IP "" 4 +. +.nf + +Set the quota limits for the group\. If a path is not provided the editor +will be launched to modify the current quotas\. +. +.fi +. +.IP "" 0 + . .IP "" 0 . @@ -160,7 +175,7 @@ Comma\-separated list of OpenNebula GROUP names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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 639b12f2e3..1737cf4f1d 100644 --- a/share/man/onehost.1 +++ b/share/man/onehost.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEHOST" "1" "April 2012" "" "onehost(1) -- manages OpenNebula hosts" +.TH "ONEHOST" "1" "June 2012" "" "onehost(1) -- manages OpenNebula hosts" . .SH "NAME" \fBonehost\fR @@ -88,13 +88,14 @@ Disables the given Host . .IP "\(bu" 4 -update \fIhostid\fR +update \fIhostid\fR [\fIfile\fR] . .IP "" 4 . .nf -Launches the system editor to modify and update the template contents +Update the template contents\. If a path is not provided the editor will +be launched to modify the current content\. . .fi . @@ -239,7 +240,7 @@ Comma\-separated list of OpenNebula HOST names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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 3c44091330..ffc37e2bbf 100644 --- a/share/man/oneimage.1 +++ b/share/man/oneimage.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEIMAGE" "1" "April 2012" "" "oneimage(1) -- manages OpenNebula images" +.TH "ONEIMAGE" "1" "June 2012" "" "oneimage(1) -- manages OpenNebula images" . .SH "NAME" \fBoneimage\fR @@ -40,6 +40,20 @@ valid options: datastore . .IP "" 0 +. +.IP "\(bu" 4 +clone \fIimageid\fR \fIname\fR +. +.IP "" 4 +. +.nf + +Creates a new Image from an existing one +. +.fi +. +.IP "" 0 + . .IP "\(bu" 4 delete \fIrange|imageid_list\fR @@ -117,13 +131,14 @@ Makes the given Image non persistent\. See \'oneimage persistent\' . .IP "\(bu" 4 -update \fIimageid\fR +update \fIimageid\fR [\fIfile\fR] . .IP "" 4 . .nf -Launches the system editor to modify and update the template contents +Update the template contents\. If a path is not provided the editor will +be launched to modify the current content\. . .fi . @@ -383,7 +398,7 @@ user IMAGE of the user identified by the username .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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 6787d0264e..44ad5e04fc 100644 --- a/share/man/onetemplate.1 +++ b/share/man/onetemplate.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONETEMPLATE" "1" "April 2012" "" "onetemplate(1) -- manages OpenNebula templates" +.TH "ONETEMPLATE" "1" "June 2012" "" "onetemplate(1) -- manages OpenNebula templates" . .SH "NAME" \fBonetemplate\fR @@ -43,6 +43,20 @@ Creates a new Template from the given template file . .IP "" 0 +. +.IP "\(bu" 4 +clone \fItemplateid\fR \fIname\fR +. +.IP "" 4 +. +.nf + +Creates a new Template from an existing one +. +.fi +. +.IP "" 0 + . .IP "\(bu" 4 delete \fIrange|templateid_list\fR @@ -148,13 +162,14 @@ Changes the Template permissions . .IP "\(bu" 4 -update \fItemplateid\fR +update \fItemplateid\fR [\fIfile\fR] . .IP "" 4 . .nf -Launches the system editor to modify and update the template contents +Update the template contents\. If a path is not provided the editor will +be launched to modify the current content\. . .fi . @@ -330,7 +345,7 @@ user VMTEMPLATE of the user identified by the username .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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 88f119a52c..057b596e84 100644 --- a/share/man/oneuser.1 +++ b/share/man/oneuser.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEUSER" "1" "April 2012" "" "oneuser(1) -- manages OpenNebula users" +.TH "ONEUSER" "1" "June 2012" "" "oneuser(1) -- manages OpenNebula users" . .SH "NAME" \fBoneuser\fR @@ -57,13 +57,29 @@ valid options: read_file, sha1, ssh, x509, key, cert, driver . .IP "\(bu" 4 -update \fIuserid\fR +update \fIuserid\fR [\fIfile\fR] . .IP "" 4 . .nf -Launches the system editor to modify and update the template contents +Update the template contents\. If a path is not provided the editor will +be launched to modify the current content\. +. +.fi +. +.IP "" 0 + +. +.IP "\(bu" 4 +quota \fIuserid\fR [\fIfile\fR] +. +.IP "" 4 +. +.nf + +Set the quota limits for the user\. If a path is not provided the editor +will be launched to modify the current quotas\. . .fi . @@ -199,6 +215,20 @@ valid options: xml . .IP "" 0 +. +.IP "\(bu" 4 +encode \fIusername\fR [\fIpassword\fR] +. +.IP "" 4 +. +.nf + +Encodes user and password to use it with ldap +. +.fi +. +.IP "" 0 + . .IP "" 0 . @@ -305,7 +335,7 @@ User password .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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 0af0f9ea7e..801beb0b79 100644 --- a/share/man/onevdc.1 +++ b/share/man/onevdc.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEVDC" "1" "April 2012" "" "onevdc(1) -- manages OpenNebula Virtual DataCenters" +.TH "ONEVDC" "1" "June 2012" "" "onevdc(1) -- manages OpenNebula Virtual DataCenters" . .SH "NAME" \fBonevdc\fR @@ -178,7 +178,7 @@ VDC ID .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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 0153bc9b0a..478021125d 100644 --- a/share/man/onevm.1 +++ b/share/man/onevm.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEVM" "1" "April 2012" "" "onevm(1) -- manages OpenNebula virtual machines" +.TH "ONEVM" "1" "June 2012" "" "onevm(1) -- manages OpenNebula virtual machines" . .SH "NAME" \fBonevm\fR @@ -18,6 +18,8 @@ \-n, \-\-numeric Do not translate user and group IDs \-k, \-\-kilobytes Show units in kilobytes \-t, \-\-type type Type of the new Image + \-f, \-\-file file Selects the template file + \-i, \-\-image id|name Selects the image \-l, \-\-list x,y,z Selects columns to display with list command \-d, \-\-delay x Sets the delay in seconds for top command \-v, \-\-verbose Verbose mode @@ -146,6 +148,22 @@ States: RUNNING . .IP "" 0 +. +.IP "\(bu" 4 +reset \fIrange|vmid_list\fR +. +.IP "" 4 +. +.nf + +Resets the given VM + +States: RUNNING +. +.fi +. +.IP "" 0 + . .IP "\(bu" 4 deploy \fIrange|vmid_list\fR \fIhostid\fR @@ -300,6 +318,39 @@ States: STOPPED, SUSPENDED . .IP "" 0 +. +.IP "\(bu" 4 +attachdisk \fIvmid\fR +. +.IP "" 4 +. +.nf + +Attaches a disk to a running VM + +States: RUNNING +valid options: file, image +. +.fi +. +.IP "" 0 + +. +.IP "\(bu" 4 +detachdisk \fIvmid\fR \fIdiskid\fR +. +.IP "" 4 +. +.nf + +Detaches a disk from a running VM + +States: RUNNING +. +.fi +. +.IP "" 0 + . .IP "\(bu" 4 chgrp \fIrange|vmid_list\fR \fIgroupid\fR @@ -342,6 +393,38 @@ Changes the VM permissions . .IP "" 0 +. +.IP "\(bu" 4 +resched \fIrange|vmid_list\fR +. +.IP "" 4 +. +.nf + +Sets the rescheduling flag for the VM\. + +States: RUNNING +. +.fi +. +.IP "" 0 + +. +.IP "\(bu" 4 +unresched \fIrange|vmid_list\fR +. +.IP "" 4 +. +.nf + +Clears the rescheduling flag for the VM\. + +States: RUNNING +. +.fi +. +.IP "" 0 + . .IP "\(bu" 4 list [\fIfilterflag\fR] @@ -522,11 +605,25 @@ user VM of the user identified by the username . .IP "" 0 +. +.IP "\(bu" 4 +diskid +. +.IP "" 4 +. +.nf + +Integer +. +.fi +. +.IP "" 0 + . .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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 30c1d4d8c6..2bccab29a7 100644 --- a/share/man/onevnet.1 +++ b/share/man/onevnet.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEVNET" "1" "April 2012" "" "onevnet(1) -- manages OpenNebula networks" +.TH "ONEVNET" "1" "June 2012" "" "onevnet(1) -- manages OpenNebula networks" . .SH "NAME" \fBonevnet\fR @@ -216,13 +216,14 @@ valid options: xml . .IP "\(bu" 4 -update \fIvnetid\fR +update \fIvnetid\fR [\fIfile\fR] . .IP "" 4 . .nf -Launches the system editor to modify and update the template contents +Update the template contents\. If a path is not provided the editor will +be launched to modify the current content\. . .fi . @@ -353,7 +354,7 @@ user VNET of the user identified by the username .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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 07bfe72cc3..9c219e6f61 100644 --- a/share/man/onezone.1 +++ b/share/man/onezone.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "ONEZONE" "1" "April 2012" "" "onezone(1) -- manages OpenNebula zones" +.TH "ONEZONE" "1" "June 2012" "" "onezone(1) -- manages OpenNebula zones" . .SH "NAME" \fBonezone\fR @@ -148,7 +148,7 @@ Zone ID .IP "" 0 . .SH "LICENSE" -OpenNebula 3\.5\.0 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) +OpenNebula 3\.5\.80 Copyright 2002\-2012, OpenNebula Project Leads (OpenNebula\.org) . .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/src/cli/one_helper.rb b/src/cli/one_helper.rb index 9774436dfe..76e67f78cc 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -21,7 +21,7 @@ include OpenNebula module OpenNebulaHelper ONE_VERSION=<<-EOT -OpenNebula 3.5.0 +OpenNebula 3.5.80 Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/src/cloud/common/CloudClient.rb b/src/cloud/common/CloudClient.rb index 0c17053503..62d3804559 100644 --- a/src/cloud/common/CloudClient.rb +++ b/src/cloud/common/CloudClient.rb @@ -181,7 +181,7 @@ module CloudCLI def version_text version=< diff --git a/src/ozones/Server/templates/index.html b/src/ozones/Server/templates/index.html index 3a5e018a1a..5e476648bf 100644 --- a/src/ozones/Server/templates/index.html +++ b/src/ozones/Server/templates/index.html @@ -61,7 +61,7 @@ diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index e58293b294..493012a901 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -91,7 +91,7 @@