Merge branch 'yast-SLE-12-GA'. Version 3.1.9

package/yast2-drbd.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Nov  4 07:32:41 UTC 2014 - nwang@suse.com
+
+- BNC#903514. Modify the wrong help text.
+- Add in Maintenance update.
+- Version 3.1.9
+
+-------------------------------------------------------------------
+Tue Nov  4 07:29:42 UTC 2014 - nwang@suse.com
+
+- BNC#901554. Change outdate-peer to fence-peer.
+
 -------------------------------------------------------------------
 Mon Oct 27 06:03:25 UTC 2014 - nwang@suse.com
 

package/yast2-drbd.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-drbd
-Version:        3.1.8
+Version:        3.1.9
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/include/drbd/helps.rb

@@ -76,7 +76,7 @@ def initialize_drbd_helps(include_target)
             "\n" +
               "\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n" +
               "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n" +
-              "\t\t<p>\"Device\": The name of the block device node of the resource being described.  You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Or either omit the name or minor and the minor number. If you omit the name a default of /dev/drbdminor will be used.\n" +
+              "\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Otherwise, you may omit the name, or the word minor and its number. If you omit the name a default of /dev/drbd'minor number' will be used.\n" +
               "\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n" +
               "\t\t<p>\"Disk\":  DRBD uses this block device to actually store and retrieve the data.  Never access such a device while DRBD is running on top of  it.</p>\n" +
               "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n" +

src/servers_non_y2/ag_drbd

@@ -90,8 +90,8 @@ module_eval <<'..end drbd.rb.yy modeval..id549532a17a', 'drbd.rb.yy', 184
 				@q.push [:TK_PRI_LOST_AFTER_SB, 'pri-lost-after-sb']
 			when /\Apri-lost/
 				@q.push [:TK_PRI_LOST, 'pri-lost']	
-			when /\Aoutdate-peer/
-				@q.push [:TK_OUTDATE_PEER, 'outdate-peer']
+			when /\Afence-peer/
+				@q.push [:TK_FENCE_PEER, 'fence-peer']
 			when /\Alocal-io-error/
 				@q.push [:TK_LOCAL_IO_ERROR, 'local-io-error']
 			when /\Asplit-brain/
@@ -528,7 +528,7 @@ racc_token_table = {
  :TK_PRI_ON_INCON_DEGR => 59,
  :TK_PRI_LOST_AFTER_SB => 60,
  :TK_PRI_LOST => 61,
- :TK_OUTDATE_PEER => 62,
+ :TK_FENCE_PEER => 62,
  :TK_LOCAL_IO_ERROR => 63,
  :TK_SPLIT_BRAIN => 64,
  :TK_BEFORE_RESYNC_TARGET => 65,
@@ -628,7 +628,7 @@ Racc_token_to_s_table = [
 'TK_PRI_ON_INCON_DEGR',
 'TK_PRI_LOST_AFTER_SB',
 'TK_PRI_LOST',
-'TK_OUTDATE_PEER',
+'TK_FENCE_PEER',
 'TK_LOCAL_IO_ERROR',
 'TK_SPLIT_BRAIN',
 'TK_BEFORE_RESYNC_TARGET',

src/servers_non_y2/drbd.rb.yy

@@ -1,7 +1,7 @@
 
 class DrbdParser
 
-token TK_GLOBAL TK_RESOURCE TK_ON TK_NET TK_DISK_S TK_SYNCER TK_STARTUP TK_DISABLE_IP_VERIFICATION TK_PROTOCOL TK_ADDRESS TK_DISK TK_DEVICE TK_META_DISK TK_MINOR_COUNT TK_INTEGER TK_STRING TK_ON_IO_ERROR TK_SIZE TK_TIMEOUT TK_CONNECT_INT TK_PING_INT TK_MAX_BUFFERS TK_IPADDR TK_UNPLUG_WATERMARK TK_MAX_EPOCH_SIZE TK_SNDBUF_SIZE TK_RATE TK_AL_EXTENTS TK_WFC_TIMEOUT TK_DEGR_WFC_TIMEOUT TK_KO_COUNT TK_ON_DISCONNECT TK_DIALOG_REFRESH TK_USAGE_COUNT TK_COMMON TK_HANDLERS TK_FENCING TK_USE_BMBV TK_NO_DISK_BARRIER TK_NO_DISK_FLUSHES TK_NO_DISK_DRAIN TK_NO_MD_FLUSHES TK_MAX_BIO_BVECS TK_PINT_TIMEOUT TK_ALLOW_TWO_PRIMARIES TK_CRAM_HMAC_ALG TK_SHARED_SECRET TK_AFTER_SB_0PRI TK_AFTER_SB_1PRI TK_AFTER_SB_2PRI TK_DATA_INTEGRITY_ALG TK_RR_CONFLICT TK_NO_TCP_CORK TK_CPU_MASK TK_VERIFY_ALG TK_AFTER TK_FLEXIBLE_META_DISK TK_PRI_ON_INCON_DEGR TK_PRI_LOST_AFTER_SB TK_PRI_LOST TK_OUTDATE_PEER TK_LOCAL_IO_ERROR TK_SPLIT_BRAIN TK_BEFORE_RESYNC_TARGET TK_AFTER_RESYNC_TARGET TK_WAIT_AFTER_SB TK_BECOME_PRIMARY_ON TK_IPV6ADDR TK_IPV6 TK_FLOATING TK_STACK_ON_TOP_OF TK_MINOR
+token TK_GLOBAL TK_RESOURCE TK_ON TK_NET TK_DISK_S TK_SYNCER TK_STARTUP TK_DISABLE_IP_VERIFICATION TK_PROTOCOL TK_ADDRESS TK_DISK TK_DEVICE TK_META_DISK TK_MINOR_COUNT TK_INTEGER TK_STRING TK_ON_IO_ERROR TK_SIZE TK_TIMEOUT TK_CONNECT_INT TK_PING_INT TK_MAX_BUFFERS TK_IPADDR TK_UNPLUG_WATERMARK TK_MAX_EPOCH_SIZE TK_SNDBUF_SIZE TK_RATE TK_AL_EXTENTS TK_WFC_TIMEOUT TK_DEGR_WFC_TIMEOUT TK_KO_COUNT TK_ON_DISCONNECT TK_DIALOG_REFRESH TK_USAGE_COUNT TK_COMMON TK_HANDLERS TK_FENCING TK_USE_BMBV TK_NO_DISK_BARRIER TK_NO_DISK_FLUSHES TK_NO_DISK_DRAIN TK_NO_MD_FLUSHES TK_MAX_BIO_BVECS TK_PINT_TIMEOUT TK_ALLOW_TWO_PRIMARIES TK_CRAM_HMAC_ALG TK_SHARED_SECRET TK_AFTER_SB_0PRI TK_AFTER_SB_1PRI TK_AFTER_SB_2PRI TK_DATA_INTEGRITY_ALG TK_RR_CONFLICT TK_NO_TCP_CORK TK_CPU_MASK TK_VERIFY_ALG TK_AFTER TK_FLEXIBLE_META_DISK TK_PRI_ON_INCON_DEGR TK_PRI_LOST_AFTER_SB TK_PRI_LOST TK_FENCE_PEER TK_LOCAL_IO_ERROR TK_SPLIT_BRAIN TK_BEFORE_RESYNC_TARGET TK_AFTER_RESYNC_TARGET TK_WAIT_AFTER_SB TK_BECOME_PRIMARY_ON TK_IPV6ADDR TK_IPV6 TK_FLOATING TK_STACK_ON_TOP_OF TK_MINOR
 
 rule
 	config: global_sec common_sec resources { $drbd['global'] = val[0]; $drbd['common'] = val[1]; $drbd['resources'] = val[2]; return $drbd; }
@@ -151,7 +151,7 @@ rule
 	handlers_stmt: TK_PRI_ON_INCON_DEGR TK_STRING { return ["#{val[0]}", val[1]]; }
 			 | TK_PRI_LOST_AFTER_SB TK_STRING { return ["#{val[0]}", val[1]]; }
 			 | TK_PRI_LOST TK_STRING { return ["#{val[0]}", val[1]]; }
-			 | TK_OUTDATE_PEER TK_STRING { return ["#{val[0]}", val[1]]; }
+			 | TK_FENCE_PEER TK_STRING { return ["#{val[0]}", val[1]]; }
 			 | TK_LOCAL_IO_ERROR TK_STRING { return ["#{val[0]}", val[1]]; }
 			 | TK_SPLIT_BRAIN TK_STRING { return ["#{val[0]}", val[1]]; }
 			 | TK_BEFORE_RESYNC_TARGET TK_STRING { return ["#{val[0]}", val[1]]; }
@@ -257,8 +257,8 @@ $drbd = Hash.new()
 				@q.push [:TK_PRI_LOST_AFTER_SB, 'pri-lost-after-sb']
 			when /\Apri-lost/
 				@q.push [:TK_PRI_LOST, 'pri-lost']	
-			when /\Aoutdate-peer/
-				@q.push [:TK_OUTDATE_PEER, 'outdate-peer']
+			when /\Afence-peer/
+				@q.push [:TK_FENCE_PEER, 'fence-peer']
 			when /\Alocal-io-error/
 				@q.push [:TK_LOCAL_IO_ERROR, 'local-io-error']
 			when /\Asplit-brain/