Merge remote-tracking branch 'origin/topic/johanna/static'

* origin/topic/johanna/static:
  Introduce --enable-static-broker configuration option.
This commit is contained in:
Jon Siwek 2018-12-10 11:16:53 -06:00
commit 1ce5a3becb
5 changed files with 20 additions and 3 deletions

View file

@ -1 +1 @@
2.6-20
2.6-22