Merge pull request #1629 from ceph/wip-die-mkcephfs

author Alfredo Deza <alfredo@deza.pe>

Wed, 30 Apr 2014 17:52:00 +0000 (13:52 -0400)

committer Alfredo Deza <alfredo@deza.pe>

Wed, 30 Apr 2014 17:52:00 +0000 (13:52 -0400)
author Alfredo Deza <alfredo@deza.pe>
Wed, 30 Apr 2014 17:52:00 +0000 (13:52 -0400)
committer Alfredo Deza <alfredo@deza.pe>
Wed, 30 Apr 2014 17:52:00 +0000 (13:52 -0400)
diff --cc ceph.spec.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/ceph_mon.cc
Simple merge
author	Alfredo Deza <alfredo@deza.pe>
	Wed, 30 Apr 2014 17:52:00 +0000 (13:52 -0400)
committer	Alfredo Deza <alfredo@deza.pe>
	Wed, 30 Apr 2014 17:52:00 +0000 (13:52 -0400)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph_mon.cc	patch \|	diff1 \|	diff2 \|	blob \| history