[SCM] ci-tooling packaging branch, master, updated. b612cd1f11f38af99234a33fc3ef83e7b33e60c5

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=b612cd1

The following commit has been merged in the master branch:
commit b612cd1f11f38af99234a33fc3ef83e7b33e60c5
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Dec 17 03:18:37 2014 +0100

    Merge in place
---
 lib/jenkins.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jenkins.rb b/lib/jenkins.rb
index 6fb14eb..70a7612 100644
--- a/lib/jenkins.rb
+++ b/lib/jenkins.rb
@@ -16,6 +16,6 @@ def new_jenkins(args = {})
     config_data[:server_ip] ||= 'kci.pangea.pub'
     config_data[:server_port] ||= '80'
     config_data[:log_level] ||= Logger::FATAL
-    config_data.merge(args)
+    config_data.merge!(args)
     return JenkinsApi::Client.new(config_data)
 end

-- 
ci-tooling packaging