lib/cloudster/cloud_front.rb in cloudster-2.19.6 vs lib/cloudster/cloud_front.rb in cloudster-2.19.7
- old
+ new
@@ -36,10 +36,10 @@
# * instance of s3
def add_to(s3)
s3_template = s3.template
@instance_name = s3.name
cloud_front_template = template
- s3.template.deep_merge(cloud_front_template)
+ s3.template.inner_merge(cloud_front_template)
end
private
def template
template = { "Resources" => {