From: Stefan Berg <stefan.k.berg@ericsson.com>
Date: Fri, 29 Jan 2016 13:31:52 +0000 (+0000)
Subject: Merge "onos-config" into stable/brahmaputra
X-Git-Tag: brahmaputra.1.rc1~38
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ef88e79c747c642374935d2723969d0bb6b44171;p=fuel.git

Merge "onos-config" into stable/brahmaputra
---

ef88e79c747c642374935d2723969d0bb6b44171