]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/master' into infernalis
authorSage Weil <sage@redhat.com>
Thu, 3 Sep 2015 19:15:01 +0000 (15:15 -0400)
committerSage Weil <sage@redhat.com>
Thu, 3 Sep 2015 19:15:01 +0000 (15:15 -0400)
commit038e91b15de53efa7e17942979e52fdc4310cfbc
tree0300153886f86957918113c235a334b2581dd928
parent64a0f0c0141570699b413224b6f21f63ac6cec32
parent030b3edeac399f38ef4a0bf37b8ec99ea1e7c2c8
Merge remote-tracking branch 'gh/master' into infernalis
src/CMakeLists.txt
src/test/CMakeLists.txt