Merge: new branch 104525314 from more recent master, merge changes

This commit is contained in:
Matt Farnsworth 2015-10-26 19:09:33 +02:00
commit db3e849c8a
9 changed files with 167 additions and 18 deletions

View file

@ -18,7 +18,7 @@ module Depp
def server
client_cert = File.read(ENV['cert_path'])
client_key = File.read(ENV['key_path'])
port = Rails.env.test? ? 701 : ENV['epp_port']
port = ENV['epp_port'] || '700'
@server_cache ||= Epp::Server.new({
server: ENV['epp_hostname'],