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: 306719c 3216a58)

author	Sage Weil <sage@redhat.com>
	Mon, 23 Mar 2015 19:45:16 +0000 (12:45 -0700)
committer	Sage Weil <sage@redhat.com>
	Mon, 23 Mar 2015 19:45:16 +0000 (12:45 -0700)
commit	0bee27461da6c3634acd9bf477f7946b6eade796
tree	3720085ad31e8563ccb6d66a9c030d2a4c126436	tree \| snapshot
parent	306719ce5b268f3604fd13acd3b5e43565f85dbc	commit \| diff
parent	3216a584e000584211147db50262bebee6818d64	commit \| diff

Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock

src/mon/PGMap.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/pybind/ceph_argparse.py	diff1 \|	diff2 \|	blob \| history

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