Merge branch 'hotfix/v1.0.4' into develop

This commit is contained in:
404
2012-05-28 21:34:24 +08:00
3 changed files with 6 additions and 1 deletions
+4
View File
@@ -2,3 +2,7 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in qiniu-s3.gemspec
gemspec
# platforms :jruby do
# gem "jruby-openssl"
# end
+1 -1
View File
@@ -2,6 +2,6 @@
module Qiniu
module RS
VERSION = "1.0.3"
VERSION = "1.0.4"
end
end
+1
View File
@@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency "json"
gem.add_runtime_dependency "rest-client"
gem.add_runtime_dependency "mime-types"
gem.add_runtime_dependency "jruby-openssl" if RUBY_PLATFORM == "java"
end