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: 88047d0 8221a8e)

author	Sage Weil <sage@inktank.com>
	Fri, 7 Mar 2014 16:19:20 +0000 (08:19 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 7 Mar 2014 16:19:20 +0000 (08:19 -0800)
commit	0fd636c4888056f21a1b19066440d8f6e65590c8
tree	f3ed30511a928a69372bbd06f69fd7d5297664e8	tree \| snapshot
parent	88047d0b7741d1e131dc423b83bd9bf4cf7f6b46	commit \| diff
parent	8221a8ecba14f80eb7e35e3b1e6fe8487502b2d9	commit \| diff

Merge remote-tracking branch 'gh/firefly'

Conflicts:
README

README	diff1 \|	diff2 \|	blob \| history
ceph.spec.in	diff1 \|	diff2 \|	blob \| history
qa/workunits/cephtool/test.sh	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	diff1 \|	diff2 \|	blob \| history
src/os/KeyValueStore.cc	diff1 \|	diff2 \|	blob \| history
src/os/ObjectStore.h	diff1 \|	diff2 \|	blob \| history

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