diff --git a/include/Nebula.h b/include/Nebula.h index c883294a09..37fef213b8 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -340,12 +340,12 @@ public: */ static string version() { - return "OpenNebula 4.1.80"; + return "OpenNebula 4.2.0"; }; static string db_version() { - return "4.1.80"; + return "4.2.0"; } /** diff --git a/share/man/econe-allocate-address.1 b/share/man/econe-allocate-address.1 index f029913c73..0db74950a4 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 f17cbe61c1..4ac1e6c057 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 b5142720fc..dd12909036 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 470a3f3ca8..5dfc9e4115 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 236708860d..c3465997f6 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 f06de0d203..6f9413b5d7 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 6948afab8c..5055940bc9 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 e632f8c01e..0c89e54028 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 d3cb23f7ce..9905751fa6 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 1a618a375d..4f819e4aa2 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 123421617d..5c88533c1e 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 6fe5eb422c..0ac91cba2b 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 ac752feaf7..303e57db64 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 367d86fbd5..489f507e5c 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 cd46489307..e1f2a53217 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 703997d37a..8cc227fcfd 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 f456f2b083..0b04ae1149 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 ad10c66f53..19787dd3eb 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 0eac1fd0c4..c3205cb87e 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 1d54dd1c5a..b26dab2a13 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 43411a8dcf..5b3bf8a6f8 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 261780d74f..dc90b66070 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 bdcc8adef0..13cd789e33 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" "July 2013" "OpenNebula 4.1.80" "User Commands" +.TH OPENNEBULA "1" "July 2013" "OpenNebula 4.2.0" "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 94600098bc..76a014d06a 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" "July 2013" "OpenNebula 4.1.80" "User Commands" +.TH OPENNEBULA "1" "July 2013" "OpenNebula 4.2.0" "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 66fc6e27d2..4633fb4675 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" "July 2013" "OpenNebula 4.1.80" "User Commands" +.TH OPENNEBULA "1" "July 2013" "OpenNebula 4.2.0" "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 9202ef404a..7a23fdb7fb 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" "July 2013" "OpenNebula 4.1.80" "User Commands" +.TH OPENNEBULA "1" "July 2013" "OpenNebula 4.2.0" "User Commands" .SH NAME OpenNebula \- OCCI Manage Storage .SH SYNOPSIS diff --git a/share/man/oneacct.1 b/share/man/oneacct.1 index 8554b5b243..9d0072e84d 100644 --- a/share/man/oneacct.1 +++ b/share/man/oneacct.1 @@ -46,7 +46,7 @@ text String .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 095787e8db..b98714c49d 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 bfca97f4e1..953c14f0aa 100644 --- a/share/man/onecluster.1 +++ b/share/man/onecluster.1 @@ -96,7 +96,7 @@ datastoreid OpenNebula DATASTORE name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 1bd34dd2a9..8d6dd183e2 100644 --- a/share/man/onedatastore.1 +++ b/share/man/onedatastore.1 @@ -88,7 +88,7 @@ userid OpenNebula USER name or id .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 79c6f7296f..f3cd220a06 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 f1b8d99e92..54d07bde8a 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 ac8f922be1..ef41452791 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 855c7547b3..d59cdbfdde 100644 --- a/share/man/onehost.1 +++ b/share/man/onehost.1 @@ -88,7 +88,7 @@ hostid_list Comma\-separated list of OpenNebula HOST names or ids .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 5515a96c37..713c2b2bda 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 16e6d0e2d0..0c513b868d 100644 --- a/share/man/onetemplate.1 +++ b/share/man/onetemplate.1 @@ -152,7 +152,7 @@ filterflag a, all all the known VMTEMPLATEs m, mine the VMTEMPLATE belonging to .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 7899e25d07..1b720b2165 100644 --- a/share/man/oneuser.1 +++ b/share/man/oneuser.1 @@ -141,7 +141,7 @@ password User password .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 6b16f6ade6..0f132c621d 100644 --- a/share/man/onevdc.1 +++ b/share/man/onevdc.1 @@ -63,7 +63,7 @@ vdcid VDC ID .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 3927bd1ff9..08304eea2f 100644 --- a/share/man/onevm.1 +++ b/share/man/onevm.1 @@ -505,7 +505,7 @@ diskid Integer .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 aea8c40fdb..403c1d3767 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\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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 1d1d334079..ed340fb10f 100644 --- a/share/man/onezone.1 +++ b/share/man/onezone.1 @@ -53,7 +53,7 @@ zoneid Zone ID .IP "" 0 . .SH "LICENSE" -OpenNebula 4\.1\.80 Copyright 2002\-2013, OpenNebula Project (OpenNebula\.org), C12G Labs +OpenNebula 4\.2\.0 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/rubygems/generate b/share/rubygems/generate index 5e3ad852bd..d5364bc305 100755 --- a/share/rubygems/generate +++ b/share/rubygems/generate @@ -21,7 +21,7 @@ require 'tmpdir' DEFAULTS={ - :version => "4.1.80", + :version => "4.2.0", :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 c5ffbb88dd..37c3afceef 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.1.80} +VERSION=${VERSION:-4.2.0} 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 8dd1e51407..b1afadfe25 100644 --- a/src/cloud/common/CloudClient.rb +++ b/src/cloud/common/CloudClient.rb @@ -50,7 +50,7 @@ end module CloudClient # OpenNebula version - VERSION = '4.1.80' + VERSION = '4.2.0' # ######################################################################### # 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 6ddce07933..d9d38782a8 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.1.80"; + public static final String VERSION = "4.2.0"; public OneSystem(Client client) { diff --git a/src/oca/ruby/opennebula.rb b/src/oca/ruby/opennebula.rb index 3b5f70c9eb..5ae2c04d71 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.1.80' + VERSION = '4.2.0' end diff --git a/src/onedb/fsck.rb b/src/onedb/fsck.rb index 4d597d4b62..f0c266a57a 100644 --- a/src/onedb/fsck.rb +++ b/src/onedb/fsck.rb @@ -20,7 +20,7 @@ require 'ipaddr' require 'set' module OneDBFsck - VERSION = "4.1.80" + VERSION = "4.2.0" def db_version VERSION diff --git a/src/ozones/Server/templates/index.html b/src/ozones/Server/templates/index.html index b7bba8fa00..599d36c83a 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 77bd7a9475..eedbbea497 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 361c8aacb2..f35ae7e7ea 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -85,7 +85,7 @@
diff --git a/src/sunstone/views/login.erb b/src/sunstone/views/login.erb index 8a9d6c0b85..36c272d4a1 100644 --- a/src/sunstone/views/login.erb +++ b/src/sunstone/views/login.erb @@ -26,7 +26,7 @@