diff --git a/include/Nebula.h b/include/Nebula.h index 558f0e162c..e21dc9133f 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -357,7 +357,7 @@ public: */ static string code_version() { - return "5.3.90"; // bump version + return "5.4.0"; // bump version } /** @@ -366,7 +366,7 @@ public: */ static string shared_db_version() { - return "5.3.80"; + return "5.4.0"; } /** @@ -375,7 +375,7 @@ public: */ static string local_db_version() { - return "5.3.80"; + return "5.4.0"; } /** diff --git a/install.sh b/install.sh index 050c2a5ca8..5e800aeeb2 100755 --- a/install.sh +++ b/install.sh @@ -1207,7 +1207,8 @@ ONEDB_SHARED_MIGRATOR_FILES="src/onedb/shared/2.0_to_2.9.80.rb \ src/onedb/shared/4.6.0_to_4.11.80.rb \ src/onedb/shared/4.11.80_to_4.90.0.rb \ src/onedb/shared/4.90.0_to_5.2.0.rb \ - src/onedb/shared/5.2.0_to_5.3.80.rb" + src/onedb/shared/5.2.0_to_5.3.80.rb \ + src/onedb/shared/5.3.80_to_5.4.0.rb" ONEDB_LOCAL_MIGRATOR_FILES="src/onedb/local/4.5.80_to_4.7.80.rb \ src/onedb/local/4.7.80_to_4.9.80.rb \ @@ -1216,7 +1217,8 @@ ONEDB_LOCAL_MIGRATOR_FILES="src/onedb/local/4.5.80_to_4.7.80.rb \ src/onedb/local/4.11.80_to_4.13.80.rb \ src/onedb/local/4.13.80_to_4.13.85.rb \ src/onedb/local/4.13.85_to_4.90.0.rb \ - src/onedb/local/4.90.0_to_5.3.80.rb" + src/onedb/local/4.90.0_to_5.3.80.rb \ + src/onedb/local/5.3.80_to_5.4.0.rb" ONEDB_PATCH_FILES="src/onedb/patches/4.14_monitoring.rb \ src/onedb/patches/history_times.rb" diff --git a/share/man/econe-allocate-address.1 b/share/man/econe-allocate-address.1 index 3b341df441..32ef0c450f 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 d805737de4..b2846a1c36 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 abc8b9ec33..7c2eb69678 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 eb4c0fa84c..dd23247e8e 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 b1892d8403..b71b70a179 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 986c336ef7..9568b84ded 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 d818230843..8e1e197129 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 9d12ffc967..69cb75bdda 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 a3b1433225..82df364c49 100644 --- a/share/man/econe-describe-images.1 +++ b/share/man/econe-describe-images.1 @@ -39,7 +39,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 55f0b50f6e..101dee5af6 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 56cdf627d5..2e7b2de851 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 19eae2cb14..6d55546be8 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 703ed28da4..bfc3eb344f 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 5346931248..939f1861aa 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 60c6a81e8d..cfbe70032a 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 27c1b3e810..2f9f859233 100644 --- a/share/man/econe-register.1 +++ b/share/man/econe-register.1 @@ -42,7 +42,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 147631222f..b8c4dff9ee 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 8e4a743232..2a58f9f5eb 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 2fee7ff821..213ea35642 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 9b1461df14..5b56ca8fd4 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 8c6c64a537..d73b3e7ac9 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 681ec0268f..079ccb25e9 100644 --- a/share/man/econe-upload.1 +++ b/share/man/econe-upload.1 @@ -43,7 +43,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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/oneacct.1 b/share/man/oneacct.1 index ca4d6c183c..2d350cb402 100644 --- a/share/man/oneacct.1 +++ b/share/man/oneacct.1 @@ -49,7 +49,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 81dd10b92d..b3ab2ea2be 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 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 e04f78ea75..e1bd85b30a 100644 --- a/share/man/onecluster.1 +++ b/share/man/onecluster.1 @@ -101,7 +101,7 @@ datastoreid OpenNebula DATASTORE name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 16cc157593..779495cea6 100644 --- a/share/man/onedatastore.1 +++ b/share/man/onedatastore.1 @@ -99,7 +99,7 @@ userid OpenNebula USER name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 291000784e..17aafedacb 100644 --- a/share/man/onedb.1 +++ b/share/man/onedb.1 @@ -16,14 +16,6 @@ This command enables the user to manage the OpenNebula database\. It provides in \-f, \-\-force Forces the backup even if the DB exists \-\-federated Limit backup/restore to federated tables \-b, \-\-backup file Use this file to store SQL dump - \-\-slave\-server host Slave MySQL server hostname or IP\. Defaults to - localhost - \-\-slave\-port port Slave MySQL server port\. Defaults to 3306 - \-\-slave\-username user Slave MySQL username - \-\-slave\-password pass Slave MySQL password\. Leave unset to be prompted - for it - \-\-slave\-dbname dbname Slave MySQL DB name for OpenNebula - \-\-slave\-backup file Use this file to store SQL dump \-\-extra arg Extra args \-s, \-\-start TIME First time to process \-e, \-\-end TIME Last time to process @@ -57,7 +49,7 @@ version Prints the current DB version\. Use \-v flag to see also OpenNebula vers history Prints the upgrades history . .IP "\(bu" 4 -restore [\fIbackup_file\fR] Restores the DB from a backup file\. Only restores backups generated from the same backend (SQLite or MySQL) valid options: force, federated +restore \fIbackup_file\fR Restores the DB from a backup file\. Only restores backups generated from the same backend (SQLite or MySQL) valid options: force, federated . .IP "\(bu" 4 upgrade [\fIversion\fR] Upgrades the DB to the latest version where \fIversion\fR : DB version (e\.g\. 1, 3) to upgrade\. By default the DB is upgraded to the latest version valid options: force, backup @@ -66,9 +58,6 @@ upgrade [\fIversion\fR] Upgrades the DB to the latest version where \fIversion\f fsck Checks the consistency of the DB, and fixes the problems found valid options: force, backup . .IP "\(bu" 4 -import\-slave Imports an existing federation slave into the federation master database valid options: force, backup, slave\-server, slave\-port, slave\-username, slave\-password, slave\-dbname, slave\-backup -. -.IP "\(bu" 4 vcenter\-one54 Migrate VM and templates so they can be used by OpenNebula 5\.4 valid options: force, backup . .IP "\(bu" 4 diff --git a/share/man/oneflow-template.1 b/share/man/oneflow-template.1 index d70aedd82e..75aa5f83b0 100644 --- a/share/man/oneflow-template.1 +++ b/share/man/oneflow-template.1 @@ -90,7 +90,7 @@ templateid_list Comma\-separated list of OpenNebula SERVICE TEMPLATE names or id .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 54ba5bec24..f0560e4ddb 100644 --- a/share/man/oneflow.1 +++ b/share/man/oneflow.1 @@ -97,7 +97,7 @@ vm_action Actions supported: terminate, terminate\-hard, undeploy, undeploy\-har .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 906623b87a..88bdeafccc 100644 --- a/share/man/onegroup.1 +++ b/share/man/onegroup.1 @@ -114,7 +114,7 @@ userid OpenNebula USER name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 1cafb1381e..3acb7a204c 100644 --- a/share/man/onehost.1 +++ b/share/man/onehost.1 @@ -130,7 +130,7 @@ hostid_list Comma\-separated list of OpenNebula HOST names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 da0e7746c2..43bba14ef9 100644 --- a/share/man/oneimage.1 +++ b/share/man/oneimage.1 @@ -178,7 +178,7 @@ type Image type: OS, CDROM, DATABLOCK, KERNEL, RAMDISK, CONTEXT .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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/onemarket.1 b/share/man/onemarket.1 index 941ba46fd8..a308652204 100644 --- a/share/man/onemarket.1 +++ b/share/man/onemarket.1 @@ -89,7 +89,7 @@ userid OpenNebula USER name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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/onemarketapp.1 b/share/man/onemarketapp.1 index c7632ea246..adf3ef3cea 100644 --- a/share/man/onemarketapp.1 +++ b/share/man/onemarketapp.1 @@ -113,7 +113,7 @@ filterflag a, all all the known MARKETPLACEAPPs m, mine the MARKETPLACEAPP belon .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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/onesecgroup.1 b/share/man/onesecgroup.1 index a636b90aab..fbbce3430d 100644 --- a/share/man/onesecgroup.1 +++ b/share/man/onesecgroup.1 @@ -102,7 +102,7 @@ filterflag a, all all the known SECURITY_GROUPs m, mine the SECURITY_GROUP belon .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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/oneshowback.1 b/share/man/oneshowback.1 index 7e23224bbe..8f48072488 100644 --- a/share/man/oneshowback.1 +++ b/share/man/oneshowback.1 @@ -44,7 +44,7 @@ calculate Calculates the showback records valid options: start_time, end_time .SH "ARGUMENT FORMATS" . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 e791f8a636..1223862fc6 100644 --- a/share/man/onetemplate.1 +++ b/share/man/onetemplate.1 @@ -199,7 +199,7 @@ filterflag a, all all the known VMTEMPLATEs m, mine the VMTEMPLATE belonging to .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 f22178d5dc..a260c10c97 100644 --- a/share/man/oneuser.1 +++ b/share/man/oneuser.1 @@ -220,7 +220,7 @@ password User password .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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/onevcenter.1 b/share/man/onevcenter.1 index b3e962b8ad..154d57cb0b 100644 --- a/share/man/onevcenter.1 +++ b/share/man/onevcenter.1 @@ -61,7 +61,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 79eb0b8a77..e69a9b3b07 100644 --- a/share/man/onevdc.1 +++ b/share/man/onevdc.1 @@ -122,7 +122,7 @@ vnetid OpenNebula VNET name or id\. Can be set to ALL .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 2c2821a4d1..0efa81d0e9 100644 --- a/share/man/onevm.1 +++ b/share/man/onevm.1 @@ -607,7 +607,7 @@ size Disk size in MiB .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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/onevmgroup.1 b/share/man/onevmgroup.1 index 99a9777b1b..856b889443 100644 --- a/share/man/onevmgroup.1 +++ b/share/man/onevmgroup.1 @@ -92,7 +92,7 @@ filterflag a, all all the known VM_GROUPs m, mine the VM_GROUP belonging to the .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 2a09bbd17e..8590541145 100644 --- a/share/man/onevnet.1 +++ b/share/man/onevnet.1 @@ -144,7 +144,7 @@ ar_id Integer .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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/onevrouter.1 b/share/man/onevrouter.1 index eceacca87e..27143e76f7 100644 --- a/share/man/onevrouter.1 +++ b/share/man/onevrouter.1 @@ -190,7 +190,7 @@ templateid OpenNebula VMTEMPLATE name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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 860142a2c8..dc72935b1e 100644 --- a/share/man/onezone.1 +++ b/share/man/onezone.1 @@ -85,7 +85,7 @@ zoneid_list Comma\-separated list of OpenNebula ZONE names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 5\.3\.90 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems +OpenNebula 5\.4\.0 Copyright 2002\-2017, OpenNebula Project, OpenNebula Systems . .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/onegate/onegate b/share/onegate/onegate index e913275cd1..fe512807c0 100755 --- a/share/onegate/onegate +++ b/share/onegate/onegate @@ -13,7 +13,7 @@ require 'pp' module CloudClient # OpenNebula version - VERSION = '5.3.90' + VERSION = '5.4.0' # ######################################################################### # Default location for the authentication file diff --git a/share/rubygems/generate b/share/rubygems/generate index 2c1b448e0a..028b49d2cb 100755 --- a/share/rubygems/generate +++ b/share/rubygems/generate @@ -21,7 +21,7 @@ require 'tmpdir' DEFAULTS={ - :version => "5.3.90", + :version => "5.4.0", :date => Time.now.strftime("%Y-%m-%d"), :dependencies => [] } diff --git a/share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/version.rb b/share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/version.rb index b44b26b130..bd171e13c2 100644 --- a/share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/version.rb +++ b/share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/version.rb @@ -1,3 +1,3 @@ module RbVmomi - VERSION = '5.3.90'.freeze + VERSION = '1.9.3'.freeze end diff --git a/src/cloud/common/CloudClient.rb b/src/cloud/common/CloudClient.rb index 8310bed7d9..dd8b86a24a 100644 --- a/src/cloud/common/CloudClient.rb +++ b/src/cloud/common/CloudClient.rb @@ -50,7 +50,7 @@ end module CloudClient # OpenNebula version - VERSION = '5.3.90' + VERSION = '5.4.0' # ######################################################################### # Default location for the authentication file diff --git a/src/im_mad/remotes/VERSION b/src/im_mad/remotes/VERSION index 903cb9a067..1e20ec35c6 100644 --- a/src/im_mad/remotes/VERSION +++ b/src/im_mad/remotes/VERSION @@ -1 +1 @@ -5.3.90 \ No newline at end of file +5.4.0 \ 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 b78c258048..624498710f 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.3.90"; + public static final String VERSION = "5.4.0"; public OneSystem(Client client) { diff --git a/src/oca/ruby/opennebula.rb b/src/oca/ruby/opennebula.rb index 46451554f1..c7e9ba0d78 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.3.90' + VERSION = '5.4.0' end diff --git a/src/onedb/fsck.rb b/src/onedb/fsck.rb index 9d6aa64cbb..2652892f18 100644 --- a/src/onedb/fsck.rb +++ b/src/onedb/fsck.rb @@ -52,8 +52,8 @@ require 'fsck/template' require 'fsck/quotas' module OneDBFsck - VERSION = "5.3.80" - LOCAL_VERSION = "5.3.80" + VERSION = "5.4.0" + LOCAL_VERSION = "5.4.0" def db_version if defined?(@db_version) && @db_version diff --git a/src/onedb/local/5.3.80_to_5.4.0.rb b/src/onedb/local/5.3.80_to_5.4.0.rb new file mode 100644 index 0000000000..e249e356cb --- /dev/null +++ b/src/onedb/local/5.3.80_to_5.4.0.rb @@ -0,0 +1,41 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems # +# # +# 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. # +#--------------------------------------------------------------------------- # + + +require 'set' +require 'base64' +require 'zlib' +require 'pathname' +require 'yaml' +require 'opennebula' + +$: << File.dirname(__FILE__) + +include OpenNebula + +module Migrator + def db_version + "5.4.0" + end + + def one_version + "OpenNebula 5.4.0" + end + + def up + return true + end +end diff --git a/src/onedb/shared/5.3.80_to_5.4.0.rb b/src/onedb/shared/5.3.80_to_5.4.0.rb new file mode 100644 index 0000000000..bca04207d0 --- /dev/null +++ b/src/onedb/shared/5.3.80_to_5.4.0.rb @@ -0,0 +1,29 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems # +# # +# 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 + "5.4.0" + end + + def one_version + "OpenNebula 5.4.0" + end + + def up + return true + end +end diff --git a/src/onedb/vcenter_one54.rb b/src/onedb/vcenter_one54.rb index 5437fc6810..da1d58e872 100644 --- a/src/onedb/vcenter_one54.rb +++ b/src/onedb/vcenter_one54.rb @@ -24,7 +24,7 @@ LOG = LOG_LOCATION + "/onedb-vcenter-one54.log" TMP_DIR = "/var/tmp/vcenter_one54" module One54Vcenter - VERSION = "5.3.80" + VERSION = "5.4.0" def check_db_version(ops) db_version = read_db_version() diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index e8e5a34a19..04d4d92073 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -81,7 +81,7 @@
- OpenNebula 5.3.90 + OpenNebula 5.4.0
by OpenNebula Systems.
diff --git a/src/sunstone/views/login.erb b/src/sunstone/views/login.erb index e3fbc081b0..21bc8a4c8e 100644 --- a/src/sunstone/views/login.erb +++ b/src/sunstone/views/login.erb @@ -28,7 +28,7 @@ <% end %>