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: 7237933 9b9a682)

author	Sage Weil <sage@redhat.com>
	Thu, 29 Jan 2015 21:28:26 +0000 (13:28 -0800)
committer	Sage Weil <sage@redhat.com>
	Thu, 29 Jan 2015 21:28:26 +0000 (13:28 -0800)
commit	2980f3ac52fa8568f666598a4d39e6f571f6b60a
tree	b5c3486aaf8ead3a0116582c96e7debff5e5290b	tree \| snapshot
parent	7237933f6cd2dcd6ac6c717fafb774489dc017f4	commit \| diff
parent	9b9a682fe035c985e416ee1c112fa58f9045a27c	commit \| diff

Merge branch 'prio_hb_pkts' of git://github.com/wenjianhn/ceph

Conflicts:
src/msg/Messenger.h

src/ceph_osd.cc	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/msg/Messenger.h	diff1 \|	diff2 \|	blob \| history
src/msg/simple/Pipe.cc	diff1 \|	diff2 \|	blob \| history

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