tree 7859274b469bdff398ff248410d40c86195acd0e
parent 82ee9dc5ae4fdb88a267118170b512bc36f05693
parent 850b1c312ce8c283b2bfd503d7a142f7ca599e84
author David Pursehouse <dpursehouse@collab.net> 1575977372 +0900
committer David Pursehouse <dpursehouse@collab.net> 1575977372 +0900

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Fix handling of interactive/batch users in the QoS filter

Change-Id: Id0854d16ab44c92a5a4a400475e2ab3887586cfd