tree 7dca120fce2f48d1313f0f729acb5b60ab623ab8
parent 15e4e72310445b8a6e4beb62e02859e77392253b
parent a36eaf076ddeebfebdcc72189327981ce5967281
author Ihar Hrachyshka <ihrachys@redhat.com> 1436782408 +0200
committer Ihar Hrachyshka <ihrachys@redhat.com> 1436782413 +0200

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

Change-Id: I7777c827f754e3269d69f6a5331325a76c5e57b2