diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
| commit | a827c5eab32a43ade5551259ea56a6a1af7e861b (patch) | |
| tree | e6707df68f72baa8645210ba931272285116ad85 /tests/bugs/bug-865825.t | |
| parent | 46d333783a968ab39e0beade9c7a1eec8035f8b1 (diff) | |
| parent | 99bfc2a2a1689da1e173cb2f8ef54d2b09ef3a5d (diff) | |
Merge branch 'upstream'
Conflicts:
glusterfs.spec.in
xlators/mgmt/glusterd/src/Makefile.am
xlators/mgmt/glusterd/src/glusterd-utils.c
xlators/mgmt/glusterd/src/glusterd.h
Change-Id: I27bdcf42b003cfc42d6ad981bd2bf8180176806d
Diffstat (limited to 'tests/bugs/bug-865825.t')
| -rwxr-xr-x | tests/bugs/bug-865825.t | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/bugs/bug-865825.t b/tests/bugs/bug-865825.t index 8ee751864..4b4b8427c 100755 --- a/tests/bugs/bug-865825.t +++ b/tests/bugs/bug-865825.t @@ -58,7 +58,7 @@ setfattr -x trusted.afr.${V0}-client-2 $B0/${V0}-1/a_file echo "wrong_data" > $B0/${V0}-2/a_file gluster volume set $V0 cluster.self-heal-daemon on -sleep 3 +sleep 10 gluster volume heal $V0 full ## Make sure brick 2 now has the correct contents. |