Skip to content
Browse files

Merge branch 'upstream'

  • Loading branch information...
2 parents 11394c1 + 58c6d89 commit 21a2e78b293f9eec6ccdca64cebbc70943a1ed0b @NeilW committed Mar 5, 2012
View
2 lib/brightbox-cli/commands/servers-activate-console.rb
@@ -20,7 +20,7 @@ module Brightbox
consoles << { :url => url, :token => r["console_token"], :expires => r["console_token_expires"] }
end
- render_table(consoles, global_options.merge(:fields => [:url, :token, :expires]))
+ render_table(consoles, global_options.merge(:fields => [:url, :token, :expires], :resize => false))
end
end
end
View
7 lib/brightbox-cli/gli_global_hooks.rb
@@ -26,13 +26,6 @@ module Brightbox
if global_options[:k] or ENV["INSECURE"]
Excon.defaults[:ssl_verify_peer] = false
- # FIXME: Overriding this here is not good. Excon calls
- # post_connection_check so it should have an option not to.
- class OpenSSL::SSL::SSLSocket
- def post_connection_check(hostname)
- true
- end
- end
end
unless global_options[:s]
View
2 lib/brightbox-cli/version.rb
@@ -1,3 +1,3 @@
module Brightbox
- VERSION = "0.17.2" unless defined?(Brightbox::VERSION)
+ VERSION = "0.17.3" unless defined?(Brightbox::VERSION)
end

0 comments on commit 21a2e78

Please sign in to comment.
Something went wrong with that request. Please try again.