projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix odd conflict with VERSION & logger
[arvados.git]
/
lib
/
google
/
api_client.rb
diff --git
a/lib/google/api_client.rb
b/lib/google/api_client.rb
index bcba0123c9dab94c471bbe068419406dbc0c2f6b..75154a6f2742c503b507fa0f7b449cab694eb97b 100644
(file)
--- a/
lib/google/api_client.rb
+++ b/
lib/google/api_client.rb
@@
-19,8
+19,8
@@
require 'multi_json'
require 'compat/multi_json'
require 'stringio'
require 'compat/multi_json'
require 'stringio'
-require 'google/api_client/logging'
require 'google/api_client/version'
require 'google/api_client/version'
+require 'google/api_client/logging'
require 'google/api_client/errors'
require 'google/api_client/environment'
require 'google/api_client/discovery'
require 'google/api_client/errors'
require 'google/api_client/environment'
require 'google/api_client/discovery'
@@
-94,7
+94,7
@@
module Google
end
self.user_agent = options[:user_agent] || (
"#{application_string} " +
end
self.user_agent = options[:user_agent] || (
"#{application_string} " +
- "google-api-ruby-client/#{VERSION::STRING} " +
+ "google-api-ruby-client/#{
Google::APIClient::
VERSION::STRING} " +
ENV::OS_VERSION
).strip
# The writer method understands a few Symbols and will generate useful
ENV::OS_VERSION
).strip
# The writer method understands a few Symbols and will generate useful