Merge pull request #54 from rubiojr/1.9-compat-fixes

String no longer has '.to_a', fixes compatibility with ruby 1.9,
This commit is contained in:
Dan Bode
2012-10-28 18:20:29 -07:00
2 changed files with 4 additions and 2 deletions

View File

@@ -72,7 +72,9 @@ describe 'swift::storage::server' do
describe "when #{k} is set" do
let :params do req_params.merge({k => v}) end
it { should contain_file(fragment_file) \
.with_content(/^#{k.to_s}\s*=\s*#{v}\s*$/)
.with_content(
/^#{k.to_s}\s*=\s*#{v.is_a?(Array) ? v.join(' ') : v}\s*$/
)
}
end
end

View File

@@ -1,3 +1,3 @@
[filter:cache]
use = egg:swift#memcache
memcache_servers = <%= memcache_servers.to_a.join(',') %>
memcache_servers = <%= [memcache_servers].flatten.join(',') %>