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: 011bff3 9b7a2ae)

author	Sage Weil <sage@inktank.com>
	Tue, 1 Oct 2013 23:01:24 +0000 (16:01 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 1 Oct 2013 23:01:24 +0000 (16:01 -0700)
commit	ece11f4a82062f7fb4413a6af5a64d80fd2046bf
tree	39b70656e7040cebd94b603a3a4b6232bac5b212	tree \| snapshot
parent	011bff3405b06ed9c226cfbebaf9304295ecb184	commit \| diff
parent	9b7a2ae329b6a511064dd3d6e549ba61f52cfd21	commit \| diff

Merge remote-tracking branch 'gh/next'

Conflicts:
PendingReleaseNotes

PendingReleaseNotes	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.cc	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	diff1 \|	diff2 \|	blob \| history

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