diff options
author | NeilBrown <neilb@suse.de> | 2011-03-10 17:37:04 +1100 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2011-03-10 17:37:04 +1100 |
commit | ca6529edf6f7216003863a9ea847e6689693bd96 (patch) | |
tree | ed3091b74e94cfec89134b9ed6701fc1c4e8a69e /ReadMe.c | |
parent | c64881d7a2a01e50b2275f5a0a9272bfc953e8a2 (diff) | |
parent | d6508f0cfb60edf07b36f1532eae4d9cddf7178b (diff) | |
download | mdadm-ca6529edf6f7216003863a9ea847e6689693bd96.tar.gz |
Merge branch 'master' into devel-3.2
Conflicts:
Grow.c
Manage.c
managemon.c
mdadm.8.in
util.c
Diffstat (limited to 'ReadMe.c')
-rw-r--r-- | ReadMe.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -86,11 +86,11 @@ char Version[] = Name " - v3.2 DEVELOPER_ONLY - 1st February 2011 (USE WITH CARE * At the time if writing, there is only minimal support. */ -char short_options[]="-ABCDEFGIQhVXWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; +char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; char short_bitmap_options[]= - "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; + "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; char short_bitmap_auto_options[]= - "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:"; + "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:"; struct option long_options[] = { {"manage", 0, 0, ManageOpt}, |