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: f4f6758 ad3934e)

author	Sage Weil <sage@inktank.com>
	Fri, 7 Jun 2013 21:23:48 +0000 (14:23 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 7 Jun 2013 21:23:48 +0000 (14:23 -0700)
commit	7e09507779b67d817bfb1e259b7a05a18c5972d8
tree	deb69a5d7c0c22b8f32a869c382dd44b5931b5c4	tree \| snapshot
parent	f4f6758bdb8f9f3afb1c62f0a4f22bb956fe1e15	commit \| diff
parent	ad3934e335399f7844e45fcfd17f7802800d2cb3	commit \| diff

Merge remote-tracking branch 'gh/next'

Conflicts:
src/messages/MMonProbe.h

src/messages/MMonProbe.h	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history

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