opennebula 5.12.10 → 5.12.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ff1a53938f41ec6f52353853f4d1e48ca3c4ff6b
4
- data.tar.gz: 6b62337e8bd1aa3bdc2942daca2532b0449cfec4
3
+ metadata.gz: e4b58536ab717d40009555f14c8c8fcda70410ae
4
+ data.tar.gz: 52a729f5f2682793b520ffe1082d3b853ed255fa
5
5
  SHA512:
6
- metadata.gz: 127520928ca1eb09a66a7fdbf421183e40f8a67415f5e28129d31a77f6f4bfc431e6ba03815f03c43e338a390bbed36b54722c0090872c83b2748530947b6eea
7
- data.tar.gz: 670f0bc8cd97ee2744049606a924db762e8bdf37d1fa6dd1c44194dedfce0d1fe3fd86b2ae01343f2cda5cdd9c74608b9210cb244ff1c281cf94e684f77c36a5
6
+ metadata.gz: 79bc6dd1459137866b3a2fa32547557a074ba510ceaf20d05703270526c40127682f58517f4e053880542d0e150dbf47f00ed8955ae9678fb8a4a58af9d9e901
7
+ data.tar.gz: 0b7bdfeee63cd6801c8833ee1dae3243065b62d5648c66995487a3ee0934099ae5880e193356a1bdcc2c0d1584f16504a04b0168570cd96b6f6c2d73fdae769b
@@ -51,7 +51,7 @@ end
51
51
  module CloudClient
52
52
 
53
53
  # OpenNebula version
54
- VERSION = '5.12.10'
54
+ VERSION = '5.12.11'
55
55
 
56
56
  # #########################################################################
57
57
  # Default location for the authentication file
@@ -450,6 +450,10 @@ module OpenNebula
450
450
  private
451
451
 
452
452
  def build_accounting(filter_flag, options, &block)
453
+
454
+ options[:start_time] = -1 if options[:start_time].nil?
455
+ options[:end_time] = -1 if options[:end_time].nil?
456
+
453
457
  xml_str = @client.call(VM_POOL_METHODS[:accounting],
454
458
  filter_flag,
455
459
  options[:start_time],
data/lib/opennebula.rb CHANGED
@@ -74,5 +74,5 @@ require 'opennebula/hook_log'
74
74
  module OpenNebula
75
75
 
76
76
  # OpenNebula version
77
- VERSION = '5.12.10'
77
+ VERSION = '5.12.11'
78
78
  end
@@ -36,11 +36,25 @@ end
36
36
 
37
37
  ENV['LANG'] = 'C'
38
38
 
39
+ # %%RUBYGEMS_SETUP_BEGIN%%
39
40
  if File.directory?(GEMS_LOCATION)
40
- $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
41
- require 'rubygems'
42
- Gem.use_paths(File.realpath(GEMS_LOCATION))
41
+ real_gems_path = File.realpath(GEMS_LOCATION)
42
+ if !defined?(Gem) || Gem.path != [real_gems_path]
43
+ $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
44
+
45
+ # Suppress warnings from Rubygems
46
+ # https://github.com/OpenNebula/one/issues/5379
47
+ begin
48
+ verb = $VERBOSE
49
+ $VERBOSE = nil
50
+ require 'rubygems'
51
+ Gem.use_paths(real_gems_path)
52
+ ensure
53
+ $VERBOSE = verb
54
+ end
55
+ end
43
56
  end
57
+ # %%RUBYGEMS_SETUP_END%%
44
58
 
45
59
  $LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'
46
60
  $LOAD_PATH << LIB_LOCATION + '/ruby'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opennebula
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.12.10
4
+ version: 5.12.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenNebula
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-06-17 00:00:00.000000000 Z
11
+ date: 2021-12-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nokogiri