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

2013-12-02 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/rep

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

2013-12-02 Thread elserj
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/ccec95b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ccec95b6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ccec95

[2/4] git commit: ACCUMULO-1947 Use DfsConfigKeys.DFS_DATANODE_SYNCONCLOSE_KEY instead of the CreateFlag class as a better way to check whether or not to we warn if the configuration doesn't contain d

2013-12-02 Thread elserj
ACCUMULO-1947 Use DfsConfigKeys.DFS_DATANODE_SYNCONCLOSE_KEY instead of the CreateFlag class as a better way to check whether or not to we warn if the configuration doesn't contain dfs.datanode.synconclose=true Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

[2/3] git commit: ACCUMULO-1947 Use DfsConfigKeys.DFS_DATANODE_SYNCONCLOSE_KEY instead of the CreateFlag class as a better way to check whether or not to we warn if the configuration doesn't contain d

2013-12-02 Thread elserj
ACCUMULO-1947 Use DfsConfigKeys.DFS_DATANODE_SYNCONCLOSE_KEY instead of the CreateFlag class as a better way to check whether or not to we warn if the configuration doesn't contain dfs.datanode.synconclose=true Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

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

2013-12-02 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/rep

[1/3] git commit: ACCUMULO-1947 Remove forcefully setting the logger in a test with no reset after the test is done.

2013-12-02 Thread elserj
Updated Branches: refs/heads/1.6.0-SNAPSHOT 360f0cf8c -> 890ee25cf ACCUMULO-1947 Remove forcefully setting the logger in a test with no reset after the test is done. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c

[1/4] git commit: ACCUMULO-1947 Remove forcefully setting the logger in a test with no reset after the test is done.

2013-12-02 Thread elserj
Updated Branches: refs/heads/master c7062890d -> ccec95b69 ACCUMULO-1947 Remove forcefully setting the logger in a test with no reset after the test is done. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c7fc7765

[1/2] git commit: ACCUMULO-1947 Remove forcefully setting the logger in a test with no reset after the test is done.

2013-12-02 Thread elserj
Updated Branches: refs/heads/1.5.1-SNAPSHOT 42e8df7eb -> cd96f85e0 ACCUMULO-1947 Remove forcefully setting the logger in a test with no reset after the test is done. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c

[2/2] git commit: ACCUMULO-1947 Use DfsConfigKeys.DFS_DATANODE_SYNCONCLOSE_KEY instead of the CreateFlag class as a better way to check whether or not to we warn if the configuration doesn't contain d

2013-12-02 Thread elserj
ACCUMULO-1947 Use DfsConfigKeys.DFS_DATANODE_SYNCONCLOSE_KEY instead of the CreateFlag class as a better way to check whether or not to we warn if the configuration doesn't contain dfs.datanode.synconclose=true Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

git commit: Fixes "hostname -a" errors on OS X

2013-12-02 Thread vines
Updated Branches: refs/heads/1.5.1-SNAPSHOT 07fa748e0 -> 42e8df7eb Fixes "hostname -a" errors on OS X Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42e8df7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre

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

2013-12-02 Thread vines
Merge branch '1.5.1-SNAPSHOT' into 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/360f0cf8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/360f0cf8 Diff: http://git-wip-us.apache.org/repos/asf/

[1/3] git commit: Fixes "hostname -a" errors on OS X

2013-12-02 Thread vines
Updated Branches: refs/heads/master 7c40a171d -> c7062890d Fixes "hostname -a" errors on OS X Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42e8df7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/42e8df

[1/2] git commit: Fixes "hostname -a" errors on OS X

2013-12-02 Thread vines
Updated Branches: refs/heads/1.6.0-SNAPSHOT 31b58c473 -> 360f0cf8c Fixes "hostname -a" errors on OS X Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42e8df7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre

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

2013-12-02 Thread vines
Merge branch '1.5.1-SNAPSHOT' into 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/360f0cf8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/360f0cf8 Diff: http://git-wip-us.apache.org/repos/asf/

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

2013-12-02 Thread vines
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/c7062890 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c7062890 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c70628

[2/6] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-02 Thread vines
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/48a36b41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/48a36b41 Diff: http://git-wip-us.apache.org/repos/asf/

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

2013-12-02 Thread vines
Merge branch '1.5.1-SNAPSHOT' into 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/cb2ec9b9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cb2ec9b9 Diff: http://git-wip-us.apache.org/repos/asf/

[3/6] git commit: ACCUMULO-1556 Clarify initialization error for used fs

2013-12-02 Thread vines
ACCUMULO-1556 Clarify initialization error for used fs The Initialize class now generates clearer and more informative error messages if an initialized instance is discovered. The messages vary depending on whether instance.dfs.uri is used. The values of instance.dfs.uri and instance.dfs.dir are a

[1/6] git commit: ACCUMULO-1556 Clarify initialization error for used fs

2013-12-02 Thread vines
Updated Branches: refs/heads/master 811405afe -> 7c40a171d ACCUMULO-1556 Clarify initialization error for used fs The Initialize class now generates clearer and more informative error messages if an initialized instance is discovered. The messages vary depending on whether instance.dfs.uri is

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

2013-12-02 Thread vines
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/7c40a171 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c40a171 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c40a1

[5/6] git commit: ACCUMULO-1556 Clarify initialization error for used fs

2013-12-02 Thread vines
ACCUMULO-1556 Clarify initialization error for used fs The Initialize class now generates clearer and more informative error messages if an initialized instance is discovered. The messages vary depending on whether instance.dfs.uri is used. The values of instance.dfs.uri and instance.dfs.dir are a

[1/5] git commit: ACCUMULO-1556 Clarify initialization error for used fs

2013-12-02 Thread vines
Updated Branches: refs/heads/1.6.0-SNAPSHOT 29223f796 -> 31b58c473 ACCUMULO-1556 Clarify initialization error for used fs The Initialize class now generates clearer and more informative error messages if an initialized instance is discovered. The messages vary depending on whether instance.dfs

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

2013-12-02 Thread vines
Merge branch '1.5.1-SNAPSHOT' into 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/cb2ec9b9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cb2ec9b9 Diff: http://git-wip-us.apache.org/repos/asf/

[5/5] git commit: ACCUMULO-1556 Clarify initialization error for used fs

2013-12-02 Thread vines
ACCUMULO-1556 Clarify initialization error for used fs The Initialize class now generates clearer and more informative error messages if an initialized instance is discovered. The messages vary depending on whether instance.dfs.uri is used. The values of instance.dfs.uri and instance.dfs.dir are a

[3/5] git commit: ACCUMULO-1556 Clarify initialization error for used fs

2013-12-02 Thread vines
ACCUMULO-1556 Clarify initialization error for used fs The Initialize class now generates clearer and more informative error messages if an initialized instance is discovered. The messages vary depending on whether instance.dfs.uri is used. The values of instance.dfs.uri and instance.dfs.dir are a

[2/5] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-12-02 Thread vines
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/48a36b41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/48a36b41 Diff: http://git-wip-us.apache.org/repos/asf/

[3/3] git commit: ACCUMULO-1556 Clarify initialization error for used fs

2013-12-02 Thread vines
ACCUMULO-1556 Clarify initialization error for used fs The Initialize class now generates clearer and more informative error messages if an initialized instance is discovered. The messages vary depending on whether instance.dfs.uri is used. The values of instance.dfs.uri and instance.dfs.dir are a

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

2013-12-02 Thread vines
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/48a36b41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/48a36b41 Diff: http://git-wip-us.apache.org/repos/asf/

[1/3] git commit: ACCUMULO-1556 Clarify initialization error for used fs

2013-12-02 Thread vines
Updated Branches: refs/heads/1.5.1-SNAPSHOT 0fd190b60 -> 07fa748e0 ACCUMULO-1556 Clarify initialization error for used fs The Initialize class now generates clearer and more informative error messages if an initialized instance is discovered. The messages vary depending on whether instance.dfs

git commit: ACCUMULO-1556 Clarify initialization error for used fs

2013-12-02 Thread vines
Updated Branches: refs/heads/1.4.5-SNAPSHOT 82477f08a -> 1b3d071a8 ACCUMULO-1556 Clarify initialization error for used fs The Initialize class now generates clearer and more informative error messages if an initialized instance is discovered. The messages vary depending on whether instance.dfs

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

2013-12-02 Thread elserj
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/811405af Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/811405af Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/811405

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

2013-12-02 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 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/29223f79 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29223f79 Diff: http://git-wip-us.apache.org/repos/asf/

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

2013-12-02 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 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/29223f79 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29223f79 Diff: http://git-wip-us.apache.org/repos/asf/

[1/2] git commit: ACCUMULO-1946 Note in the README about dfs.datanode.synconclose.

2013-12-02 Thread elserj
Updated Branches: refs/heads/1.6.0-SNAPSHOT 9b6b9cf10 -> 29223f796 ACCUMULO-1946 Note in the README about dfs.datanode.synconclose. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0fd190b6 Tree: http://git-wip-us.apa

[1/3] git commit: ACCUMULO-1946 Note in the README about dfs.datanode.synconclose.

2013-12-02 Thread elserj
Updated Branches: refs/heads/master f3a867741 -> 811405afe ACCUMULO-1946 Note in the README about dfs.datanode.synconclose. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0fd190b6 Tree: http://git-wip-us.apache.org/

git commit: ACCUMULO-1946 Note in the README about dfs.datanode.synconclose.

2013-12-02 Thread elserj
Updated Branches: refs/heads/1.5.1-SNAPSHOT 27c1d7708 -> 0fd190b60 ACCUMULO-1946 Note in the README about dfs.datanode.synconclose. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0fd190b6 Tree: http://git-wip-us.apa