]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55cb0a5 fc39550)
Merge remote-tracking branch 'gh/hammer'
authorSage Weil <sage@redhat.com>
Fri, 27 Mar 2015 00:09:33 +0000 (17:09 -0700)
committerSage Weil <sage@redhat.com>
Fri, 27 Mar 2015 00:09:33 +0000 (17:09 -0700)
Conflicts:
.gitignore

1  2 
tasks/ceph_manager.py patch | diff1 | diff2 | blob | history

diff --cc tasks/ceph_manager.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.