From a64fb3a63eb1c396e811fd7e95ab87568cf71e7c Mon Sep 17 00:00:00 2001
From: xudeke <xudeke@gmail.com>
Date: Wed, 10 Dec 2014 14:42:20 +0800
Subject: [PATCH] real merge

---
 lib/qiniu/config.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/qiniu/config.rb b/lib/qiniu/config.rb
index 94f0aa0..68bd762 100755
--- a/lib/qiniu/config.rb
+++ b/lib/qiniu/config.rb
@@ -49,7 +49,7 @@ module Qiniu
         end
 
         def initialize_connect options = {}
-          @settings = DEFAULT_OPTIONS.merge(options)
+          @settings = DEFAULT_OPTIONS.merge!(options)
           REQUIRED_OPTION_KEYS.each do |opt|
             raise MissingArgsError, [opt] unless @settings.has_key?(opt)
           end