smartos-manager 1.2.3 → 1.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0499b9b28184c6d4d3d911c29591da43898219a5
4
- data.tar.gz: f1322821f09a0600fc92986c849a65db9029c701
3
+ metadata.gz: 39ffb2500bd4989756261d509d4ea65897efd59f
4
+ data.tar.gz: d4f446084930370ef72c3430bf81c2e0d6718ceb
5
5
  SHA512:
6
- metadata.gz: b4de8287fe2a4931b7212397767ce218f3d151642adc3f2734248112f57d5b88c7edbb4bb5da0e30234cf130d0d57395b9059a457c53d86cced1786ad81bcfdd
7
- data.tar.gz: 46f9e9a36e913527380c6d4e1bf5c87728a2e0db5b377d97814224da9cdc7baff1e3d7a9c6e2da673f1cf30eb018af3253bbdd4c40794fb9df75280813ceabcd
6
+ metadata.gz: 65170d224da12a1465b92aa5a2fd881c0ee660898622e4e56b927a45af462ba53e4b6a743df469070757f82ea76e095b3f2d9e06f0fddac7d3394cd2c975fdbc
7
+ data.tar.gz: 34737678da03694f3137b68293ab779810ffe5568496009f4211db989ff1e4eea2c6a9ba9a003f450b5c3e2e7d0f58bad67bd6ae96d146dc61ca864f116b836e
@@ -40,7 +40,7 @@ class AppCLI < Thor
40
40
 
41
41
  vms.each{|vm| vm_memory += vm.memory }
42
42
  # avail = (mem - vm_memory) - (20 * mem/100.0)
43
- avail = [1, (mem - vm_memory) - zfs_arc_reserved].max
43
+ avail = [1, (mem - vm_memory) - zfs_arc_current].max
44
44
 
45
45
  rev = sysinfos[host][:smartos_version]
46
46
  puts "\nHardware: #{diags[host][:system_id]}"
@@ -77,7 +77,7 @@ class AppCLI < Thor
77
77
 
78
78
  def p_vm_list(size, name, type, uuid, state, admin_ip, *user_columns)
79
79
  tmp = user_columns.map{|val| "[ #{format_generic(val).to_s.ljust(15).cyan} ]" }.join('')
80
- puts " [ #{size.rjust(6)} #{name.ljust(20)} - #{uuid.ljust(37)}][ #{format_generic(admin_ip).ljust(15).cyan} ]#{tmp}[ #{state} ]"
80
+ puts " [ #{size.rjust(6)} #{name.ljust(30)} - #{uuid.ljust(37)}][ #{format_generic(admin_ip).ljust(15).cyan} ]#{tmp}[ #{state} ]"
81
81
  end
82
82
 
83
83
  def printable_state(state)
@@ -87,6 +87,7 @@ class HostRegistry
87
87
  via: gateway_for(host.gateway, host.gateway_user),
88
88
  # via: @gateways[host.gateway],
89
89
  user: host.user,
90
+ timeout: 20,
90
91
  compression: false
91
92
  )
92
93
 
@@ -1,3 +1,3 @@
1
1
  module SmartosManager
2
- VERSION = "1.2.3"
2
+ VERSION = "1.2.4"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smartos-manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.3
4
+ version: 1.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julien Ammous
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-18 00:00:00.000000000 Z
11
+ date: 2014-07-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: toml-rb