]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4282 from ceph/wip-3645
authorGregory Farnum <greg@gregs42.com>
Mon, 20 Apr 2015 18:10:21 +0000 (11:10 -0700)
committerGregory Farnum <greg@gregs42.com>
Mon, 20 Apr 2015 18:10:21 +0000 (11:10 -0700)
mds: rename snapshot support

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com
1  2 
src/client/Client.cc
src/mds/Server.cc

Simple merge
Simple merge