]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #9451 from s09816/master
authorJason Dillaman <dillaman@redhat.com>
Wed, 22 Jun 2016 18:02:42 +0000 (14:02 -0400)
committerGitHub <noreply@github.com>
Wed, 22 Jun 2016 18:02:42 +0000 (14:02 -0400)
librbd: enable/disable of features is not allowed when already enabled/disabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1  2 
src/librbd/internal.cc
src/test/librbd/test_librbd.cc

Simple merge
Simple merge