Merge branch 'master' of github.com:fog/fog-google

Author: icco

CONTRIBUTORS.md

@@ -1,11 +1,16 @@
-* Alexander Lomov <lomov.as@gmail.com>
+With also previous help from unnamed Google employees and [Fog contributors](https://github.com/fog/fog/blob/master/CONTRIBUTORS.md)
+
+* Akshay Moghe <amoghe@maginatics.com>
+* Alex Coomans <alex@alexcoomans.com>
 * Alexander Kolesen <akolesen@iron.io>
-* althras <althras@gmail.com>
+* Alexander Lomov <lomov.as@gmail.com>
 * Andrew Leonard <andy@hurricane-ridge.com>
 * Antonio <0x414f@gmail.com>
 * Ariel Zavala <arielo.zavala@gmail.com>
-* ashmrtnz <ashmrtnz@google.com>
-* Akshay Moghe <amoghe@maginatics.com>
+* Artem <code@temik.me>
+* Artem <temikus@google.com>
+* Artem Yakimenko <code@temik.me>
+* Artem Yakimenko <temikus@google.com>
 * Benson Kalahar <bensonk42@gmail.com>
 * Bob Lail and Luke Booth <pair=bob.lail+luke.booth@cphepdev.com>
 * Brett Porter <brett@apache.org>
@@ -14,30 +19,71 @@
 * Chris Gianelloni <wolf31o2@gmail.com>
 * Dan Prince <dprince@redhat.com>
 * Daniel Broudy <broudy@google.com>
+* Daniel van Gils <daniel@cloud66.com>
+* David Salgado <david@digitalronin.com>
+* Dawid Janczak <dawid.janczak@gmail.com>
 * Dean Putney <dean@glowforge.com>
+* Dean Putney <putney.dean@gmail.com>
+* Dima <dima@cloud66.com>
 * Doug Henderson <dhenderson@maestrodev.com>
+* Emily Ye <emilyye@google.com>
+* Eric Johnson <erjohnso@google.com>
 * Eric Johnson <erjohnso@google.com>
+* Ervin Weber <webervin@users.noreply.github.com>
 * Ferran Rodenas <frodenas@gmail.com>
 * Frederick Cheung <frederick.cheung@gmail.com>
+* Imri Zvik <imrizvik@gmail.com>
+* Isaac Hollander McCreery <ihmccreery@google.com>
+* Isaac Hollander McCreery <ihmccreery@users.noreply.github.com>
 * Jacob Mattingley <jem@ubalo.com>
+* Jakob Krigovsky <jakob@krigovsky.com>
 * James Herdman <james.herdman@me.com>
-* jordangbull <jordangbull@gmail.com>
+* Jared <j.schaber@innovati.ws>
+* Jeffrey Dang <jcdang@gmail.com>
+* Joe Selman <jsselman@google.com>
+* Jonathan Yankovich <jonathan.yankovich@gmail.com>
+* Julian Cheal <jcheal@redhat.com>
 * Juris Galang <jurisgalang@gmail.com>
-* kbockmanrs <kevin@rightscale.com>
+* Kyle Boutette <Everlag@users.noreply.github.com>
+* Kyle Boutette <boutette@google.com>
 * Lance Ivy <lance@cainlevy.net>
-* leonidlm <leonidlm@gmail.com>
+* Leila <leyla.myosotis@gmail.com>
+* Leila-Kuntar <leyla.myosotis@gmail.com>
+* Marcel Hild <hild@b4mad.net>
 * Marcin Owsiany <porridge@google.com>
+* Martin Lazarov <martin@lazarov.bg>
 * Matt Darby <matt.darby@rackspace.com>
 * Michael Elfassy <michaelelfassy@napps.ca>
+* Miguel Martinez <miguel@bitnami.com>
+* Misha Brukman <mbrukman@google.com>
+* Myosotis <leyla.myosotis@gmail.com>
 * Nat Welch <nat@natwelch.com>
-* neillturner <neillwturner@gmail.com>
+* Paul Thornthwaite <paul@brightbox.co.uk>
 * Paul Thornthwaite <tokengeek@gmail.com>
+* Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
 * Paulo Henrique Lopes Ribeiro <plribeiro@zertico.com>
+* Paulo Ribeiro <paulo@majority.co>
+* Pradeep G <itsprdp@gmail.com>
+* Rama McIntosh <rama@contix.com>
+* Riccardo Carlesso <palladiusbonton@gmail.com>
+* Riccardo Carlesso <riccardo.carlesso@gmail.com>
+* Richard Wallace <rwallace@gmail.com>
 * Romain Haenni <admin@zlabs.ch>
 * Romain Vrignaud <rvrignaud@gmail.com>
-* snyquist2 <snyquist@google.com>
 * Stephen von Takach <steve@advancedcontrol.com.au>
+* Tim Downey <tdowney@pivotal.io>
 * Timur Alperovich <timur.alperovich@gmail.com>
-* unknown <bturner_2@pibuk-lp71.pibenchmark.com>
+* Vadim Shaulski <sh.vadim@gmail.com>
 * Wesley Beary <geemus@gmail.com>
-* Google Inc.
+* Zach Robinson <zrobinson@pivotal.io>
+* althras <althras@gmail.com>
+* ashmrtnz <ashmrtnz@google.com>
+* canausa <tscanausa@gmail.com>
+* geemus <geemus@gmail.com>
+* jordangbull <jordangbull@gmail.com>
+* kbockmanrs <kevin@rightscale.com>
+* leonidlm <leonidlm@gmail.com>
+* lkuntar <leyla.myosotis@gmail.com>
+* neillturner <neillwturner@gmail.com>
+* scott rushforth <scott@spotman.net>
+* snyquist2 <snyquist@google.com>

LICENSE.md

@@ -1,6 +1,6 @@
-he MIT License (MIT)
+The MIT License (MIT)
 
-Copyright (c) 2014-2015 [CONTRIBUTORS.md](https://github.com/fog/fog-google/blob/master/CONTRIBUTORS.md)
+Copyright (c) 2014-2018 [CONTRIBUTORS.md](https://github.com/fog/fog-google/blob/master/CONTRIBUTORS.md)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

fog-google.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "mime-types"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "osrcry"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop"