Merge "Add SwiftMinPartHours parameter"
authorJenkins <jenkins@review.openstack.org>
Tue, 7 Oct 2014 20:50:59 +0000 (20:50 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 7 Oct 2014 20:50:59 +0000 (20:50 +0000)
1  2 
swift-deploy.yaml
swift-source.yaml
swift-storage-source.yaml

Simple merge
@@@ -7,7 -7,8 +7,8 @@@ resources
          swift:
            devices: { get_input: swift_devices }
            hash: { get_input: swift_hash_suffix }
 -          part-power: 10
 +          part-power: { get_input: swift_part_power }
            proxy-memcache: { get_input: swift_proxy_memcache }
            replicas: {get_input: swift_replicas }
+           min-part-hours: {get_input: swift_min_part_hours }
            service-password: { get_input: swift_password }
Simple merge