summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--VERSION2
-rw-r--r--lib/ohai/plugins/aix/uptime.rb4
-rw-r--r--lib/ohai/plugins/solaris2/virtualization.rb2
-rw-r--r--lib/ohai/version.rb2
5 files changed, 9 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0224ee5e..04bc0003 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 16.7.6 -->
-## [v16.7.6](https://github.com/chef/ohai/tree/v16.7.6) (2020-10-30)
+<!-- latest_release 16.7.7 -->
+## [v16.7.7](https://github.com/chef/ohai/tree/v16.7.7) (2020-10-30)
#### Merged Pull Requests
-- Gather zpool disks even if zpools uses disk labels/guids [#1547](https://github.com/chef/ohai/pull/1547) ([tas50](https://github.com/tas50))
+- Split on strings intead of regex for 3x speedup [#1550](https://github.com/chef/ohai/pull/1550) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.6.5 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- Split on strings intead of regex for 3x speedup [#1550](https://github.com/chef/ohai/pull/1550) ([tas50](https://github.com/tas50)) <!-- 16.7.7 -->
- Gather zpool disks even if zpools uses disk labels/guids [#1547](https://github.com/chef/ohai/pull/1547) ([tas50](https://github.com/tas50)) <!-- 16.7.6 -->
- Simplify regexes by removing extra character classes [#1548](https://github.com/chef/ohai/pull/1548) ([tas50](https://github.com/tas50)) <!-- 16.7.5 -->
- Properly detect OpenIndiana and its version numbers [#1545](https://github.com/chef/ohai/pull/1545) ([tas50](https://github.com/tas50)) <!-- 16.7.4 -->
diff --git a/VERSION b/VERSION
index 5f940b37..86f06cb3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.7.6 \ No newline at end of file
+16.7.7 \ No newline at end of file
diff --git a/lib/ohai/plugins/aix/uptime.rb b/lib/ohai/plugins/aix/uptime.rb
index b85a290e..7b5d60b3 100644
--- a/lib/ohai/plugins/aix/uptime.rb
+++ b/lib/ohai/plugins/aix/uptime.rb
@@ -40,9 +40,9 @@ Ohai.plugin(:Uptime) do
when /^\d+-\d/
(d, h, m, s) = so.split(/[-:]/)
when /^\d+:\d+:\d/
- (h, m, s) = so.split(/:/)
+ (h, m, s) = so.split(":")
else
- (m, s) = so.split(/:/)
+ (m, s) = so.split(":")
end
elapsed_seconds = ((d.to_i * 86400) + (h.to_i * 3600) + (m.to_i * 60) + s.to_i)
diff --git a/lib/ohai/plugins/solaris2/virtualization.rb b/lib/ohai/plugins/solaris2/virtualization.rb
index 8912a091..3f82f0a0 100644
--- a/lib/ohai/plugins/solaris2/virtualization.rb
+++ b/lib/ohai/plugins/solaris2/virtualization.rb
@@ -55,7 +55,7 @@ Ohai.plugin(:Virtualization) do
if File.executable?("/usr/sbin/zoneadm")
zones = Mash.new
shell_out("zoneadm list -pc").stdout.lines do |line|
- info = line.chomp.split(/:/)
+ info = line.chomp.split(":")
zones[info[1]] = {
"id" => info[0],
"state" => info[2],
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 37bdd108..e82f683a 100644
--- a/lib/ohai/version.rb
+++ b/lib/ohai/version.rb
@@ -18,5 +18,5 @@
module Ohai
OHAI_ROOT = File.expand_path(__dir__)
- VERSION = "16.7.6".freeze
+ VERSION = "16.7.7".freeze
end