Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0bcbab7d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bcbab7d
Diff:
Repository: accumulo
Updated Branches:
refs/heads/master 51f39d292 - 488f441f7
ACCUMULO-3745 simplify locking and added comments
changes from [~elserj] CR on issue
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit:
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0bcbab7d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bcbab7d
Diff:
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18650ac6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18650ac6
Diff:
Repository: accumulo
Updated Branches:
refs/heads/1.5 95e234c7e - 5ac1b52ef
ACCUMULO-3745 simplify locking and added comments
changes from [~elserj] CR on issue
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit:
Repository: accumulo
Updated Branches:
refs/heads/1.6 dd9cc1cfb - 0bcbab7d6
ACCUMULO-3745 simplify locking and added comments
changes from [~elserj] CR on issue
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit:
Repository: accumulo
Updated Branches:
refs/heads/1.7 55981ad88 - 18650ac66
ACCUMULO-3745 simplify locking and added comments
changes from [~elserj] CR on issue
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit:
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0bcbab7d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bcbab7d
Diff:
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18650ac6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18650ac6
Diff:
ACCUMULO-3638 merge master branch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4635de86
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4635de86
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fdd29f5/test/src/test/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
ACCUMULO-3423 updates based on review by [~elserj] and [~kturner]
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/afa887b6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/afa887b6
Diff:
ACCUMULO-3638 mostly updated file references to WALs to be Path objects
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/98c3cef8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98c3cef8
Diff:
Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd6dbba5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd6dbba5
Diff:
ACCUMULO-3638 merge master branch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/902ee7dd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/902ee7dd
Diff:
ACCUMULO-3423 reduce the number of calls to add a flag to the metadata table
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/65d01458
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/65d01458
Diff:
ACCUMULO-3423 merge master
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4f28c7b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4f28c7b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f4f28c7b
ACCUMULO-3423 fixed replication bugs with recent refactorings in StatusUtil
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31ee26b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31ee26b8
Diff:
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/34af43fd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/34af43fd
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fdd29f5/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb25f3b1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb25f3b1
Diff:
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b3358cb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8b3358cb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8b3358cb
ACCUMULO-3423 finished up testing, went back to lazy metadata table references
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f43b2160
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f43b2160
Diff:
Merge branch 'master' of https://github.com/ericnewton/accumulo-3423
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d0a0ac05
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d0a0ac05
Diff:
ACCUMULO-3423 merge apache master
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f5e0021
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f5e0021
Diff:
Repository: accumulo
Updated Branches:
refs/heads/master 6df71693e - 51f39d292
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2539fb1/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
--
diff
ACCUMULO-3423 more updates based on [~kturner]'s review
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a422
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a422
Diff:
ACCUMULO-3423 optimize WAL metadata table updates
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3fdd29f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fdd29f5
Diff:
ACCUMULO-3423 merge in master from apache
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c71fc121
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c71fc121
Diff:
ACCUMULO-3423 optimize WAL metadata table updates
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3fdd29f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fdd29f5
Diff:
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ed7c4f6c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed7c4f6c
Diff:
ACCUMULO-3625 use log markers against tservers, not tablets
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b2539fb1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b2539fb1
Diff:
ACCUMULO-3423 merging master
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ac176e19
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ac176e19
Diff:
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/daa38ce9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/daa38ce9
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2539fb1/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
--
diff --git
ACCUMULO-3423 merging master
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1591f03
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1591f03
Diff:
ACCUMULO-3423 respond to elserj's review
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8f3b7d3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8f3b7d3
Diff:
ACCUMULO-3488 ACCUMULO-3423 sync these two changes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/55981ad8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/55981ad8
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fdd29f5/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
Repository: accumulo
Updated Branches:
refs/heads/1.7 ea25e98c9 - 55981ad88
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fdd29f5/test/src/test/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java
--
diff --git
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fdd29f5/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
--
diff --git
ACCUMULO-3423 got most ITs working again
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/35e3f12c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/35e3f12c
Diff:
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51f39d29
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51f39d29
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51f39d29
ACCUMULO-3423 updates from reviews
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9c2ca7a5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c2ca7a5
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2539fb1/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
--
diff --git
ACCUMULO-3423 merge apache master, everything is broken
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0177e3f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0177e3f6
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fdd29f5/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
--
diff --git
47 matches
Mail list logo