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

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

author	Josh Durgin <jdurgin@redhat.com>
	Wed, 5 Aug 2015 01:13:52 +0000 (18:13 -0700)
committer	Josh Durgin <jdurgin@redhat.com>
	Wed, 5 Aug 2015 01:13:52 +0000 (18:13 -0700)
commit	7d11b6b9d1f48569d8fe3877d58a858b4104b5b7
tree	05d3b7796782e766b09a146fc312cd4a1642e4c4	tree \| snapshot
parent	13ccfb4eb34465c5f0de79a0027d2ac358450f1a	commit \| diff
parent	add30145a414969d6acaf014f31a288b4789fe4f	commit \| diff

Merge remote-tracking branch 'origin/next'

Conflicts:
src/Makefile-client.am (link rbd to libglobal again)

qa/workunits/cephtool/test.sh	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/rbd.cc	diff1 \|	diff2 \|	blob \| history

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

qa/workunits/cephtool/test.sh	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/rbd.cc	diff1 \|	diff2 \|	blob \| history