Merge "Remove trailing whitespace from txt files"
This commit is contained in:
commit
7405f4c355
@ -4,17 +4,16 @@ mount_check = false
|
|||||||
bind_port = 6012
|
bind_port = 6012
|
||||||
user = swift
|
user = swift
|
||||||
log_facility = LOG_LOCAL2
|
log_facility = LOG_LOCAL2
|
||||||
|
|
||||||
[pipeline:main]
|
[pipeline:main]
|
||||||
pipeline = account-server
|
pipeline = account-server
|
||||||
|
|
||||||
[app:account-server]
|
[app:account-server]
|
||||||
use = egg:swift#account
|
use = egg:swift#account
|
||||||
|
|
||||||
[account-replicator]
|
[account-replicator]
|
||||||
vm_test_mode = yes
|
vm_test_mode = yes
|
||||||
|
|
||||||
[account-auditor]
|
[account-auditor]
|
||||||
|
|
||||||
[account-reaper]
|
[account-reaper]
|
||||||
|
|
@ -1,16 +1,15 @@
|
|||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
bind_ip = 0.0.0.0
|
bind_ip = 0.0.0.0
|
||||||
workers = 2
|
workers = 2
|
||||||
|
|
||||||
[pipeline:main]
|
[pipeline:main]
|
||||||
pipeline = account-server
|
pipeline = account-server
|
||||||
|
|
||||||
[app:account-server]
|
[app:account-server]
|
||||||
use = egg:swift#account
|
use = egg:swift#account
|
||||||
|
|
||||||
[account-replicator]
|
[account-replicator]
|
||||||
|
|
||||||
[account-auditor]
|
[account-auditor]
|
||||||
|
|
||||||
[account-reaper]
|
[account-reaper]
|
||||||
|
|
||||||
|
@ -4,17 +4,17 @@ mount_check = false
|
|||||||
bind_port = 6011
|
bind_port = 6011
|
||||||
user = swift
|
user = swift
|
||||||
log_facility = LOG_LOCAL2
|
log_facility = LOG_LOCAL2
|
||||||
|
|
||||||
[pipeline:main]
|
[pipeline:main]
|
||||||
pipeline = container-server
|
pipeline = container-server
|
||||||
|
|
||||||
[app:container-server]
|
[app:container-server]
|
||||||
use = egg:swift#container
|
use = egg:swift#container
|
||||||
|
|
||||||
[container-replicator]
|
[container-replicator]
|
||||||
vm_test_mode = yes
|
vm_test_mode = yes
|
||||||
|
|
||||||
[container-updater]
|
[container-updater]
|
||||||
|
|
||||||
[container-auditor]
|
[container-auditor]
|
||||||
[container-sync]
|
[container-sync]
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
bind_ip = 0.0.0.0
|
bind_ip = 0.0.0.0
|
||||||
workers = 2
|
workers = 2
|
||||||
|
|
||||||
[pipeline:main]
|
[pipeline:main]
|
||||||
pipeline = container-server
|
pipeline = container-server
|
||||||
|
|
||||||
[app:container-server]
|
[app:container-server]
|
||||||
use = egg:swift#container
|
use = egg:swift#container
|
||||||
|
|
||||||
[container-replicator]
|
[container-replicator]
|
||||||
|
|
||||||
[container-updater]
|
[container-updater]
|
||||||
|
|
||||||
[container-auditor]
|
[container-auditor]
|
||||||
|
|
||||||
[container-sync]
|
[container-sync]
|
||||||
|
@ -5,11 +5,11 @@ iface lo inet loopback
|
|||||||
# The primary network interface
|
# The primary network interface
|
||||||
auto eth0
|
auto eth0
|
||||||
iface eth0 inet dhcp
|
iface eth0 inet dhcp
|
||||||
|
|
||||||
# Bridge network interface for VM networks
|
# Bridge network interface for VM networks
|
||||||
auto br100
|
auto br100
|
||||||
iface br100 inet static
|
iface br100 inet static
|
||||||
address 192.168.100.1
|
address 192.168.100.1
|
||||||
netmask 255.255.255.0
|
netmask 255.255.255.0
|
||||||
bridge_stp off
|
bridge_stp off
|
||||||
bridge_fd 0
|
bridge_fd 0
|
||||||
|
@ -4,18 +4,18 @@ mount_check = false
|
|||||||
bind_port = 6010
|
bind_port = 6010
|
||||||
user = swift
|
user = swift
|
||||||
log_facility = LOG_LOCAL2
|
log_facility = LOG_LOCAL2
|
||||||
|
|
||||||
[pipeline:main]
|
[pipeline:main]
|
||||||
pipeline = object-server
|
pipeline = object-server
|
||||||
|
|
||||||
[app:object-server]
|
[app:object-server]
|
||||||
use = egg:swift#object
|
use = egg:swift#object
|
||||||
|
|
||||||
[object-replicator]
|
[object-replicator]
|
||||||
vm_test_mode = yes
|
vm_test_mode = yes
|
||||||
|
|
||||||
[object-updater]
|
[object-updater]
|
||||||
|
|
||||||
[object-auditor]
|
[object-auditor]
|
||||||
|
|
||||||
[object-expirer]
|
[object-expirer]
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
bind_ip = 0.0.0.0
|
bind_ip = 0.0.0.0
|
||||||
workers = 2
|
workers = 2
|
||||||
|
|
||||||
[pipeline:main]
|
[pipeline:main]
|
||||||
pipeline = object-server
|
pipeline = object-server
|
||||||
|
|
||||||
[app:object-server]
|
[app:object-server]
|
||||||
use = egg:swift#object
|
use = egg:swift#object
|
||||||
|
|
||||||
[object-replicator]
|
[object-replicator]
|
||||||
|
|
||||||
[object-updater]
|
[object-updater]
|
||||||
|
|
||||||
[object-auditor]
|
[object-auditor]
|
||||||
|
|
||||||
[object-expirer]
|
[object-expirer]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user