[1/6] accumulo git commit: ACCUMULO-3509 Fix UTF_8 import for 1.6

2016-01-27 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6 d3316b3cf -> ff1e003ae refs/heads/1.7 bd9969f1d -> 0faf8b9c0 refs/heads/master 664012d16 -> 97ce2a758 ACCUMULO-3509 Fix UTF_8 import for 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[3/6] accumulo git commit: ACCUMULO-3509 Fix UTF_8 import for 1.6

2016-01-27 Thread ctubbsii
ACCUMULO-3509 Fix UTF_8 import for 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ff1e003a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff1e003a Diff:

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-27 Thread ctubbsii
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/97ce2a75 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97ce2a75 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97ce2a75

[2/5] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java index

[2/4] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java index

[5/5] accumulo git commit: Merge branch '1.7'

2016-01-27 Thread kturner
Merge branch '1.7' Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java

[3/4] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java

[1/4] accumulo git commit: ACCUMULO-4066 Speed up condition checking for conditional mutations

2016-01-27 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.7 0faf8b9c0 -> d4882a15f ACCUMULO-4066 Speed up condition checking for conditional mutations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21d2f615 Tree:

accumulo git commit: ACCUMULO-4066 Speed up condition checking for conditional mutations

2016-01-27 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.6 ff1e003ae -> 21d2f6152 ACCUMULO-4066 Speed up condition checking for conditional mutations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21d2f615 Tree:

[4/6] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread ctubbsii
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/0faf8b9c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0faf8b9c Diff:

[5/6] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread ctubbsii
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/0faf8b9c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0faf8b9c Diff:

[2/6] accumulo git commit: ACCUMULO-3509 Fix UTF_8 import for 1.6

2016-01-27 Thread ctubbsii
ACCUMULO-3509 Fix UTF_8 import for 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ff1e003a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff1e003a Diff:

[1/2] accumulo git commit: ACCUMULO-4116 fix bad merge

2016-01-27 Thread ecn
Repository: accumulo Updated Branches: refs/heads/master c3f596ead -> 664012d16 ACCUMULO-4116 fix bad merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd9969f1 Tree:

[1/3] accumulo git commit: ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template

2016-01-27 Thread ecn
Repository: accumulo Updated Branches: refs/heads/1.7 edaa44a5b -> bd9969f1d ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/3] accumulo git commit: ACCUMULO-4116 merge to 1.7

2016-01-27 Thread ecn
ACCUMULO-4116 merge to 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90363259 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90363259 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90363259

[3/3] accumulo git commit: ACCUMULO-4116 fix bad merge

2016-01-27 Thread ecn
ACCUMULO-4116 fix bad merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd9969f1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd9969f1 Diff:

accumulo git commit: ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template

2016-01-27 Thread ecn
Repository: accumulo Updated Branches: refs/heads/1.6 d89846e8f -> d3316b3cf ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/2] accumulo git commit: Merge branch '1.7'

2016-01-27 Thread ecn
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/664012d1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/664012d1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/664012d1

[4/4] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner
Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java

[3/5] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java

[1/5] accumulo git commit: ACCUMULO-4066 Speed up condition checking for conditional mutations

2016-01-27 Thread kturner
Repository: accumulo Updated Branches: refs/heads/master 97ce2a758 -> 4eadac16b ACCUMULO-4066 Speed up condition checking for conditional mutations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21d2f615 Tree:

[4/5] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner
Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java

[3/3] accumulo git commit: Merge branch '1.7'

2016-01-27 Thread ecn
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/c3f596ea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3f596ea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c3f596ea

[1/3] accumulo git commit: ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template

2016-01-27 Thread ecn
Repository: accumulo Updated Branches: refs/heads/master 2d99238d5 -> c3f596ead ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/3] accumulo git commit: ACCUMULO-4116 merge to 1.7

2016-01-27 Thread ecn
ACCUMULO-4116 merge to 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90363259 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90363259 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90363259