Commit 0df54fd2 authored by Guido Trotter's avatar Guido Trotter

Merge branch 'devel-2.6'

* devel-2.6:
  Add utility to format dictionary as key=value strings
  Remove fixed FIXME
  QA: Support master-netdev and default NIC parameters
  QA: Do not pass "--bridge" to "gnt-cluster init"
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 22ac4136 30fa4476
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment