Merge remote-tracking branch 'asf/salt-distribution'
authorJan Lehnardt <jan@apache.org>
Sat, 3 Jun 2017 09:48:56 +0000 (11:48 +0200)
committerJan Lehnardt <jan@apache.org>
Sat, 3 Jun 2017 09:48:56 +0000 (11:48 +0200)
commitc38d7aab035bce5f88ed772de59187a39da2768f
tree9f1a3de40181e656974698599d87a21961e2a342
parentb2b93c17754cb4169bf9e922d9be702eb6d0f0d5
parent54623ce17e49ee9b5a6b69f0a8314c61b870f866
Merge remote-tracking branch 'asf/salt-distribution'

* asf/salt-distribution:
  fix cluster setup: use same admin pq salt on all nodes
src/setup.erl
src/setup_httpd.erl