Merge branch '1.6.0-SNAPSHOT'

joshelser · joshelser · commit a723216a7fa6 · 2014-04-28T21:38:43.000-04:00
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java
@@ -29,7 +29,7 @@ public class BackupMasterIT extends ConfigurableMacIT {
 
   @Override
   protected int defaultTimeoutSeconds() {
-    return 20;
+    return 120;
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class BackupMasterIT extends ConfigurableMacIT {`
`29`	`29`
`30`	`30`	`@Override`
`31`	`31`	`protected int defaultTimeoutSeconds() {`
`32`		`- return 20;`
	`32`	`+ return 120;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Test`