Merge branch 'release_2.3' into devel

* release_2.3: (54 commits)
  Upgrade changelog for 2.3
  Purge superlance
  Purge an old supervisor config
  Require chris-lea libzmq3
  Use the htpasswd command, not the module
  Fix a playbook syntax error for postgres
  Ensure postgres is started earlier in setup role
  Allow customizing npm path
  Include RPM-GPG-KEY-ansible-release for all releases
  Simplify GPG keys
  Correct broken RPM-GPG-KEY
  Use gpg --passphrase for signing CHECKSUM
  Handle rpm --addsign pasphrase prompts
  Adding docker-compose development workflow
  Fix license in spec file.
  Updates to selinux policy for some munin plugins
  ansible 1.8.4 requires sudo:true when using sudo_user
  Fix expect script timeout
  Disable timeout and correct sign.exp error
  Fix expect script hang
  ...
This commit is contained in:
Matthew Jones
2015-09-11 16:03:52 -04:00
6 changed files with 152 additions and 64 deletions

View File

@@ -102,7 +102,6 @@ six==1.9.0
South==0.8.4
stevedore==1.3.0
suds==0.4
superlance==0.11
warlock==1.1.0
wheel==0.24.0
wsgiref==0.1.2