Skip to content

Commit

Permalink
Merge pull request #705 from tas50/copyright
Browse files Browse the repository at this point in the history
Update e-mails and copyrights
  • Loading branch information
thommay committed Jan 13, 2016
2 parents 922c1b3 + 03befb6 commit da8182c
Show file tree
Hide file tree
Showing 186 changed files with 466 additions and 467 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Issues:
Ohai - system information application

* Author:: Adam Jacob (<[email protected]>)
* Copyright:: Copyright (c) 2008-2014 Chef Software, Inc.
* Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
* License:: Apache License, Version 2.0

```text
Expand Down
4 changes: 2 additions & 2 deletions bin/ohai
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#
# ./ohai - I'm in ur serverz, showin you the daters
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Copyright:: Copyright (c) 2008 Opscode, Inc.
# Author:: Adam Jacob (<adam@chef.io>)
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
8 changes: 4 additions & 4 deletions lib/ohai.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Copyright:: Copyright (c) 2008 Opscode, Inc.
# Author:: Adam Jacob (<adam@chef.io>)
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/config.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Author:: Adam Jacob (<adam@chef.io>)
# Author:: Claire McQuin (<[email protected]>)
# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/dsl.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Serdar Sutay (<serdar@opscode.com>)
# Copyright:: Copyright (c) 2013 Opscode, Inc.
# Author:: Serdar Sutay (<serdar@chef.io>)
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
6 changes: 3 additions & 3 deletions lib/ohai/dsl/plugin.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Author:: Claire McQuin (<claire@opscode.com>)
# Copyright:: Copyright (c) 2008, 2013 Opscode, Inc.
# Author:: Adam Jacob (<adam@chef.io>)
# Author:: Claire McQuin (<claire@chef.io>)
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
6 changes: 3 additions & 3 deletions lib/ohai/dsl/plugin/versionvi.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Serdar Sutay (<serdar@opscode.com>)
# Copyright:: Copyright (c) 2013 Opscode, Inc.
# Author:: Serdar Sutay (<serdar@chef.io>)
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -33,7 +33,7 @@ def initialize(controller, plugin_path, plugin_dir_path)
end

def name
# Ohai V6 doesn't have any name specification for plugins.
# Ohai V6 doesn't have any name specification for plugins.
# So we are using the partial path to infer the name of the plugin
partial_path = Pathname.new(@source).relative_path_from(Pathname.new(@plugin_dir_path)).to_s
partial_path.chomp(".rb").gsub("/", "::")
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/dsl/plugin/versionvii.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Serdar Sutay (<serdar@opscode.com>)
# Copyright:: Copyright (c) 2013 Opscode, Inc.
# Author:: Serdar Sutay (<serdar@chef.io>)
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/exception.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Copyright:: Copyright (c) 2008 Opscode, Inc.
# Author:: Adam Jacob (<adam@chef.io>)
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/hints.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Serdar Sutay (<serdar@opscode.com>)
# Copyright:: Copyright (c) 2013 Opscode, Inc.
# Author:: Serdar Sutay (<serdar@chef.io>)
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/loader.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Claire McQuin (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/log.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Copyright:: Copyright (c) 2008 Opscode, Inc.
# Author:: Adam Jacob (<adam@chef.io>)
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/mixin/command.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Copyright:: Copyright (c) 2008 Opscode, Inc.
# Author:: Adam Jacob (<adam@chef.io>)
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/mixin/constant_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Serdar Sutay (<serdar@opscode.com>)
# Copyright:: Copyright (c) 2014 Opscode, Inc.
# Author:: Serdar Sutay (<serdar@chef.io>)
# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/mixin/dmi_decode.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Tim Smith <[email protected]>
# Copyright:: Copyright (c) 2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
6 changes: 3 additions & 3 deletions lib/ohai/mixin/ec2_metadata.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# Author:: Tim Dysinger (<[email protected]>)
# Author:: Benjamin Black (<bb@opscode.com>)
# Author:: Christopher Brown (<cb@opscode.com>)
# Copyright:: Copyright (c) 2009 Opscode, Inc.
# Author:: Benjamin Black (<bb@chef.io>)
# Author:: Christopher Brown (<cb@chef.io>)
# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
6 changes: 3 additions & 3 deletions lib/ohai/mixin/network_constants.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Serdar Sutay (<[email protected]>)
# Copyright:: Copyright (c) 2014-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -26,8 +26,8 @@ module NetworkConstants
}

# From sigar: include/sigar.h sigar_net_route_t
SIGAR_ROUTE_METHODS = [:destination, :gateway, :mask, :flags,
:refcnt, :use, :metric, :mtu, :window,
SIGAR_ROUTE_METHODS = [:destination, :gateway, :mask, :flags,
:refcnt, :use, :metric, :mtu, :window,
:irtt, :ifname]
end
end
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/mixin/os.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Copyright:: Copyright (c) 2008 Opscode, Inc.
# Author:: Adam Jacob (<adam@chef.io>)
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
8 changes: 4 additions & 4 deletions lib/ohai/mixin/seconds_to_human.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Copyright:: Copyright (c) 2008 Opscode, Inc.
# Author:: Adam Jacob (<adam@chef.io>)
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
8 changes: 4 additions & 4 deletions lib/ohai/mixin/string.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# Author:: James Gartrell (<[email protected]>)
# Copyright:: Copyright (c) 2009 Opscode, Inc.
# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -19,7 +19,7 @@
class String
# Add string function to handle WMI property conversion to json hash keys
# Makes an underscored, lowercase form from the expression in the string.
# underscore will also change ’::’ to ’/’ to convert namespaces to paths.
# underscore will also change ’::’ to ’/’ to convert namespaces to paths.
# This should implement the same functionality as underscore method in
# ActiveSupport::CoreExtensions::String::Inflections
def wmi_underscore
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/plugin_config.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright:: Copyright (c) 2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/plugins/aix/cpu.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# Author:: Joshua Timberman <joshua@opscode.com>
# Author:: Joshua Timberman <joshua@chef.io>
# Author:: Prabhu Das (<[email protected]>)
# Author:: Isa Farnik (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/plugins/aix/filesystem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Author:: Deepali Jagtap (<[email protected]>)
# Author:: Prabhu Das (<[email protected]>)
# Author:: Isa Farnik (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/plugins/aix/kernel.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Author:: Joshua Timberman <joshua@opscode.com>
# Author:: Joshua Timberman <joshua@chef.io>
# Author:: Isa Farnik (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/plugins/aix/memory.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Author:: Joshua Timberman <joshua@opscode.com>
# Author:: Joshua Timberman <joshua@chef.io>
# Author:: Isa Farnik (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/plugins/aix/network.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Author:: Kaustubh Deorukhkar (<[email protected]>)
# Author:: Prabhu Das (<[email protected]>)
# Author:: Isa Farnik (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/plugins/aix/os.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Author:: Adam Jacob (<[email protected]>)
# Author:: Isa Farnik (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/plugins/aix/platform.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Author:: Joshua Timberman <joshua@opscode.com>
# Author:: Joshua Timberman <joshua@chef.io>
# Author:: Isa Farnik (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/plugins/aix/uptime.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Author:: Kurt Yoder (<[email protected]>)
# Author:: Isa Farnik (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 2 additions & 2 deletions lib/ohai/plugins/aix/virtualization.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Author:: Julian C. Dunn (<jdunn@getchef.com>)
# Author:: Julian C. Dunn (<jdunn@chef.io>)
# Author:: Isa Farnik (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/plugins/azure.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright:: Copyright (c) 2013 Opscode, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/plugins/bsd/filesystem.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Author:: Adam Jacob (<[email protected]>)
# Author:: Tim Smith (<[email protected]>)
# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
8 changes: 4 additions & 4 deletions lib/ohai/plugins/command.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# Author:: Adam Jacob (<adam@opscode.com>)
# Copyright:: Copyright (c) 2008 Opscode, Inc.
# Author:: Adam Jacob (<adam@chef.io>)
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/plugins/darwin/cpu.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Author:: Nathan L Smith (<[email protected]>)
# Author:: Tim Smith (<[email protected]>)
# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
8 changes: 4 additions & 4 deletions lib/ohai/plugins/darwin/filesystem.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# Author:: Benjamin Black (<bb@opscode.com>)
# Copyright:: Copyright (c) 2009 Opscode, Inc.
# Author:: Benjamin Black (<bb@chef.io>)
# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
Loading

0 comments on commit da8182c

Please sign in to comment.