]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 43ee143 cfecd12)
Merge remote-tracking branch 'gh/hammer'
authorSage Weil <sage@redhat.com>
Thu, 19 Mar 2015 19:41:04 +0000 (12:41 -0700)
committerSage Weil <sage@redhat.com>
Thu, 19 Mar 2015 19:41:04 +0000 (12:41 -0700)
commitd26a9dce5eb94655980ece365870ecb1158ff7bc
treed3ced7df503dfa144b73482565b6b3261d6e0a38tree | snapshot
parent43ee14342f7bd60cd1dd5b799b7bdba09517239ccommit | diff
parentcfecd125fe1846187285a640328f53ff70d33ccacommit | diff
Merge remote-tracking branch 'gh/hammer'

Conflicts:
PendingReleaseNotes
src/Makefile.am
src/gmock
src/test/Makefile.am
14 files changed:
configure.ac diff1 | diff2 | blob | history
src/Makefile-client.am | diff2 | blob | history
src/Makefile-env.am diff1 | diff2 | blob | history
src/Makefile.am diff1 | diff2 | blob | history
src/common/Makefile.am diff1 | diff2 | blob | history
src/common/config_opts.h diff1 | diff2 | blob | history
src/include/Makefile.am diff1 | diff2 | blob | history
src/libradosstriper/Makefile.am diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
src/osd/PG.cc diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc diff1 | diff2 | blob | history
src/rgw/Makefile.am diff1 | diff2 | blob | history
src/test/Makefile-client.am | diff2 | blob | history
src/test/Makefile.am diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.