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: 971b161 6f28faf)

author	Greg Farnum <greg@inktank.com>
	Thu, 14 Feb 2013 19:31:30 +0000 (11:31 -0800)
committer	Greg Farnum <greg@inktank.com>
	Thu, 14 Feb 2013 19:31:30 +0000 (11:31 -0800)
commit	c8f090aed96d615b081f5b9aa36c74092371ae1e
tree	cbcc43e749b03f1d370cd1805b1acf86ddcc3253	tree \| snapshot
parent	971b1612ccb9c70c55a0000498f908736ed43008	commit \| diff
parent	6f28faf9e6613bff403bcd958818d8dccd004f9d	commit \| diff

Merge remote-tracking branch 'origin/wip-mds-names'

src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	diff1 \|	diff2 \|	blob \| history
src/mds/MDSMap.h	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.h	diff1 \|	diff2 \|	blob \| history

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