From: Andreas Gruenbacher <agruen@linbit.com>
Date: Tue, 28 Jun 2011 12:18:12 +0000 (+0200)
Subject: drbd: Rename --dry-run to --tentative
X-Git-Tag: v3.8-rc1~78^2~18^2~184
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dff2902208364d058746ee794da4d960f6eec6f;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed