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

2014-03-26 Thread busbey
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/be9cd71c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be9cd71c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/be9cd7

[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-26 Thread busbey
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: start/src/main/java/org/apache/accumulo/start/Main.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1140d007 Tree: http://git-wip-us.apache.org/re

[09/10] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-03-26 Thread busbey
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: start/src/main/java/org/apache/accumulo/start/Main.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a5a05523 Tree: http://git-wip-us.apache.org/re

[01/10] git commit: ACCUMULO-1945 added help to bin/accumulo

2014-03-26 Thread busbey
Repository: accumulo Updated Branches: refs/heads/1.4.5-SNAPSHOT 4ee0f6494 -> 3bf240429 refs/heads/1.5.2-SNAPSHOT d77cba39f -> 1140d0077 refs/heads/1.6.0-SNAPSHOT a64151e63 -> a5a055233 refs/heads/master abb545fe3 -> be9cd71c2 ACCUMULO-1945 added help to bin/accumulo Adding a check for t

[03/10] git commit: ACCUMULO-1945 added help to bin/accumulo

2014-03-26 Thread busbey
ACCUMULO-1945 added help to bin/accumulo Adding a check for the arg of help within the src/Main class should be sufficient for providing the help argument to bin/accumulo Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.

[02/10] git commit: ACCUMULO-1945 added help to bin/accumulo

2014-03-26 Thread busbey
ACCUMULO-1945 added help to bin/accumulo Adding a check for the arg of help within the src/Main class should be sufficient for providing the help argument to bin/accumulo Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.

[08/10] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-03-26 Thread busbey
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: start/src/main/java/org/apache/accumulo/start/Main.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a5a05523 Tree: http://git-wip-us.apache.org/re

[04/10] git commit: ACCUMULO-1945 added help to bin/accumulo

2014-03-26 Thread busbey
ACCUMULO-1945 added help to bin/accumulo Adding a check for the arg of help within the src/Main class should be sufficient for providing the help argument to bin/accumulo Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.

[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-26 Thread busbey
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: start/src/main/java/org/apache/accumulo/start/Main.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1140d007 Tree: http://git-wip-us.apache.org/re

[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-26 Thread busbey
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Conflicts: start/src/main/java/org/apache/accumulo/start/Main.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1140d007 Tree: http://git-wip-us.apache.org/re

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

2014-03-26 Thread kturner
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/abb545fe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/abb545fe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/abb545

[1/2] git commit: ACCUMULO-2520 GC changes : disallow a delete marker of hdfs://nn/, log a warning about invalid delete, and add test for bad delete markers

2014-03-26 Thread kturner
Repository: accumulo Updated Branches: refs/heads/master a042fd206 -> abb545fe3 ACCUMULO-2520 GC changes : disallow a delete marker of hdfs://nn/, log a warning about invalid delete, and add test for bad delete markers Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: htt

git commit: ACCUMULO-2520 GC changes : disallow a delete marker of hdfs://nn/, log a warning about invalid delete, and add test for bad delete markers

2014-03-26 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 20e2b0a6a -> a64151e63 ACCUMULO-2520 GC changes : disallow a delete marker of hdfs://nn/, log a warning about invalid delete, and add test for bad delete markers Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Com

svn commit: r903796 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/

2014-03-26 Thread mdrob
Author: mdrob Date: Wed Mar 26 18:36:43 2014 New Revision: 903796 Log: Publishing svnmucc operation to accumulo site by mdrob Added: websites/production/accumulo/content/ - copied from r903795, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs

svn commit: r1581991 - /accumulo/site/trunk/content/git.mdtext

2014-03-26 Thread mdrob
Author: mdrob Date: Wed Mar 26 18:32:30 2014 New Revision: 1581991 URL: http://svn.apache.org/r1581991 Log: Trying 4 space indent Modified: accumulo/site/trunk/content/git.mdtext Modified: accumulo/site/trunk/content/git.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/g

svn commit: r903795 - in /websites/staging/accumulo/trunk/content: ./ git.html

2014-03-26 Thread buildbot
Author: buildbot Date: Wed Mar 26 18:32:41 2014 New Revision: 903795 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/git.html Propchange: websites/staging/accumulo/trunk/content/ ---

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

2014-03-26 Thread ctubbsii
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/main/java/org/apache/accumulo/test/functional/RunTests.java test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-

[1/5] git commit: Fix recent warnings introduced by several tickets

2014-03-26 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master 624c1f93e -> a042fd206 Fix recent warnings introduced by several tickets ACCUMULO-2005 ACCUMULO-2182 ACCUMULO-2224 ACCUMULO-2234 ACCUMULO-2539 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apac

[5/5] git commit: ACCUMULO-2487 Fix javadoc problem (duplicate param) from prev commit

2014-03-26 Thread ctubbsii
ACCUMULO-2487 Fix javadoc problem (duplicate param) from prev commit Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a042fd20 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a042fd20 Diff: http://git-wip-us.ap

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

2014-03-26 Thread ctubbsii
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/0d0bb915 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0d0bb915 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0d0bb9

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

2014-03-26 Thread ctubbsii
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/main/java/org/apache/accumulo/test/functional/RunTests.java test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-

[1/3] git commit: Fix recent warnings introduced by several tickets

2014-03-26 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 67a11a8d9 -> 20e2b0a6a Fix recent warnings introduced by several tickets ACCUMULO-2005 ACCUMULO-2182 ACCUMULO-2224 ACCUMULO-2234 ACCUMULO-2539 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

[1/2] git commit: Fix recent warnings introduced by several tickets

2014-03-26 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 5413823d6 -> d77cba39f Fix recent warnings introduced by several tickets ACCUMULO-2005 ACCUMULO-2182 ACCUMULO-2224 ACCUMULO-2234 ACCUMULO-2539 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

git commit: Fix recent warnings introduced by several tickets

2014-03-26 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.4.5-SNAPSHOT 88761e05b -> 4ee0f6494 Fix recent warnings introduced by several tickets ACCUMULO-2005 ACCUMULO-2182 ACCUMULO-2224 ACCUMULO-2234 ACCUMULO-2539 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

[1/3] git commit: ACCUMULO-2555 Force use of known jline terminal

2014-03-26 Thread ecn
Repository: accumulo Updated Branches: refs/heads/master 36745b5a4 -> 624c1f93e ACCUMULO-2555 Force use of known jline terminal Some Jenkins builds appear to be having trouble with auto-detecting a JLine terminal, so we force it to unsupported (for minimal feature set). Project: http://git-w

[2/3] git commit: ACCUMULO-2552 use volume manager to find the instance id

2014-03-26 Thread ecn
ACCUMULO-2552 use volume manager to find the instance id Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67a11a8d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67a11a8d Diff: http://git-wip-us.apache.org/rep

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

2014-03-26 Thread ecn
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/624c1f93 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/624c1f93 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/624c1f

git commit: ACCUMULO-2552 use volume manager to find the instance id

2014-03-26 Thread ecn
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 9550296c8 -> 67a11a8d9 ACCUMULO-2552 use volume manager to find the instance id Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67a11a8d Tree: http://g

svn commit: r1581925 - /accumulo/site/trunk/content/git.mdtext

2014-03-26 Thread mdrob
Author: mdrob Date: Wed Mar 26 16:46:59 2014 New Revision: 1581925 URL: http://svn.apache.org/r1581925 Log: CMS commit to accumulo by mdrob Modified: accumulo/site/trunk/content/git.mdtext Modified: accumulo/site/trunk/content/git.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk

svn commit: r903779 - in /websites/staging/accumulo/trunk/content: ./ git.html

2014-03-26 Thread buildbot
Author: buildbot Date: Wed Mar 26 16:47:11 2014 New Revision: 903779 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/git.html Propchange: websites/staging/accumulo/trunk/content/ ---

git commit: ACCUMULO-2555 Force use of known jline terminal

2014-03-26 Thread mdrob
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT f3f54806d -> 9550296c8 ACCUMULO-2555 Force use of known jline terminal Some Jenkins builds appear to be having trouble with auto-detecting a JLine terminal, so we force it to unsupported (for minimal feature set). Project: http

svn commit: r1581847 - in /accumulo/site/branches/redesign14: content/css/accumulo.css templates/skeleton.html

2014-03-26 Thread bhavanki
Author: bhavanki Date: Wed Mar 26 14:05:00 2014 New Revision: 1581847 URL: http://svn.apache.org/r1581847 Log: Add content margins for larger displays, more spacing around content headers. Modified: accumulo/site/branches/redesign14/content/css/accumulo.css accumulo/site/branches/redesign

svn commit: r903752 - /websites/staging/accumulo/trunk/content/

2014-03-26 Thread buildbot
Author: buildbot Date: Wed Mar 26 14:05:12 2014 New Revision: 903752 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) Propchange: websites/staging/accumulo/trunk/content/