tree 7dca120fce2f48d1313f0f729acb5b60ab623ab8
parent 15e4e72310445b8a6e4beb62e02859e77392253b
parent 1a0fe9fa190751ced5b0fbc2ce16f052c8a2f15a
author Ihar Hrachyshka <ihrachys@redhat.com> 1436538836 +0200
committer Ihar Hrachyshka <ihrachys@redhat.com> 1436538842 +0200

Merge remote-tracking branch 'origin/feature/qos' into merge-branch

Change-Id: Ie2617cb5e502b49e8c33bb47ad295c80e53b769a