diff options
| author | elijah <elijah@riseup.net> | 2014-10-02 10:52:57 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-10-02 10:52:57 -0700 |
| commit | ac2ed4bcd12e772826bce0c3d95a05b5036c0e72 (patch) | |
| tree | a33c05140c7e6ecb767933df13c0294146ba3c3e /hiera/panda.yaml | |
| parent | 5a772e8e7a403521f306724c4ed6b2cab1315c21 (diff) | |
| parent | 621c29b7f88b1ed458acc6754646549717eb58bb (diff) | |
Merge branch 'master' of ssh://leap.se/bitmask
Conflicts:
hiera/octopus.yaml
hiera/panda.yaml
hiera/seahorse.yaml
secrets.json
Diffstat (limited to 'hiera/panda.yaml')
| -rw-r--r-- | hiera/panda.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hiera/panda.yaml b/hiera/panda.yaml index d287362..22f4c58 100644 --- a/hiera/panda.yaml +++ b/hiera/panda.yaml @@ -24,8 +24,8 @@ couch: salt: b54d7b0f595d7318d961c636fb8f5530 username: nickserver replication: - password: GN2VdL_ne7t6565khATUUeuJ7LzTMK8Q - salt: 07b36d548de1122917dde8a394ea5ee1 + password: LZg8s_Z6FCg2MZRQYjkYeE6arCIU2pCw + salt: b004ef682f926531fdda36e26d48c4fa username: replication soledad: password: 35MzsnEEAeHTVNhI_FaCFNS5bhd7RGEf |