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: 6c432f1 7cc2eb2)

author	Greg Farnum <greg@inktank.com>
	Wed, 28 Aug 2013 00:26:36 +0000 (17:26 -0700)
committer	Greg Farnum <greg@inktank.com>
	Wed, 28 Aug 2013 00:26:36 +0000 (17:26 -0700)
commit	9101433a889e0221529a16bf2a8a5ed0890e1a10
tree	764ce395cfb3f0590a3aa144dde23581fdfdd69c	tree \| snapshot
parent	6c432f1932f2a6361fb439ed0b95b35ba0f711e6	commit \| diff
parent	7cc2eb246df14925ca27b8dee19b32e0bdb505a8	commit \| diff

Merge remote-tracking branch 'origin/master' into wip-6029

Conflicts:
src/librados/AioCompletionImpl.h

src/librados/AioCompletionImpl.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	diff1 \|	diff2 \|	blob \| history
src/test/test_osd_types.cc	diff1 \|	diff2 \|	blob \| history

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