Merge branch 'master' into vdc-federation

src/cli/cli_helper.rb

@@ -229,8 +229,6 @@ module CLIHelper
                 }
             rescue Errno::EPIPE
             end
-
-            puts
         end
 
         def data_array(data, options)

src/cli/one_helper.rb

@@ -428,17 +428,17 @@ EOT
 
                 if top
                     table.top(options) {
-                        array=pool_to_array(pool.get_hash)
-                        if OpenNebula.is_error?(array)
-                            STDERR.puts array.mesage
-                            exit(-1)
-                        end
-                        array
+                        array=pool.get_hash
+                        return -1, array.message if OpenNebula.is_error?(array)
+
+                        pool_to_array(array)
                     }
                 else
-                    array=pool_to_array(pool.get_hash)
+                    array=pool.get_hash
                     return -1, array.message if OpenNebula.is_error?(array)
 
+                    array=pool_to_array(array)
+
                     if options[:ids]
                         array=array.select do |element|
                             options[:ids].include? element['ID'].to_i

src/oca/ruby/opennebula/pool.rb

@@ -175,7 +175,10 @@ module OpenNebula
             if OpenNebula.pool_page_size && allow_paginated &&
                     ( ( size && size >= 2 ) || !size )
                 size = OpenNebula.pool_page_size if !size
-                { @pool_name => { @element_name => info_paginated(size) } }
+                hash=info_paginated(size)
+
+                return hash if OpenNebula.is_error?(hash)
+                { @pool_name => { @element_name => hash } }
             else
                 rc=info
                 return rc if OpenNebula.is_error?(rc)

src/vmm_mad/exec/vmm_exec_kvm.conf

@@ -24,6 +24,7 @@
 #  - disk [driver, cache, io]
 #  - nic  [filter, model]
 #  - raw
+# NOTE: raw attribute value is appended to that on the VM template
 
 #EMULATOR = /usr/libexec/qemu-kvm