git.apps.os.sepia.ceph.com Git - ceph.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 78fd69f 45e9cd5)

author	Sage Weil <sage@redhat.com>
	Sun, 18 Jan 2015 18:37:19 +0000 (10:37 -0800)
committer	Sage Weil <sage@redhat.com>
	Sun, 18 Jan 2015 18:37:19 +0000 (10:37 -0800)
commit	87b3e9600a54e41509ea363c723845f7538b978e
tree	78f50fbc6ce4811254bbc3994d032f0093fe708d	tree \| snapshot
parent	78fd69f1aacb9dd21cf42c18d2f0a7948673a65b	commit \| diff
parent	45e9cd5bd4769d5e64c9a53a5a29096f81fbae30	commit \| diff

Merge remote-tracking branch 'gh/wip-xio'

Reviewed-by: Sage Weil <sage@redhat.com>

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/ceph_mon.cc	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/test/ceph-helpers.sh	diff1 \|	diff2 \|	blob \| history

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