Merge lp:~percona-core/percona-xtradb-cluster/bug-1409710-5.6 into lp:percona-xtradb-cluster

Proposed by Raghavendra D Prabhu
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 950
Merge reported by: Raghavendra D Prabhu
Merged at revision: not available
Proposed branch: lp:~percona-core/percona-xtradb-cluster/bug-1409710-5.6
Merge into: lp:percona-xtradb-cluster
Diff against target: 12 lines (+1/-1)
1 file modified
scripts/wsrep_sst_xtrabackup-v2.sh (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-xtradb-cluster/bug-1409710-5.6
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+247687@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/wsrep_sst_xtrabackup-v2.sh'
2--- scripts/wsrep_sst_xtrabackup-v2.sh 2014-11-21 03:28:15 +0000
3+++ scripts/wsrep_sst_xtrabackup-v2.sh 2015-01-27 11:07:10 +0000
4@@ -499,7 +499,7 @@
5 if timeout --help | grep -q -- '-k';then
6 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
7 else
8- ltcmd="timeout $tmt $tcmd"
9+ ltcmd="timeout -s9 $tmt $tcmd"
10 fi
11 timeit "$msg" "$ltcmd | $strmcmd; RC=( "\${PIPESTATUS[@]}" )"
12 else

Subscribers

People subscribed via source and target branches

to all changes: