[1/3] git commit: ACCUMULO-3217 Fix use of deprecated members

2014-10-09 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6 ff1ceeaf6 -> ccd4897e1 refs/heads/master 556b17c63 -> eed30078a ACCUMULO-3217 Fix use of deprecated members Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ccd4

[3/3] git commit: Merge branch '1.6'

2014-10-09 Thread elserj
Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eed30078 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eed30078 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eed30078 Branch:

[2/3] git commit: ACCUMULO-3217 Fix use of deprecated members

2014-10-09 Thread elserj
ACCUMULO-3217 Fix use of deprecated members Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ccd4897e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ccd4897e Diff: http://git-wip-us.apache.org/repos/asf/accumu

[1/3] git commit: ACCUMULO-3215 Ensure that ImportTable writes absolute paths, not relative.

2014-10-09 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6 3d7d762ac -> ff1ceeaf6 refs/heads/master 837ce17c8 -> 556b17c63 ACCUMULO-3215 Ensure that ImportTable writes absolute paths, not relative. ImportExportIT creates a table, exports it and then imports it to the same instance to ensure that

[3/3] git commit: Merge branch '1.6'

2014-10-09 Thread elserj
Merge branch '1.6' Conflicts: server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/556b17c6 Tree: http://git-wip-us.apache.org/repos/a

[2/3] git commit: ACCUMULO-3215 Ensure that ImportTable writes absolute paths, not relative.

2014-10-09 Thread elserj
ACCUMULO-3215 Ensure that ImportTable writes absolute paths, not relative. ImportExportIT creates a table, exports it and then imports it to the same instance to ensure that the imported copy is equivalent to the original. Without the changes to ImportTable, the test failed because the copy was un

[02/10] git commit: ACCUMULO-3217 Make KeyValue extend SimpleImmutableEntry instead of implement Map.Entry.

2014-10-09 Thread elserj
ACCUMULO-3217 Make KeyValue extend SimpleImmutableEntry instead of implement Map.Entry. We get toString, hashCode and equals for free by extending SimpleImmutableEntry over implementing Map.Entry. Without this change, users couldn't properly use the Entry objects that were returned by Scanners an

[04/10] Merge branch '1.5' into 1.6

2014-10-09 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d7d762a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index

[06/10] git commit: Merge branch '1.5' into 1.6

2014-10-09 Thread elserj
Merge branch '1.5' into 1.6 Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d7d762a Tree: http://git-wip-us.apache.org/repos/asf/a

[10/10] git commit: Merge branch '1.6'

2014-10-09 Thread elserj
Merge branch '1.6' Conflicts: core/src/main/java/org/apache/accumulo/core/data/Key.java core/src/main/java/org/apache/accumulo/core/data/KeyValue.java server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java server/tserver/src/main/java/org/apach

[08/10] Merge branch '1.5' into 1.6

2014-10-09 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d7d762a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java index e345210,

[01/10] git commit: ACCUMULO-3217 Make KeyValue extend SimpleImmutableEntry instead of implement Map.Entry.

2014-10-09 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5 8b17144e3 -> 854dce9ff refs/heads/1.6 76de76075 -> 3d7d762ac refs/heads/master a59e22c7c -> 837ce17c8 ACCUMULO-3217 Make KeyValue extend SimpleImmutableEntry instead of implement Map.Entry. We get toString, hashCode and equals for free

[05/10] Merge branch '1.5' into 1.6

2014-10-09 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d7d762a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java index e345210,

[03/10] git commit: ACCUMULO-3217 Make KeyValue extend SimpleImmutableEntry instead of implement Map.Entry.

2014-10-09 Thread elserj
ACCUMULO-3217 Make KeyValue extend SimpleImmutableEntry instead of implement Map.Entry. We get toString, hashCode and equals for free by extending SimpleImmutableEntry over implementing Map.Entry. Without this change, users couldn't properly use the Entry objects that were returned by Scanners an

[07/10] Merge branch '1.5' into 1.6

2014-10-09 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d7d762a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index

[09/10] git commit: Merge branch '1.5' into 1.6

2014-10-09 Thread elserj
Merge branch '1.5' into 1.6 Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d7d762a Tree: http://git-wip-us.apache.org/repos/asf/a