]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d192062 1349ba8)
Merge remote-tracking branch 'gh/master' into wip-cache
authorSage Weil <sage@inktank.com>
Sun, 22 Dec 2013 23:33:59 +0000 (15:33 -0800)
committerSage Weil <sage@inktank.com>
Sun, 22 Dec 2013 23:33:59 +0000 (15:33 -0800)
commit1e529972f31d00be3b45381ba07802ef24750d02
tree65edb7e553f2bbb589ac4dfc0935d93e3ae83bd9tree | snapshot
parentd192062bfbd5a9383437d02e8ca42ab402b8fb06commit | diff
parent1349ba894a9ec308111e62d1d7766352b13223e3commit | diff
Merge remote-tracking branch 'gh/master' into wip-cache

Conflicts:
src/osdc/Objecter.h
src/vstart.sh

Reviewed-by: Samuel Just <sam.just@inktank.com>
16 files changed:
src/common/ceph_strings.cc diff1 | diff2 | blob | history
src/include/rados.h diff1 | diff2 | blob | history
src/include/rados/librados.h diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osd/OSDMap.cc diff1 | diff2 | blob | history
src/osd/OSDMap.h 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
src/osdc/Objecter.cc diff1 | diff2 | blob | history
src/osdc/Objecter.h diff1 | diff2 | blob | history
src/test/librados/tier.cc diff1 | diff2 | blob | history
src/tools/rados/rados.cc diff1 | diff2 | blob | history
src/vstart.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.