]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20ed725 6065f0b)
Merge remote-tracking branch 'gh/giant'
authorSage Weil <sage@redhat.com>
Fri, 3 Oct 2014 17:57:32 +0000 (10:57 -0700)
committerSage Weil <sage@redhat.com>
Fri, 3 Oct 2014 17:57:32 +0000 (10:57 -0700)
Conflicts:
suites/multi-version/firefly-giant/basic/1-install/firefly-giant.yaml


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