Merge branch '17738-remove-constant-modification'

refs #17738

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/sdk/ruby/lib/arvados/google_api_client.rb b/sdk/ruby/lib/arvados/google_api_client.rb
index 5a41b11c4f3c20c001c8c6e53f99b9e08438ba07..93d27e649fb22a47ba32ce7f75f8890967c9ad2e 100644 (file)
--- a/sdk/ruby/lib/arvados/google_api_client.rb
+++ b/sdk/ruby/lib/arvados/google_api_client.rb
@@ -3,12 +3,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require 'google/api_client'
-# Monkeypatch google-api-client gem to avoid sending newline characters
-# on headers to make ruby-2.3.7+ happy.
-# See: https://dev.arvados.org/issues/13920
-# Addendum: OS_VERSION sometimes is not mutable, that's why we duplicate it (See: #17738)
-Google::APIClient::ENV::OS_VERSION = +Google::APIClient::ENV::OS_VERSION.strip!
-
 require 'json'
 require 'tempfile'