]> 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: d48a737 62027ec)
Merge remote-tracking branch 'upstream/master' into wip-8438-master 2026/head
authorSamuel Just <sam.just@inktank.com>
Fri, 27 Jun 2014 20:27:47 +0000 (13:27 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 27 Jun 2014 20:27:47 +0000 (13:27 -0700)
commit1f59e405ef2cbf9d65a45dd041e16dde686dd9b3
tree56bf638eb957e63ed145625cbf6ff01b5c28de53tree | snapshot
parentd48a737a6f8daa463ddf82106455b2efe7715a33commit | diff
parent62027ec9f4e7ebcf9ea129bba78476309bc82702commit | diff
Merge remote-tracking branch 'upstream/master' into wip-8438-master

Conflicts:
src/osd/ECMsgTypes.cc
12 files changed:
src/messages/MOSDSubOp.h diff1 | diff2 | blob | history
src/osd/ECBackend.cc diff1 | diff2 | blob | history
src/osd/ECMsgTypes.cc diff1 | diff2 | blob | history
src/osd/PG.cc diff1 | diff2 | blob | history
src/osd/PG.h diff1 | diff2 | blob | history
src/osd/PGBackend.cc diff1 | diff2 | blob | history
src/osd/PGBackend.h diff1 | diff2 | blob | history
src/osd/ReplicatedBackend.cc diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc diff1 | diff2 | blob | history
src/osd/ReplicatedPG.h diff1 | diff2 | blob | history
src/osd/osd_types.cc diff1 | diff2 | blob | history
src/osd/osd_types.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.