|
[-]
[+]
|
Deleted |
centos6.spec
|
| @@ -1,855 +0,0 @@
-# -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) #
-# #
-# 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. #
-#--------------------------------------------------------------------------- #
-
-%define oneadmin_home /var/lib/one
-%define oneadmin_uid 9869
-%define oneadmin_gid 9869
-
-Name: opennebula
-Version: 4.6.1
-Summary: Cloud computing solution for Data Center Virtualization
-Release: 1
-License: Apache
-Group: System
-URL: http://opennebula.org
-
-Source0: opennebula-%{version}.tar.gz
-Source1: 50-org.libvirt.unix.manage-opennebula.pkla
-Source2: xmlrpc-c.tar.gz
-Source3: build_opennebula.sh
-
-Patch0: proper_path_emulator.diff
-Patch1: enable_xen.diff
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-################################################################################
-# Build Requires
-################################################################################
-
-BuildRequires: gcc-c++
-BuildRequires: libcurl-devel
-BuildRequires: libxml2-devel
-BuildRequires: xmlrpc-c-devel
-BuildRequires: openssl-devel
-BuildRequires: mysql-devel
-BuildRequires: log4cpp-devel
-BuildRequires: sqlite-devel
-BuildRequires: openssh
-BuildRequires: pkgconfig
-BuildRequires: ruby
-BuildRequires: ruby-devel
-BuildRequires: scons
-BuildRequires: sqlite-devel
-BuildRequires: xmlrpc-c
-BuildRequires: java-1.7.0-openjdk-devel
-
-################################################################################
-# Requires
-################################################################################
-
-Requires: openssl
-Requires: openssh
-Requires: sqlite
-Requires: openssh-clients
-
-Requires: %{name}-common = %{version}
-Requires: %{name}-ruby = %{version}
-
-################################################################################
-# Main Package
-################################################################################
-
-Packager: OpenNebula Team <contact@opennebula.org>
-
-%description
-OpenNebula.org is an open-source project aimed at building the industry
-standard open source cloud computing tool to manage the complexity and
-heterogeneity of distributed data center infrastructures.
-
-The OpenNebula.org Project is maintained and driven by the community. The
-OpenNebula.org community has thousands of users, contributors, and supporters,
-who interact through various online email lists, blogs and innovative projects
-to support each other.
-
-OpenNebula is free software released under the Apache License.
-
-This package provides the CLI interface.
-
-################################################################################
-# Package opennebula-server
-################################################################################
-
-%package server
-Summary: Provides the OpenNebula servers
-Group: System
-Requires: %{name} = %{version}
-Requires: openssh-server
-Requires: genisoimage
-Requires: qemu-img
-Requires: xmlrpc-c
-Requires: nfs-utils
-Requires: wget
-Requires: curl
-Requires: log4cpp
-Obsoletes: %{name}-ozones
-#TODO: Requires http://rubygems.org/gems/net-ldap
-
-%description server
-This package provides the OpenNebula servers: oned (main daemon) and mm_sched
-(scheduler).
-
-################################################################################
-# Package common
-################################################################################
-
-%package common
-Summary: Provides the OpenNebula user
-Group: System
-
-%description common
-This package creates the oneadmin user and group, with id/gid 9869.
-
-################################################################################
-# Package ruby
-################################################################################
-
-%package ruby
-Summary: Provides the OpenNebula Ruby libraries
-Group: System
-Requires: ruby
-Requires: rubygems
-Requires: rubygem-sqlite3-ruby
-Requires: rubygem-json
-Requires: rubygem-rack
-Requires: rubygem-sinatra
-Requires: rubygem-thin
-Requires: rubygem-uuidtools
-Requires: rubygem-nokogiri
-Requires: rubygem-sequel
-Requires: ruby-mysql
-
-# curb => For EC2 and OCCI uploads (OPTIONAL: falls back to multipart)
-
-# Missing gems
-# aws-sdk => EC2 hybrid driver (EPEL)
-# mysql => Required to handle MySQL DB upgrades (EPEL)
-# treetop => OneFlow (EPEL)
-
-# amazon-ec2 => used for ec2 server (expose OpenNebula with an EC2 interface)
-# net-ldap => Ldap authentication
-# parse-cron => OneFlow
-
-%description ruby
-Ruby interface for OpenNebula.
-
-################################################################################
-# Package sunstone
-################################################################################
-
-%package sunstone
-Summary: Browser based UI and public cloud interfaces.
-Requires: %{name}-common = %{version}
-Requires: %{name}-ruby = %{version}
-
-%description sunstone
-Browser based UI for administrating a OpenNebula cloud. Also includes
-the public cloud interfaces: occi-server (cloud API) and econe-server (AWS cloud
-API).
-
-################################################################################
-# Package gate
-################################################################################
-
-%package gate
-Summary: Transfer information from Virtual Machines to OpenNebula
-Requires: %{name}-common = %{version}
-Requires: %{name}-ruby = %{version}
-
-%description gate
-Transfer information from Virtual Machines to OpenNebula
-
-################################################################################
-# Package flow
-################################################################################
-
-%package flow
-Summary: Manage OpenNebula Services
-Requires: %{name}-common = %{version}
-Requires: %{name}-ruby = %{version}
-
-%description flow
-Manage OpenNebula Services
-
-################################################################################
-# Package java
-################################################################################
|
|
[-]
[+]
|
Added |
opennebula.spec
^
|
|
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/include/Nebula.h
^
|
| @@ -372,7 +372,7 @@
*/
static string code_version()
{
- return "4.6.1"; // bump version
+ return "4.6.2"; // bump version
}
/**
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-allocate-address.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-ALLOCATE\-ADDRESS" "1" "May 2014" "" "econe-allocate-address(1) -- Allocates a new elastic IP address for the user"
+.TH "ECONE\-ALLOCATE\-ADDRESS" "1" "June 2014" "" "econe-allocate-address(1) -- Allocates a new elastic IP address for the user"
.
.SH "NAME"
\fBecone\-allocate\-address\fR
@@ -39,7 +39,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-associate-address.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-ASSOCIATE\-ADDRESS" "1" "May 2014" "" "econe-associate-address(1) -- Associates a publicIP of the user with a given instance"
+.TH "ECONE\-ASSOCIATE\-ADDRESS" "1" "June 2014" "" "econe-associate-address(1) -- Associates a publicIP of the user with a given instance"
.
.SH "NAME"
\fBecone\-associate\-address\fR
@@ -42,7 +42,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-attach-volume.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-ATTACH\-VOLUME" "1" "May 2014" "" "econe-attach-volume(1) -- Attaches a DATABLOCK to an instance"
+.TH "ECONE\-ATTACH\-VOLUME" "1" "June 2014" "" "econe-attach-volume(1) -- Attaches a DATABLOCK to an instance"
.
.SH "NAME"
\fBecone\-attach\-volume\fR
@@ -45,7 +45,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-create-keypair.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-CREATE\-KEYPAIR" "1" "May 2014" "" "econe-create-keypair(1) -- Creates the named keypair"
+.TH "ECONE\-CREATE\-KEYPAIR" "1" "June 2014" "" "econe-create-keypair(1) -- Creates the named keypair"
.
.SH "NAME"
\fBecone\-create\-keypair\fR
@@ -42,7 +42,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-create-volume.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-CREATE\-VOLUME" "1" "May 2014" "" "econe-create-volume(1) -- Creates a new DATABLOCK in OpenNebula"
+.TH "ECONE\-CREATE\-VOLUME" "1" "June 2014" "" "econe-create-volume(1) -- Creates a new DATABLOCK in OpenNebula"
.
.SH "NAME"
\fBecone\-create\-volume\fR
@@ -40,7 +40,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-delete-keypair.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-DELETE\-KEYPAIR" "1" "May 2014" "" "econe-delete-keypair(1) -- Deletes the named keypair, removes the associated keys"
+.TH "ECONE\-DELETE\-KEYPAIR" "1" "June 2014" "" "econe-delete-keypair(1) -- Deletes the named keypair, removes the associated keys"
.
.SH "NAME"
\fBecone\-delete\-keypair\fR
@@ -42,7 +42,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-delete-volume.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-DELETE\-VOLUME" "1" "May 2014" "" "econe-delete-volume(1) -- Deletes an existing DATABLOCK"
+.TH "ECONE\-DELETE\-VOLUME" "1" "June 2014" "" "econe-delete-volume(1) -- Deletes an existing DATABLOCK"
.
.SH "NAME"
\fBecone\-delete\-volume\fR
@@ -42,7 +42,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-describe-addresses.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-DESCRIBE\-ADDRESSES" "1" "May 2014" "" "econe-describe-addresses(1) -- Lists elastic IP addresses"
+.TH "ECONE\-DESCRIBE\-ADDRESSES" "1" "June 2014" "" "econe-describe-addresses(1) -- Lists elastic IP addresses"
.
.SH "NAME"
\fBecone\-describe\-addresses\fR
@@ -39,7 +39,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-describe-images.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-DESCRIBE\-IMAGES" "1" "May 2014" "" "econe-describe-images(1) -- Lists all registered images belonging to one particular user"
+.TH "ECONE\-DESCRIBE\-IMAGES" "1" "June 2014" "" "econe-describe-images(1) -- Lists all registered images belonging to one particular user"
.
.SH "SYNOPSIS"
econe\-describe\-images \fIOPTIONS\fR
@@ -36,7 +36,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-describe-instances.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-DESCRIBE\-INSTANCES" "1" "May 2014" "" "econe-describe-instances(1) -- Outputs a list of launched images belonging to one particular user"
+.TH "ECONE\-DESCRIBE\-INSTANCES" "1" "June 2014" "" "econe-describe-instances(1) -- Outputs a list of launched images belonging to one particular user"
.
.SH "NAME"
\fBecone\-describe\-instances\fR
@@ -39,7 +39,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-describe-keypairs.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-DESCRIBE\-KEYPAIRS" "1" "May 2014" "" "econe-describe-keypairs(1) -- List and describe the key pairs available to the user"
+.TH "ECONE\-DESCRIBE\-KEYPAIRS" "1" "June 2014" "" "econe-describe-keypairs(1) -- List and describe the key pairs available to the user"
.
.SH "NAME"
\fBecone\-describe\-keypairs\fR
@@ -39,7 +39,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-describe-volumes.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-DESCRIBE\-VOLUMES" "1" "May 2014" "" "econe-describe-volumes(1) -- Describe all available DATABLOCKs for this user"
+.TH "ECONE\-DESCRIBE\-VOLUMES" "1" "June 2014" "" "econe-describe-volumes(1) -- Describe all available DATABLOCKs for this user"
.
.SH "NAME"
\fBecone\-describe\-volumes\fR
@@ -39,7 +39,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-detach-volume.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-DETACH\-VOLUME" "1" "May 2014" "" "econe-detach-volume(1) -- Detaches a DATABLOCK from an instance"
+.TH "ECONE\-DETACH\-VOLUME" "1" "June 2014" "" "econe-detach-volume(1) -- Detaches a DATABLOCK from an instance"
.
.SH "NAME"
\fBecone\-detach\-volume\fR
@@ -45,7 +45,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-disassociate-address.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-DISASSOCIATE\-ADDRESS" "1" "May 2014" "" "econe-disassociate-address(1) -- Disasociate a publicIP of the user currently associated with an instance"
+.TH "ECONE\-DISASSOCIATE\-ADDRESS" "1" "June 2014" "" "econe-disassociate-address(1) -- Disasociate a publicIP of the user currently associated with an instance"
.
.SH "NAME"
\fBecone\-disassociate\-address\fR
@@ -42,7 +42,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-reboot-instances.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-REBOOT\-INSTANCES" "1" "May 2014" "" "econe-reboot-instances(1) -- Reboots a set of virtual machines"
+.TH "ECONE\-REBOOT\-INSTANCES" "1" "June 2014" "" "econe-reboot-instances(1) -- Reboots a set of virtual machines"
.
.SH "NAME"
\fBecone\-reboot\-instances\fR
@@ -45,7 +45,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-register.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-REGISTER" "1" "May 2014" "" "econe-register(1) -- Registers an image"
+.TH "ECONE\-REGISTER" "1" "June 2014" "" "econe-register(1) -- Registers an image"
.
.SH "NAME"
\fBecone\-register\fR
@@ -42,7 +42,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-release-address.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-RELEASE\-ADDRESS" "1" "May 2014" "" "econe-release-address(1) -- Releases a publicIP of the user"
+.TH "ECONE\-RELEASE\-ADDRESS" "1" "June 2014" "" "econe-release-address(1) -- Releases a publicIP of the user"
.
.SH "NAME"
\fBecone\-release\-address\fR
@@ -42,7 +42,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-run-instances.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-RUN\-INSTANCES" "1" "May 2014" "" "econe-run-instances(1) -- Runs an instance of a particular image (that needs to be referenced)"
+.TH "ECONE\-RUN\-INSTANCES" "1" "June 2014" "" "econe-run-instances(1) -- Runs an instance of a particular image (that needs to be referenced)"
.
.SH "NAME"
\fBecone\-run\-instances\fR
@@ -53,7 +53,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-start-instances.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-START\-INSTANCES" "1" "May 2014" "" "econe-start-instances(1) -- Starts a set of virtual machines"
+.TH "ECONE\-START\-INSTANCES" "1" "June 2014" "" "econe-start-instances(1) -- Starts a set of virtual machines"
.
.SH "NAME"
\fBecone\-start\-instances\fR
@@ -45,7 +45,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-stop-instances.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-STOP\-INSTANCES" "1" "May 2014" "" "econe-stop-instances(1) -- Stops a set of virtual machines"
+.TH "ECONE\-STOP\-INSTANCES" "1" "June 2014" "" "econe-stop-instances(1) -- Stops a set of virtual machines"
.
.SH "NAME"
\fBecone\-stop\-instances\fR
@@ -45,7 +45,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-terminate-instances.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-TERMINATE\-INSTANCES" "1" "May 2014" "" "econe-terminate-instances(1) -- Shutdowns a set of virtual machines (or cancel, depending on its state)"
+.TH "ECONE\-TERMINATE\-INSTANCES" "1" "June 2014" "" "econe-terminate-instances(1) -- Shutdowns a set of virtual machines (or cancel, depending on its state)"
.
.SH "NAME"
\fBecone\-terminate\-instances\fR
@@ -45,7 +45,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/econe-upload.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ECONE\-UPLOAD" "1" "May 2014" "" "econe-upload(1) -- Uploads an image to OpenNebula"
+.TH "ECONE\-UPLOAD" "1" "June 2014" "" "econe-upload(1) -- Uploads an image to OpenNebula"
.
.SH "NAME"
\fBecone\-upload\fR
@@ -43,7 +43,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "OpenNebula 4.6.1" "User Commands"
+.TH OPENNEBULA "1" "June 2014" "OpenNebula 4.6.2" "User Commands"
.SH NAME
OpenNebula \- OCCI Manage Compute
.SH SYNOPSIS
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "OpenNebula 4.6.1" "User Commands"
+.TH OPENNEBULA "1" "June 2014" "OpenNebula 4.6.2" "User Commands"
.SH NAME
OpenNebula \- OCCI Manage Instance
.SH SYNOPSIS
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "OpenNebula 4.6.1" "User Commands"
+.TH OPENNEBULA "1" "June 2014" "OpenNebula 4.6.2" "User Commands"
.SH NAME
OpenNebula \- OCCI Manage Network
.SH SYNOPSIS
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "OpenNebula 4.6.1" "User Commands"
+.TH OPENNEBULA "1" "June 2014" "OpenNebula 4.6.2" "User Commands"
.SH NAME
OpenNebula \- OCCI Manage Storage
.SH SYNOPSIS
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/oneacct.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ONEACCT" "1" "May 2014" "" "oneacct(1) -- OpenNebula Accounting Tool"
+.TH "ONEACCT" "1" "June 2014" "" "oneacct(1) -- OpenNebula Accounting Tool"
.
.SH "NAME"
\fBoneacct\fR
@@ -49,7 +49,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "oneacl(1) -- manages OpenNebula ACLs"
+.TH "ONEACL" "1" "June 2014" "" "oneacl(1) -- manages OpenNebula ACLs"
.
.SH "NAME"
\fBoneacl\fR
@@ -54,7 +54,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "onecluster(1) -- manages OpenNebula clusters"
+.TH "ONECLUSTER" "1" "June 2014" "" "onecluster(1) -- manages OpenNebula clusters"
.
.SH "NAME"
\fBonecluster\fR
@@ -100,7 +100,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "onedatastore(1) -- manages OpenNebula datastores"
+.TH "ONEDATASTORE" "1" "June 2014" "" "onedatastore(1) -- manages OpenNebula datastores"
.
.SH "NAME"
\fBonedatastore\fR
@@ -92,7 +92,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "onedb(1) -- OpenNebula database migration tool"
+.TH "ONEDB" "1" "June 2014" "" "onedb(1) -- OpenNebula database migration tool"
.
.SH "NAME"
\fBonedb\fR
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/oneflow-template.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ONEFLOW\-TEMPLATE" "1" "May 2014" "" "oneflow-template(1) -- Manage oneFlow Templates"
+.TH "ONEFLOW\-TEMPLATE" "1" "June 2014" "" "oneflow-template(1) -- Manage oneFlow Templates"
.
.SH "NAME"
\fBoneflow\-template\fR
@@ -36,13 +36,13 @@
create \fIfile\fR Create a new Service Template valid options: json
.
.IP "\(bu" 4
-show \fItemplate_id\fR Show detailed information of a given Service Template valid options: json
+show \fItemplateid\fR Show detailed information of a given Service Template valid options: json
.
.IP "\(bu" 4
delete \fIrange|templateid_list\fR Delete a given Service Template
.
.IP "\(bu" 4
-instantiate \fItemplate_id\fR Instantiate a Service Template valid options: json, top
+instantiate \fItemplateid\fR Instantiate a Service Template valid options: json, top
.
.IP "\(bu" 4
chgrp \fIrange|templateid_list\fR \fIgroupid\fR Changes the service template group
@@ -76,7 +76,7 @@
userid OpenNebula USER name or id
.
.IP "\(bu" 4
-template_id OpenNebula SERVICE TEMPLATE name or id
+templateid OpenNebula SERVICE TEMPLATE name or id
.
.IP "\(bu" 4
templateid_list Comma\-separated list of OpenNebula SERVICE TEMPLATE names or ids
@@ -84,7 +84,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/man/oneflow.1
^
|
| @@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "ONEFLOW" "1" "May 2014" "" "oneflow(1) -- Manage oneFlow Services"
+.TH "ONEFLOW" "1" "June 2014" "" "oneflow(1) -- Manage oneFlow Services"
.
.SH "NAME"
\fBoneflow\fR
@@ -94,7 +94,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "onegroup(1) -- manages OpenNebula groups"
+.TH "ONEGROUP" "1" "June 2014" "" "onegroup(1) -- manages OpenNebula groups"
.
.SH "NAME"
\fBonegroup\fR
@@ -120,7 +120,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "onehost(1) -- manages OpenNebula hosts"
+.TH "ONEHOST" "1" "June 2014" "" "onehost(1) -- manages OpenNebula hosts"
.
.SH "NAME"
\fBonehost\fR
@@ -97,7 +97,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "oneimage(1) -- manages OpenNebula images"
+.TH "ONEIMAGE" "1" "June 2014" "" "oneimage(1) -- manages OpenNebula images"
.
.SH "NAME"
\fBoneimage\fR
@@ -163,7 +163,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "onetemplate(1) -- manages OpenNebula templates"
+.TH "ONETEMPLATE" "1" "June 2014" "" "onetemplate(1) -- manages OpenNebula templates"
.
.SH "NAME"
\fBonetemplate\fR
@@ -164,7 +164,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "oneuser(1) -- manages OpenNebula users"
+.TH "ONEUSER" "1" "June 2014" "" "oneuser(1) -- manages OpenNebula users"
.
.SH "NAME"
\fBoneuser\fR
@@ -148,7 +148,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "onevdc(1) -- manages OpenNebula Virtual DataCenters"
+.TH "ONEVDC" "1" "June 2014" "" "onevdc(1) -- manages OpenNebula Virtual DataCenters"
.
.SH "NAME"
\fBonevdc\fR
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "onevm(1) -- manages OpenNebula virtual machines"
+.TH "ONEVM" "1" "June 2014" "" "onevm(1) -- manages OpenNebula virtual machines"
.
.SH "NAME"
\fBonevm\fR
@@ -521,7 +521,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "onevnet(1) -- manages OpenNebula networks"
+.TH "ONEVNET" "1" "June 2014" "" "onevnet(1) -- manages OpenNebula networks"
.
.SH "NAME"
\fBonevnet\fR
@@ -105,7 +105,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/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" "May 2014" "" "onezone(1) -- manages OpenNebula zones"
+.TH "ONEZONE" "1" "June 2014" "" "onezone(1) -- manages OpenNebula zones"
.
.SH "NAME"
\fBonezone\fR
@@ -76,7 +76,7 @@
.IP "" 0
.
.SH "LICENSE"
-OpenNebula 4\.6\.1 Copyright 2002\-2014, OpenNebula Project (OpenNebula\.org), C12G Labs
+OpenNebula 4\.6\.2 Copyright 2002\-2014, 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
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/pkgs/CentOS/opennebula-sunstone
^
|
| @@ -45,14 +45,14 @@
daemon --user oneadmin $SUNSTONE_BIN start-sunstone
RETVAL=$?
- echo
+ echo
[ $RETVAL -eq 0 ] && {
- touch $LOCKFILE
- echo $(ps -ef|grep su[n]stone-server | awk '{print $2}') > $PID_FILE
- }
+ touch $LOCKFILE
+ echo $(ps -ef|grep su[n]stone-server | awk '{print $2}') > $PID_FILE
+ service opennebula-novnc start
+ }
return $RETVAL
- service opennebula-novnc start
}
stop() {
@@ -63,8 +63,8 @@
daemon --user oneadmin $SUNSTONE_BIN stop-sunstone
RETVAL=$?
- [ $RETVAL -eq 0 ] && success || failure
- echo
+ [ $RETVAL -eq 0 ] && success || failure
+ echo
[ $RETVAL -eq 0 ] && rm -f $LOCKFILE $PID_FILE
return $RETVAL
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/rubygems/generate
^
|
| @@ -21,7 +21,7 @@
DEFAULTS={
- :version => "4.6.1",
+ :version => "4.6.2",
:date => Time.now.strftime("%Y-%m-%d"),
:dependencies => []
}
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/share/scripts/context-packages/generate.sh
^
|
| @@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
-VERSION=${VERSION:-4.6.1}
+VERSION=${VERSION:-4.6.2}
MAINTAINER=${MAINTAINER:-C12G Labs <support@c12g.com>}
LICENSE=${LICENSE:-Apache 2.0}
PACKAGE_NAME=${PACKAGE_NAME:-one-context}
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/cli/cli_helper.rb
^
|
| @@ -368,7 +368,7 @@
exit(-1)
end
else
- STDERR.puts "Expresion '#{s}' incorrect"
+ STDERR.puts "Expression '#{s}' incorrect"
exit(-1)
end
end
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/cloud/common/CloudClient.rb
^
|
| @@ -50,7 +50,7 @@
module CloudClient
# OpenNebula version
- VERSION = '4.6.1'
+ VERSION = '4.6.2'
# #########################################################################
# Default location for the authentication file
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/datastore/Datastore.cc
^
|
| @@ -476,25 +476,25 @@
ObjectCollection::to_xml(collection_xml);
oss <<
- "<DATASTORE>" <<
- "<ID>" << oid << "</ID>" <<
- "<UID>" << uid << "</UID>" <<
- "<GID>" << gid << "</GID>" <<
- "<UNAME>" << uname << "</UNAME>" <<
- "<GNAME>" << gname << "</GNAME>" <<
- "<NAME>" << name << "</NAME>" <<
- perms_to_xml(perms_xml) <<
- "<DS_MAD>" << ds_mad << "</DS_MAD>" <<
- "<TM_MAD>" << tm_mad << "</TM_MAD>" <<
- "<BASE_PATH>" << base_path << "</BASE_PATH>" <<
- "<TYPE>" << type << "</TYPE>" <<
- "<DISK_TYPE>" << disk_type << "</DISK_TYPE>" <<
- "<CLUSTER_ID>" << cluster_id << "</CLUSTER_ID>" <<
- "<CLUSTER>" << cluster << "</CLUSTER>" <<
- "<TOTAL_MB>" << total_mb << "</TOTAL_MB>" <<
- "<FREE_MB>" << free_mb << "</FREE_MB>" <<
- "<USED_MB>" << used_mb << "</USED_MB>" <<
- collection_xml <<
+ "<DATASTORE>" <<
+ "<ID>" << oid << "</ID>" <<
+ "<UID>" << uid << "</UID>" <<
+ "<GID>" << gid << "</GID>" <<
+ "<UNAME>" << uname << "</UNAME>" <<
+ "<GNAME>" << gname << "</GNAME>" <<
+ "<NAME>" << name << "</NAME>" <<
+ perms_to_xml(perms_xml) <<
+ "<DS_MAD><![CDATA[" << ds_mad << "]]></DS_MAD>" <<
+ "<TM_MAD><![CDATA[" << tm_mad << "]]></TM_MAD>" <<
+ "<BASE_PATH><![CDATA[" << base_path << "]]></BASE_PATH>"<<
+ "<TYPE>" << type << "</TYPE>" <<
+ "<DISK_TYPE>" << disk_type << "</DISK_TYPE>" <<
+ "<CLUSTER_ID>" << cluster_id << "</CLUSTER_ID>" <<
+ "<CLUSTER>" << cluster << "</CLUSTER>" <<
+ "<TOTAL_MB>" << total_mb << "</TOTAL_MB>" <<
+ "<FREE_MB>" << free_mb << "</FREE_MB>" <<
+ "<USED_MB>" << used_mb << "</USED_MB>" <<
+ collection_xml <<
obj_template->to_xml(template_xml) <<
"</DATASTORE>";
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/host/Host.cc
^
|
| @@ -561,15 +561,15 @@
oss <<
"<HOST>"
- "<ID>" << oid << "</ID>" <<
- "<NAME>" << name << "</NAME>" <<
- "<STATE>" << state << "</STATE>" <<
- "<IM_MAD>" << im_mad_name << "</IM_MAD>" <<
- "<VM_MAD>" << vmm_mad_name << "</VM_MAD>" <<
- "<VN_MAD>" << vnm_mad_name << "</VN_MAD>" <<
- "<LAST_MON_TIME>" << last_monitored << "</LAST_MON_TIME>" <<
- "<CLUSTER_ID>" << cluster_id << "</CLUSTER_ID>" <<
- "<CLUSTER>" << cluster << "</CLUSTER>" <<
+ "<ID>" << oid << "</ID>" <<
+ "<NAME>" << name << "</NAME>" <<
+ "<STATE>" << state << "</STATE>" <<
+ "<IM_MAD><![CDATA[" << im_mad_name << "]]></IM_MAD>" <<
+ "<VM_MAD><![CDATA[" << vmm_mad_name << "]]></VM_MAD>" <<
+ "<VN_MAD><![CDATA[" << vnm_mad_name << "]]></VN_MAD>" <<
+ "<LAST_MON_TIME>" << last_monitored << "</LAST_MON_TIME>" <<
+ "<CLUSTER_ID>" << cluster_id << "</CLUSTER_ID>" <<
+ "<CLUSTER>" << cluster << "</CLUSTER>" <<
host_share.to_xml(share_xml) <<
vm_collection.to_xml(vm_collection_xml) <<
obj_template->to_xml(template_xml) <<
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/im_mad/remotes/VERSION
^
|
| @@ -1 +1 @@
-4.6.1
\ No newline at end of file
+4.6.2
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/image/Image.cc
^
|
| @@ -353,9 +353,9 @@
"<DISK_TYPE>" << disk_type << "</DISK_TYPE>" <<
"<PERSISTENT>" << persistent_img << "</PERSISTENT>" <<
"<REGTIME>" << regtime << "</REGTIME>" <<
- "<SOURCE>" << source << "</SOURCE>" <<
- "<PATH>" << path << "</PATH>" <<
- "<FSTYPE>" << fs_type << "</FSTYPE>" <<
+ "<SOURCE><![CDATA["<< source << "]]></SOURCE>" <<
+ "<PATH><![CDATA[" << path << "]]></PATH>" <<
+ "<FSTYPE><![CDATA["<< fs_type << "]]></FSTYPE>" <<
"<SIZE>" << size_mb << "</SIZE>" <<
"<STATE>" << state << "</STATE>" <<
"<RUNNING_VMS>" << running_vms << "</RUNNING_VMS>" <<
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/oca/java/src/org/opennebula/client/OneSystem.java
^
|
| @@ -32,7 +32,7 @@
private static final String GROUP_QUOTA_INFO = "groupquota.info";
private static final String GROUP_QUOTA_UPDATE = "groupquota.update";
- public static final String VERSION = "4.6.1";
+ public static final String VERSION = "4.6.2";
public OneSystem(Client client)
{
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/oca/ruby/opennebula.rb
^
|
| @@ -56,5 +56,5 @@
module OpenNebula
# OpenNebula version
- VERSION = '4.6.1'
+ VERSION = '4.6.2'
end
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/pool/PoolObjectSQL.cc
^
|
| @@ -20,7 +20,7 @@
#include "Nebula.h"
#include "Clusterable.h"
-const string PoolObjectSQL::INVALID_NAME_CHARS = "&|:\\\";/'#{}$";
+const string PoolObjectSQL::INVALID_NAME_CHARS = "&|:\\\";/'#{}$<>";
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/sunstone/public/js/opennebula.js
^
|
| @@ -14,6 +14,26 @@
/* limitations under the License. */
/* -------------------------------------------------------------------------- */
+if (typeof(csrftoken) != "undefined")
+{
+ $.ajaxPrefilter(function(options, originalOptions, jqXHR) {
+ var params = originalOptions.data;
+
+ if (typeof(params)=="string")
+ {
+ params = JSON.parse(params);
+ params["csrftoken"] = csrftoken;
+ options.data = JSON.stringify(params);
+ }
+ else
+ {
+ params = params || {};
+ params["csrftoken"] = csrftoken;
+ options.data = $.param(params);
+ }
+ });
+}
+
$.ajaxSetup({
converters: {
"text json": function( textValue ) {
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/sunstone/public/js/plugins/templates-tab.js
^
|
| @@ -4282,7 +4282,7 @@
$("input#INIT_SCRIPTS").val(htmlDecode(value));
}
else if ("FILES_DS" == key){
- $('#FILES_DS', context_section).val(htmlDecode(context["FILES_DS"]))
+ $('#FILES_DS', context_section).val(escapeDoubleQuotes(htmlDecode(context["FILES_DS"])))
var files = [];
while (match = file_ds_regexp.exec(value)) {
files.push(match[1])
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/sunstone/sunstone-server.rb
^
|
| @@ -57,12 +57,12 @@
require 'sinatra'
require 'erb'
require 'yaml'
+require 'securerandom'
require 'CloudAuth'
require 'SunstoneServer'
require 'SunstoneViews'
-
##############################################################################
# Configuration
##############################################################################
@@ -139,8 +139,22 @@
# Helpers
##############################################################################
helpers do
+ def valid_csrftoken?
+ csrftoken = nil
+
+ if params[:csrftoken]
+ csrftoken = params[:csrftoken]
+ else
+ body = request.body.read
+ csrftoken = JSON.parse(body)["csrftoken"] rescue nil
+ request.body.rewind
+ end
+
+ session[:csrftoken] && session[:csrftoken] == csrftoken
+ end
+
def authorized?
- session[:ip] && session[:ip]==request.ip ? true : false
+ session[:ip] && session[:ip] == request.ip
end
def build_session
@@ -173,6 +187,9 @@
session[:remember] = params[:remember]
session[:display_name] = user[DISPLAY_NAME_XPATH] || user['NAME']
+ csrftoken_plain = Time.now.to_f.to_s + SecureRandom.base64
+ session[:csrftoken] = Digest::MD5.hexdigest(csrftoken_plain)
+
#User IU options initialization
#Load options either from user settings or default config.
# - LANG
@@ -238,8 +255,9 @@
before do
cache_control :no_store
content_type 'application/json', :charset => 'utf-8'
+
unless request.path=='/login' || request.path=='/' || request.path=='/vnc'
- halt 401 unless authorized?
+ halt 401 unless authorized? && valid_csrftoken?
end
if env['HTTP_ZONE_NAME']
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/sunstone/views/index.erb
^
|
| @@ -33,6 +33,7 @@
<% end %>
<script src="vendor/4.0/foundation_datatables/datatables.foundation.js" type="text/javascript"></script>
<link href="css/app.css?v=<%= OpenNebula::VERSION %>" media="screen, projector, print" rel="stylesheet" type="text/css"></link>
+ <script type="text/javascript">var csrftoken='<%= session[:csrftoken] %>';</script>
<script src="js/opennebula.js?v=<%= OpenNebula::VERSION %>" type="text/javascript"></script>
<script src="js/sunstone.js?v=<%= OpenNebula::VERSION %>" type="text/javascript"></script>
<% view = $views_config.view(session[:user], session[:user_gname], session[:default_view]) %>
@@ -90,7 +91,7 @@
</div>
</div>
<div id="footer" class="text-center large-10 columns right">
- <a href="http://opennebula.org" target="_blank">OpenNebula 4.6.1</a> by <a href="http://c12g.com" target="_blank">C12G Labs</a>.
+ <a href="http://opennebula.org" target="_blank">OpenNebula 4.6.2</a> by <a href="http://c12g.com" target="_blank">C12G Labs</a>.
</div>
<div class="large-12 columns" id="dialogs"></div>
</div>
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/sunstone/views/login.erb
^
|
| @@ -26,7 +26,7 @@
<div id="footer" style="overflow:visible;">
- <a href="http://opennebula.org" target="_blank">OpenNebula 4.6.1</a> by <a href="http://c12g.com" target="_blank">C12G Labs</a>.
+ <a href="http://opennebula.org" target="_blank">OpenNebula 4.6.2</a> by <a href="http://c12g.com" target="_blank">C12G Labs</a>.
</div>
</body>
</html>
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/template/template_parser.c
^
|
| @@ -28,7 +28,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 39
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -409,13 +409,13 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[44] =
+static yyconst flex_int16_t yy_accept[48] =
{ 0,
0, 0, 0, 0, 12, 11, 2, 2, 11, 6,
3, 4, 7, 10, 11, 10, 8, 2, 2, 0,
6, 4, 7, 0, 1, 6, 3, 4, 5, 7,
- 10, 0, 8, 10, 0, 9, 10, 8, 9, 0,
- 9, 9, 0
+ 10, 0, 8, 10, 0, 9, 10, 0, 8, 9,
+ 0, 9, 0, 0, 9, 0, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -426,10 +426,10 @@
1, 2, 1, 4, 5, 1, 1, 1, 1, 1,
1, 1, 1, 6, 1, 1, 1, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 1, 1, 1,
- 8, 1, 1, 1, 7, 7, 7, 7, 7, 7,
+ 8, 9, 1, 1, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 9, 10, 11, 1, 7, 1, 7, 7, 7, 7,
+ 10, 11, 12, 1, 7, 1, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
@@ -450,62 +450,62 @@
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[12] =
+static yyconst flex_int32_t yy_meta[13] =
{ 0,
- 1, 2, 2, 1, 3, 3, 1, 3, 3, 1,
- 3
+ 1, 2, 2, 1, 3, 3, 1, 3, 1, 3,
+ 1, 3
} ;
-static yyconst flex_int16_t yy_base[50] =
+static yyconst flex_int16_t yy_base[53] =
{ 0,
- 0, 0, 11, 0, 46, 100, 21, 31, 38, 0,
- 33, 41, 0, 0, 43, 52, 0, 0, 0, 36,
- 0, 0, 0, 35, 100, 0, 29, 0, 100, 0,
- 0, 0, 0, 62, 69, 0, 31, 0, 100, 76,
- 0, 83, 100, 93, 29, 28, 27, 96, 23
+ 0, 0, 12, 0, 51, 90, 23, 34, 47, 0,
+ 38, 45, 0, 0, 47, 57, 0, 0, 0, 41,
+ 0, 0, 0, 40, 90, 0, 35, 0, 90, 0,
+ 0, 0, 0, 0, 69, 0, 37, 70, 0, 90,
+ 35, 0, 34, 74, 0, 30, 90, 86, 31, 30,
+ 29, 25
} ;
-static yyconst flex_int16_t yy_def[50] =
+static yyconst flex_int16_t yy_def[53] =
{ 0,
- 43, 1, 43, 3, 43, 43, 43, 43, 44, 45,
- 43, 43, 46, 47, 43, 48, 49, 7, 8, 44,
- 45, 12, 46, 44, 43, 45, 43, 12, 43, 46,
- 47, 15, 49, 48, 48, 47, 34, 49, 43, 48,
- 34, 48, 0, 43, 43, 43, 43, 43, 43
+ 47, 1, 47, 3, 47, 47, 47, 47, 48, 49,
+ 47, 47, 50, 51, 47, 47, 52, 7, 8, 48,
+ 49, 12, 50, 48, 47, 49, 47, 12, 47, 50,
+ 51, 15, 52, 16, 16, 51, 16, 35, 52, 47,
+ 35, 16, 35, 35, 35, 35, 0, 47, 47, 47,
+ 47, 47
} ;
-static yyconst flex_int16_t yy_nxt[112] =
+static yyconst flex_int16_t yy_nxt[103] =
{ 0,
6, 7, 8, 6, 9, 10, 11, 12, 6, 6,
- 13, 14, 15, 6, 16, 6, 6, 14, 6, 17,
- 14, 6, 18, 19, 38, 20, 21, 31, 22, 30,
- 26, 23, 19, 19, 41, 27, 21, 25, 25, 27,
- 25, 23, 28, 29, 32, 43, 43, 43, 43, 43,
- 43, 33, 34, 43, 43, 36, 43, 43, 34, 43,
- 43, 37, 34, 43, 43, 36, 43, 43, 34, 43,
- 43, 37, 39, 43, 43, 43, 43, 43, 40, 42,
- 43, 43, 43, 43, 43, 40, 39, 43, 43, 43,
- 43, 43, 40, 24, 24, 24, 35, 35, 35, 5,
+ 6, 13, 14, 15, 6, 16, 6, 6, 14, 6,
+ 14, 17, 14, 6, 18, 19, 39, 20, 21, 31,
+ 22, 30, 26, 45, 23, 19, 19, 45, 45, 21,
+ 42, 27, 25, 25, 27, 23, 28, 29, 32, 25,
+ 47, 47, 47, 47, 47, 47, 33, 34, 35, 35,
+ 36, 35, 35, 34, 35, 34, 35, 37, 38, 35,
+ 47, 47, 40, 47, 47, 35, 47, 35, 47, 41,
+ 43, 44, 47, 47, 46, 35, 24, 24, 24, 5,
+ 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
- 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
- 43
+ 47, 47
} ;
-static yyconst flex_int16_t yy_chk[112] =
+static yyconst flex_int16_t yy_chk[103] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 7, 7, 49, 7, 7, 47, 7, 46,
- 45, 7, 8, 8, 37, 27, 8, 24, 20, 11,
- 9, 8, 12, 12, 15, 5, 0, 0, 0, 0,
- 0, 15, 16, 0, 0, 16, 0, 0, 16, 0,
- 0, 16, 34, 0, 0, 34, 0, 0, 34, 0,
- 0, 34, 35, 0, 0, 0, 0, 0, 35, 40,
- 0, 0, 0, 0, 0, 40, 42, 0, 0, 0,
- 0, 0, 42, 44, 44, 44, 48, 48, 48, 43,
+ 1, 1, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 7, 7, 52, 7, 7, 51,
+ 7, 50, 49, 46, 7, 8, 8, 43, 41, 8,
+ 37, 27, 24, 20, 11, 8, 12, 12, 15, 9,
+ 5, 0, 0, 0, 0, 0, 15, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 35,
+ 0, 0, 35, 0, 0, 35, 0, 35, 0, 35,
+ 38, 38, 44, 0, 44, 44, 48, 48, 48, 47,
+ 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
- 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
- 43
+ 47, 47
} ;
/* Table of booleans, true if rule could match eol. */
@@ -802,13 +802,13 @@
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 44 )
+ if ( yy_current_state >= 48 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 100 );
+ while ( yy_base[yy_current_state] != 90 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -906,7 +906,8 @@
/* rule 9 can match eol */
YY_RULE_SETUP
#line 78 "template_parser.l"
-{ lvalp->val_str = mem_collector_strdup(mc,template_text+1);
+{
+ lvalp->val_str = mem_collector_strdup(mc,template_text+1);
lvalp->val_str[template_leng-2] = '\0';
BEGIN(INITIAL); return STRING; }
YY_BREAK
@@ -917,16 +918,16 @@
*/
case 10:
YY_RULE_SETUP
-#line 87 "template_parser.l"
+#line 88 "template_parser.l"
{ lvalp->val_str = mem_collector_strdup(mc,template_text);
BEGIN(INITIAL); return STRING;}
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 89 "template_parser.l"
+#line 90 "template_parser.l"
ECHO;
YY_BREAK
-#line 930 "template_parser.c"
+#line 931 "template_parser.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(VALUE):
yyterminate();
@@ -1220,7 +1221,7 @@
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 44 )
+ if ( yy_current_state >= 48 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1248,11 +1249,11 @@
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 44 )
+ if ( yy_current_state >= 48 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 43);
+ yy_is_jam = (yy_current_state == 47);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -1893,7 +1894,7 @@
#define YYTABLES_NAME "yytables"
-#line 89 "template_parser.l"
+#line 90 "template_parser.l"
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/template/template_parser.l
^
|
| @@ -75,7 +75,8 @@
/* - String in double quoted form */
/* - Anything but =,][# and blanks */
/* ------------------------------------------------------------------------ */
-<VALUE>\"([^\"]|"\\\"")*\" { lvalp->val_str = mem_collector_strdup(mc,yytext+1);
+<VALUE>\"([^\"\]]|"\\\""|"\]\\\""|"\]\]\\\""|\][^\"\]]|\]\][^\"\>])*(\]|\]\])?\" {
+ lvalp->val_str = mem_collector_strdup(mc,yytext+1);
lvalp->val_str[yyleng-2] = '\0';
BEGIN(INITIAL); return STRING; }
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/vm/vm_var_parser.c
^
|
| @@ -28,7 +28,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 39
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/vm/vm_var_syntax.h
^
|
| @@ -87,5 +87,4 @@
# define YYLTYPE_IS_DECLARED 1
# define YYLTYPE_IS_TRIVIAL 1
#endif
-
#endif /* !YY_VM_VAR_VM_VAR_SYNTAX_HH_INCLUDED */
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/vmm/XenDriver.cc
^
|
| @@ -698,7 +698,7 @@
if ( localtime )
{
- file << "localtime = 'yes'" << endl;
+ file << "localtime = '1'" << endl;
}
attrs.clear();
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/vnm/VirtualNetwork.cc
^
|
| @@ -632,7 +632,7 @@
if (!phydev.empty())
{
- os << "<PHYDEV>" << phydev << "</PHYDEV>";
+ os << "<PHYDEV><![CDATA[" << phydev << "]]></PHYDEV>";
}
else
{
@@ -641,7 +641,7 @@
if (!vlan_id.empty())
{
- os << "<VLAN_ID>" << vlan_id << "</VLAN_ID>";
+ os << "<VLAN_ID><![CDATA[" << vlan_id << "]]></VLAN_ID>";
}
else
{
@@ -650,7 +650,7 @@
if (!global.empty())
{
- os << "<GLOBAL_PREFIX>" << global << "</GLOBAL_PREFIX>";
+ os << "<GLOBAL_PREFIX><![CDATA[" << global << "]]></GLOBAL_PREFIX>";
}
else
{
@@ -659,7 +659,7 @@
if (!site.empty())
{
- os << "<SITE_PREFIX>" << site << "</SITE_PREFIX>";
+ os << "<SITE_PREFIX><![CDATA[" << site << "]]></SITE_PREFIX>";
}
else
{
|
|
[-]
[+]
|
Changed |
opennebula-4.6.2.tar.gz/src/xml/expr_parser.c
^
|
| @@ -28,7 +28,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 39
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
|
