]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #382 from dmick/master
authorAndrew Schoen <andrew.schoen@gmail.com>
Fri, 27 Mar 2015 01:03:50 +0000 (18:03 -0700)
committerAndrew Schoen <andrew.schoen@gmail.com>
Fri, 27 Mar 2015 01:03:50 +0000 (18:03 -0700)
commit25db1f64ab05ef3237e2f185e145bf2fffa3f4d3
tree5a96bcb56947405dfa5baab992fad368c271c9d2
parent85e7be5a485fec5465333688391ce14ef6051e91
parent58174f05e93e1d3d5ed45971c8e97533f4e3182c
Merge pull request #382 from dmick/master

calamari_setup: der.  Use dict.update() correctly