git.apps.os.sepia.ceph.com Git - ceph.git/commit

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 45a201f f91188e)

author	Sage Weil <sage@redhat.com>
	Tue, 7 Oct 2014 19:40:45 +0000 (12:40 -0700)
committer	Sage Weil <sage@redhat.com>
	Tue, 7 Oct 2014 19:40:45 +0000 (12:40 -0700)
commit	1036e9827c190a7eb8455a913e1e59bd356da2a7
tree	ea4823a73128be7608bb0498d5c912bb4ad7ca99	tree \| snapshot
parent	45a201f36f786e3771766d23e1f861ee0396bcba	commit \| diff
parent	f91188e01335b99b10e5b15dea77f2d02e3658f5	commit \| diff

Merge remote-tracking branch 'gh/giant'

Conflicts:
src/osdc/Objecter.cc

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/mon/MonCommands.h	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.am	diff1 \|	diff2 \|	blob \| history

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