rpms/accumulo
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 1.9.1

Browse source
This commit is contained in:
Christopher Tubbs 2018-07-06 15:41:26 -04:00
commit 68ce91e96d
10 changed files with 138 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

14
guava.patch
View file

@ -12,12 +12,12 @@ index d243dfe..35a18e2 100644
}
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
index 0c09396..c95f375 100644
index 90f5fa0..05d2ccf 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
@@ -84,7 +84,7 @@ public class CloseWriteAheadLogReferences implements Runnable {
public void run() {
// As long as we depend on a newer Guava than Hadoop uses, we have to make sure we're compatible with
@@ -86,7 +86,7 @@ public class CloseWriteAheadLogReferences implements Runnable {
// As long as we depend on a newer Guava than Hadoop uses, we have to make sure we're compatible
// with
// what the version they bundle uses.
- Stopwatch sw = new Stopwatch();
+ Stopwatch sw = Stopwatch.createUnstarted();
@ -25,10 +25,10 @@ index 0c09396..c95f375 100644
Connector conn;
try {
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java b/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
index e286371..ef082b9 100644
index aa6cc4d..71651b7 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
@@ -83,7 +83,7 @@ public class RemoveCompleteReplicationRecords implements Runnable {
@@ -85,7 +85,7 @@ public class RemoveCompleteReplicationRecords implements Runnable {
WorkSection.limit(bs);
bs.addScanIterator(cfg);
@ -38,7 +38,7 @@ index e286371..ef082b9 100644
try {
sw.start();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
index 340a58e..b0ef0a7 100644
index c2711ed..5725d9c 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
@@ -75,7 +75,7 @@ public class ScannerIT extends AccumuloClusterHarness {