git-server-git.apps.pok.os.sepia.ceph.com Git

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

author	Sage Weil <sage.weil@dreamhost.com>
	Thu, 2 Feb 2012 18:41:00 +0000 (10:41 -0800)
committer	Sage Weil <sage.weil@dreamhost.com>
	Thu, 2 Feb 2012 18:41:00 +0000 (10:41 -0800)
commit	dab9f0f997fe5fcebca2853559e1e8e247b9c1dd
tree	be1d65ca7a94e838df5d5d1d4ef317cd98589529	tree \| snapshot
parent	00a2e84b38745f0cdc37746e4d1b58b6487e774e	commit \| diff
parent	36a4ca40805a5b0665e749b2b928d94749a8dd87	commit \| diff

Merge branch 'master' into wip-encoding

Conflicts:
src/osd/OSD.cc
src/osd/PG.cc
src/osd/PG.h

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