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

2016-12-09 Thread busbey
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3dc9b373 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3dc9b373 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3dc9b373 Branch:

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

2016-12-09 Thread busbey
Merge branch '1.7' into 1.8 Conflicts: server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/037c1384 Tree: http://git-wip-us.apache.org/repos/a

[2/6] accumulo git commit: ACCUMULO-4533 TraceServer shouldn't abort given problems with trace table checks.

2016-12-09 Thread busbey
ACCUMULO-4533 TraceServer shouldn't abort given problems with trace table checks. Signed-off-by: Mike Drob Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/47b57f73 Tree: http://git-wip-us.ap

[3/6] accumulo git commit: ACCUMULO-4533 TraceServer shouldn't abort given problems with trace table checks.

2016-12-09 Thread busbey
ACCUMULO-4533 TraceServer shouldn't abort given problems with trace table checks. Signed-off-by: Mike Drob Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/47b57f73 Tree: http://git-wip-us.ap

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

2016-12-09 Thread busbey
Merge branch '1.7' into 1.8 Conflicts: server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/037c1384 Tree: http://git-wip-us.apache.org/repos/a

[1/6] accumulo git commit: ACCUMULO-4533 TraceServer shouldn't abort given problems with trace table checks.

2016-12-09 Thread busbey
Repository: accumulo Updated Branches: refs/heads/1.7 3c4544144 -> 47b57f730 refs/heads/1.8 7c7bbabb8 -> 037c1384a refs/heads/master 8e0f19a1c -> 3dc9b373d ACCUMULO-4533 TraceServer shouldn't abort given problems with trace table checks. Signed-off-by: Mike Drob Signed-off-by: Josh Elser

[6/7] accumulo git commit: ACCUMULO-4511 Removed Accumulo Examples

2016-12-09 Thread mwalch
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e0f19a1/docs/src/main/resources/examples/filter.md -- diff --git a/docs/src/main/resources/examples/filter.md b/docs/src/main/resources/examples/filter.md deleted file mode 100

[1/7] accumulo git commit: ACCUMULO-4511 Removed Accumulo Examples

2016-12-09 Thread mwalch
Repository: accumulo Updated Branches: refs/heads/master 13201a814 -> 8e0f19a1c http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e0f19a1/test/src/main/java/org/apache/accumulo/test/examples/simple/filedata/ChunkInputStreamIT.java

[5/7] accumulo git commit: ACCUMULO-4511 Removed Accumulo Examples

2016-12-09 Thread mwalch
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e0f19a1/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java -- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examp

[3/7] accumulo git commit: ACCUMULO-4511 Removed Accumulo Examples

2016-12-09 Thread mwalch
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e0f19a1/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java -- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simp

[4/7] accumulo git commit: ACCUMULO-4511 Removed Accumulo Examples

2016-12-09 Thread mwalch
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e0f19a1/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java -- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simp

[2/7] accumulo git commit: ACCUMULO-4511 Removed Accumulo Examples

2016-12-09 Thread mwalch
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e0f19a1/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java -- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/sha

[7/7] accumulo git commit: ACCUMULO-4511 Removed Accumulo Examples

2016-12-09 Thread mwalch
ACCUMULO-4511 Removed Accumulo Examples * Moved code and documentation to new accumulo-examples repo * Updated references in user manual * Update README.md to reflect the change * Example docs and source are no longer included in tarball Project: http://git-wip-us.apache.org/repos/asf/accumulo/r

[5/7] accumulo-examples git commit: ACCUMULO-4511 Adding examples from Accumulo repo

2016-12-09 Thread mwalch
http://git-wip-us.apache.org/repos/asf/accumulo-examples/blob/d96c6d96/src/main/java/org/apache/accumulo/examples/client/RowOperations.java -- diff --git a/src/main/java/org/apache/accumulo/examples/client/RowOperations.java b/sr

[4/7] accumulo-examples git commit: ACCUMULO-4511 Adding examples from Accumulo repo

2016-12-09 Thread mwalch
http://git-wip-us.apache.org/repos/asf/accumulo-examples/blob/d96c6d96/src/main/java/org/apache/accumulo/examples/filedata/ChunkInputStream.java -- diff --git a/src/main/java/org/apache/accumulo/examples/filedata/ChunkInputStream.

[3/7] accumulo-examples git commit: ACCUMULO-4511 Adding examples from Accumulo repo

2016-12-09 Thread mwalch
http://git-wip-us.apache.org/repos/asf/accumulo-examples/blob/d96c6d96/src/main/java/org/apache/accumulo/examples/mapreduce/bulk/BulkIngestExample.java -- diff --git a/src/main/java/org/apache/accumulo/examples/mapreduce/bulk/Bulk

[6/7] accumulo-examples git commit: ACCUMULO-4511 Adding examples from Accumulo repo

2016-12-09 Thread mwalch
http://git-wip-us.apache.org/repos/asf/accumulo-examples/blob/d96c6d96/docs/mapred.md -- diff --git a/docs/mapred.md b/docs/mapred.md new file mode 100644 index 000..2768a5d --- /dev/null +++ b/docs/mapred.md @@ -0,0 +1,154 @@

[2/7] accumulo-examples git commit: ACCUMULO-4511 Adding examples from Accumulo repo

2016-12-09 Thread mwalch
http://git-wip-us.apache.org/repos/asf/accumulo-examples/blob/d96c6d96/src/test/java/org/apache/accumulo/examples/ExamplesIT.java -- diff --git a/src/test/java/org/apache/accumulo/examples/ExamplesIT.java b/src/test/java/org/apach

[7/7] accumulo-examples git commit: ACCUMULO-4511 Adding examples from Accumulo repo

2016-12-09 Thread mwalch
ACCUMULO-4511 Adding examples from Accumulo repo * Created run.sh script for running examples * Fixed package names Project: http://git-wip-us.apache.org/repos/asf/accumulo-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-examples/commit/d96c6d96 Tree: http://git-wip-us.apac

[1/7] accumulo-examples git commit: ACCUMULO-4511 Adding examples from Accumulo repo

2016-12-09 Thread mwalch
Repository: accumulo-examples Updated Branches: refs/heads/master bb64db9c3 -> d96c6d968 http://git-wip-us.apache.org/repos/asf/accumulo-examples/blob/d96c6d96/src/test/java/org/apache/accumulo/examples/filedata/KeyUtilTest.java --