From: Doug Wiegley <dougw@a10networks.com>
Date: Fri, 26 Jun 2015 15:11:07 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master' into merge-qos
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1cfed745d54a6ce9cb3dd4e6f454666d9e6676c2;p=openstack-build%2Fneutron-build.git

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

Change-Id: I373e1bf2d9b0efc9b1aff01695405f7a70ca6bef
---

1cfed745d54a6ce9cb3dd4e6f454666d9e6676c2