git commit: ACCUMULO-2265 fixing copyright notice

Updated Branches: refs/heads/1.6.0-SNAPSHOT bff866845 - 3c3911dd5 ACCUMULO-2265 fixing copyright notice Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c3911dd Tree:

[1/3] git commit: ACCUMULO-2265 fixing copyright notice

Updated Branches: refs/heads/master 1bcc62af3 - 601110868 ACCUMULO-2265 fixing copyright notice Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c3911dd Tree:

[3/3] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'

Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/60111086 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/60111086 Diff:

[2/3] git commit: ACCUMULO-1772 If at table load time volume is no longer configured, then choose another

ACCUMULO-1772 If at table load time volume is no longer configured, then choose another Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/783e895f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/783e895f Diff:

git commit: ACCUMULO-1772 If at table load time volume is no longer configured, then choose another

Updated Branches: refs/heads/1.6.0-SNAPSHOT 3c3911dd5 - 783e895fb ACCUMULO-1772 If at table load time volume is no longer configured, then choose another Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/783e895f

[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25948e6b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25948e6b Diff:

[1/2] git commit: ACCUMULO-2261 remove unexpected future and loc entries for dead servers from the metadata tables

Updated Branches: refs/heads/master 601110868 - 25948e6b1 ACCUMULO-2261 remove unexpected future and loc entries for dead servers from the metadata tables Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f5c35b95

[2/3] git commit: ACCUMULO-1961 removing trivial warnings

ACCUMULO-1961 removing trivial warnings Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1ae5a86 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1ae5a86 Diff:

[1/3] git commit: ACCUMULO-2261 cherry pick back 1.5

Updated Branches: refs/heads/1.6.0-SNAPSHOT f5c35b950 - f90202f6f ACCUMULO-2261 cherry pick back 1.5 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/772ca16b Tree:

[3/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java server/src/main/java/org/apache/accumulo/server/master/Master.java Project:

[2/2] git commit: ACCUMULO-1961 removing trivial warnings

ACCUMULO-1961 removing trivial warnings Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1ae5a86 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1ae5a86 Diff:

[1/4] git commit: ACCUMULO-2261 cherry pick back 1.5

Updated Branches: refs/heads/master 25948e6b1 - 8681f07ca ACCUMULO-2261 cherry pick back 1.5 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/772ca16b Tree:

[3/4] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java server/src/main/java/org/apache/accumulo/server/master/Master.java Project:

[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8681f07c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8681f07c Diff:

[2/4] git commit: ACCUMULO-1961 removing trivial warnings

ACCUMULO-1961 removing trivial warnings Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1ae5a86 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1ae5a86 Diff:

[1/2] git commit: ACCUMULO-1479 Simplification of namespace support in SecurityOperation

Updated Branches: refs/heads/1.6.0-SNAPSHOT f90202f6f - 4cdd6d51a ACCUMULO-1479 Simplification of namespace support in SecurityOperation Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8cce1fdc Tree:

git commit: Revert ACCUMULO-1479 Simplification of namespace support in SecurityOperation Didn't mean to commit this

Updated Branches: refs/heads/1.6.0-SNAPSHOT 4cdd6d51a - f382cd8bb Revert ACCUMULO-1479 Simplification of namespace support in SecurityOperation Didn't mean to commit this This reverts commit 8cce1fdc3de13471f7dff00f7d18c7d78d8f968f. Project:

git commit: ACCUMULO-2260 removing table copy flag from createnamespace

Updated Branches: refs/heads/1.6.0-SNAPSHOT f382cd8bb - 07d7ececf ACCUMULO-2260 removing table copy flag from createnamespace Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/07d7ecec Tree:

git commit: ACCUMULO-2266 Checking hdfs minimum block size and failing if it clashes with walog max size

Updated Branches: refs/heads/1.5.1-SNAPSHOT f1ae5a860 - 07da9e3f3 ACCUMULO-2266 Checking hdfs minimum block size and failing if it clashes with walog max size Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[3/3] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/8] git commit: ACCUMULO-2121 remove client. prefix from ClientConfiguration properties

ACCUMULO-2121 remove client. prefix from ClientConfiguration properties Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4cdd6d51 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cdd6d51 Diff:

[4/8] git commit: ACCUMULO-2260 removing table copy flag from createnamespace

ACCUMULO-2260 removing table copy flag from createnamespace Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/07d7ecec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07d7ecec Diff:

[5/8] git commit: ACCUMULO-2266 Checking hdfs minimum block size and failing if it clashes with walog max size

ACCUMULO-2266 Checking hdfs minimum block size and failing if it clashes with walog max size Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/07da9e3f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07da9e3f

[8/8] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'

Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7281a24 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7281a24 Diff:

git commit: ACCUMULO-2210 Closing socket after checking on on Zookeeper

Updated Branches: refs/heads/master e7281a248 - 21f09f42a ACCUMULO-2210 Closing socket after checking on on Zookeeper Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21f09f42 Tree:

git commit: ACCUMULO-2144 fixed listcompactions and listscans so they no longer wrap the appropriate exceptions in RTEs

Updated Branches: refs/heads/1.5.1-SNAPSHOT 07da9e3f3 - 16e095fde ACCUMULO-2144 fixed listcompactions and listscans so they no longer wrap the appropriate exceptions in RTEs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[1/3] git commit: ACCUMULO-2144 fixed listcompactions and listscans so they no longer wrap the appropriate exceptions in RTEs

Updated Branches: refs/heads/1.6.0-SNAPSHOT 550d8ac65 - 3f92e0129 ACCUMULO-2144 fixed listcompactions and listscans so they no longer wrap the appropriate exceptions in RTEs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[3/3] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[3/4] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[1/4] git commit: ACCUMULO-2144 fixed listcompactions and listscans so they no longer wrap the appropriate exceptions in RTEs

Updated Branches: refs/heads/master 21f09f42a - b8f2b72c2 ACCUMULO-2144 fixed listcompactions and listscans so they no longer wrap the appropriate exceptions in RTEs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b8f2b72c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b8f2b72c Diff: