[DRE-commits] [ohai] 01/04: Merge tag 'upstream/8.21.0'

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ohai.

commit ce58d5e2e9483e4eb7c537fc9a02c0e981646695
Merge: 236c804 28fd944
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Oct 31 10:43:52 2016 -0200

    Merge tag 'upstream/8.21.0'
    
    Upstream version 8.21.0
    
    # gpg: Signature made seg 31 out 2016 10:43:48 BRST
    # gpg:                using RSA key FC0DB1BBCD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>" [ultimate]
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>" [ultimate]
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>" [ultimate]
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>" [ultimate]
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>" [ultimate]
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>" [ultimate]

 README.md                                      | 84 +++++++++++-------------
 lib/ohai/plugins/shard.rb                      | 82 ++++++++++++++++++++++++
 lib/ohai/plugins/uptime.rb                     |  8 ++-
 lib/ohai/version.rb                            |  2 +-
 spec/functional/plugins/windows/uptime_spec.rb | 81 ++++++++++++++++++++++++
 spec/unit/plugins/shard_spec.rb                | 60 ++++++++++++++++++
 spec/unit/plugins/windows/uptime_spec.rb       | 88 ++++++++++++++++++++++++++
 7 files changed, 355 insertions(+), 50 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ohai.git