drbd: Rename --dry-run to --tentative
authorAndreas Gruenbacher <agruen@linbit.com>
Tue, 28 Jun 2011 12:18:12 +0000 (14:18 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:57:47 +0000 (16:57 +0100)
commit6dff2902208364d058746ee794da4d960f6eec6f
tree61d93721a5f8c9625336473254c9bfe85c721b9b
parentd0fa7fd680a56a3fd52817fe93c1c8abe7164ef1
drbd: Rename --dry-run to --tentative

drbdadm already has a --dry-run option, so this option cannot directly be
passed through to drbdsetup.  Rename the drbdsetup option to resolve this
conflict.

For backward compatibility, make --dry-run an alias of --tentative.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_receiver.c
include/linux/drbd_genl.h