]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3942 from dachary/wip-10844-firefly
authorLoic Dachary <ldachary@redhat.com>
Mon, 16 Mar 2015 16:00:27 +0000 (17:00 +0100)
committerLoic Dachary <ldachary@redhat.com>
Mon, 16 Mar 2015 16:00:27 +0000 (17:00 +0100)
mon: MonCap: take EntityName instead when expanding profiles

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
1  2 
src/mon/Monitor.cc

Simple merge