From: Andrew Schoen <andrew.schoen@gmail.com>
Date: Fri, 27 Mar 2015 01:03:50 +0000 (-0700)
Subject: Merge pull request #382 from dmick/master
X-Git-Tag: v10.2.6~165^2^2~518
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25db1f64ab05ef3237e2f185e145bf2fffa3f4d3;p=ceph.git

Merge pull request #382 from dmick/master

calamari_setup: der.  Use dict.update() correctly
---

25db1f64ab05ef3237e2f185e145bf2fffa3f4d3