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: 1b81d8c 6994648)

author	Sage Weil <sage@redhat.com>
	Wed, 25 Mar 2015 17:30:20 +0000 (10:30 -0700)
committer	Sage Weil <sage@redhat.com>
	Wed, 25 Mar 2015 17:30:20 +0000 (10:30 -0700)
commit	2724ce2d1b7411b5027a34005ec2eff0bba78a09
tree	0afdf0986b2c335f14ba718dd0e0e82744d6d749	tree \| snapshot
parent	1b81d8c0295bce1b810703e38e834554e85c8ec9	commit \| diff
parent	6994648bc443429dc2edfbb38fbaaa9a19e2bdd1	commit \| diff

Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock

src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	diff1 \|	diff2 \|	blob \| history

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