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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 11d1d1f e7107f8)

author	Sage Weil <sage@redhat.com>
	Wed, 20 Jan 2016 21:49:12 +0000 (16:49 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 20 Jan 2016 21:49:12 +0000 (16:49 -0500)
commit	141888609acb6020c1c093215ce786c6632e099e
tree	e3f4633ba09aa5c50a3006a97f37c53a2f549f51	tree \| snapshot
parent	11d1d1fc25d7f1a1e8274f22b6042b7caa636a17	commit \| diff
parent	e7107f87151e9674502088bbe2d183ff4528647f	commit \| diff

Merge remote-tracking branch 'gh/jewel'

src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDLog.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDLog.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDSDaemon.cc	diff1 \|	diff2 \|	blob \| history
src/test/libcephfs/test.cc	diff1 \|	diff2 \|	blob \| history

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