]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85e7be5 58174f0)
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)
calamari_setup: der.  Use dict.update() correctly


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.