]> 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: b531aa3 04dac7e)
Merge branch 'wsp.bobtail.2merge' into wsp.bobtail.master
authorJoao Eduardo Luis <joao.luis@inktank.com>
Thu, 21 Feb 2013 18:04:22 +0000 (18:04 +0000)
committerJoao Eduardo Luis <joao.luis@inktank.com>
Thu, 21 Feb 2013 18:04:22 +0000 (18:04 +0000)
commitbeafca57fb64e24d16008b1ce4a32b44ea5b55a0
tree8c6cb8e0b2d18a1b284f589e72b8d217fe7e520dtree | snapshot
parentb531aa3688d9e8831837c23abac0bdaba04ec793commit | diff
parent04dac7ee7aeb4894a521745694f2ad5da3abcddfcommit | diff
Merge branch 'wsp.bobtail.2merge' into wsp.bobtail.master

Conflicts:
src/.gitignore
src/Makefile.am
src/include/ceph_features.h
src/mon/MDSMonitor.cc
src/mon/PGMonitor.cc
18 files changed:
src/.gitignore diff1 | diff2 | blob | history
src/Makefile.am diff1 | diff2 | blob | history
src/common/config_opts.h diff1 | diff2 | blob | history
src/include/ceph_features.h diff1 | diff2 | blob | history
src/mon/AuthMonitor.cc diff1 | diff2 | blob | history
src/mon/LogMonitor.cc diff1 | diff2 | blob | history
src/mon/MDSMonitor.cc diff1 | diff2 | blob | history
src/mon/MDSMonitor.h diff1 | diff2 | blob | history
src/mon/Monitor.cc diff1 | diff2 | blob | history
src/mon/Monitor.h diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
src/mon/OSDMonitor.h diff1 | diff2 | blob | history
src/mon/PGMonitor.cc diff1 | diff2 | blob | history
src/mon/PGMonitor.h diff1 | diff2 | blob | history
src/msg/Message.h diff1 | diff2 | blob | history
src/os/FileStore.cc diff1 | diff2 | blob | history
src/test/ObjectMap/test_keyvaluedb_iterators.cc diff1 | diff2 | blob | history
src/test/ObjectMap/test_object_map.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.