[2/3] git commit: ACCUMULO-2816 Ensure LocalWALRecovery looks at WAL.

2014-05-16 Thread busbey
ACCUMULO-2816 Ensure LocalWALRecovery looks at WAL. * changed to use of FileSystem api in test to avoid crc handling. * added better error message for reading an invalid wal * fixed v2 vs v3 magic header reading Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

[1/3] git commit: ACCUMULO-2816 Ensure LocalWALRecovery looks at WAL.

2014-05-16 Thread busbey
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT f61abc088 -> 244c1ab71 refs/heads/master 6b36d53a9 -> b510b766b ACCUMULO-2816 Ensure LocalWALRecovery looks at WAL. * changed to use of FileSystem api in test to avoid crc handling. * added better error message for reading an i

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

2014-05-16 Thread busbey
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b510b766 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b510b766 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b510b7

[7/7] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-05-16 Thread elserj
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31ebacfe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31ebacfe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31ebac

[1/3] git commit: ACCUMULO-2761: Add regex to remove everything after the last slash

2014-05-16 Thread dlmarion
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 0cdd5fd08 -> ff17423fa refs/heads/master 31ebacfec -> e0468b2e5 ACCUMULO-2761: Add regex to remove everything after the last slash Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.

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

2014-05-16 Thread dlmarion
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/246c415f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/246c415f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/246c41

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

2014-05-16 Thread mdrob
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a53d4ec0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a53d4ec0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a53d4e

[06/10] git commit: Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT

2014-05-16 Thread elserj
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a16f5998 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a

[1/3] git commit: ACCUMULO-2814 Specify absolute directory in test

2014-05-16 Thread mdrob
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT bd3c2f086 -> 5d2cf8704 refs/heads/master 29e6dee85 -> a53d4ec05 ACCUMULO-2814 Specify absolute directory in test In a real accumulo deployment we re-resolve relative paths based on ACCUMULO_HOME, which is good, but in test scen

[5/7] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-05-16 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0cdd5fd0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0cdd5fd0 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-05-16 Thread billie
Author: billie Date: Thu May 8 00:49:24 2014 New Revision: 908347 Log: Publishing svnmucc operation to accumulo site by billie Added: websites/production/accumulo/content/ - copied from r908346, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apido

[07/10] git commit: Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT

2014-05-16 Thread elserj
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a16f5998 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a

[1/5] ACCUMULO-1327 converted latex manual to asciidoc

2014-05-16 Thread billie
Repository: accumulo Updated Branches: refs/heads/master cd045729e -> 900d6abb0 http://git-wip-us.apache.org/repos/asf/accumulo/blob/900d6abb/docs/src/main/latex/accumulo_user_manual/chapters/table_design.tex -- diff --git a/do

[03/10] git commit: ACCUMULO-2764 Wrap the MAC process termination in a Callable to get timeout semantics

2014-05-16 Thread elserj
ACCUMULO-2764 Wrap the MAC process termination in a Callable to get timeout semantics Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/57f27635 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/57f27635 Diff: ht

[4/7] git commit: ACCUMULO-2758 Remove non-observed offset argument from private encodeColumnFamily method

2014-05-16 Thread elserj
ACCUMULO-2758 Remove non-observed offset argument from private encodeColumnFamily method 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/b2ecd1cd Tree: http://git-wip-us.apache.org/repos/asf/

[2/7] git commit: ACCUMULO-2758 Remove non-observed offset argument from private encodeColumnFamily method

2014-05-16 Thread elserj
ACCUMULO-2758 Remove non-observed offset argument from private encodeColumnFamily method 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/b2ecd1cd Tree: http://git-wip-us.apache.org/repos/asf/

[01/10] git commit: ACCUMULO-2764 Wrap the MAC process termination in a Callable to get timeout semantics

2014-05-16 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 72fd01ff2 -> 57f27635b refs/heads/1.6.1-SNAPSHOT 5d2cf8704 -> d54de55f5 refs/heads/master a53d4ec05 -> 8195930ab ACCUMULO-2764 Wrap the MAC process termination in a Callable to get timeout semantics Project: http://git-wip-

[35/50] [abbrv] git commit: ACCUMULO-2212 Fix UTF8 constant in ZooReaderWriterFactory

2014-05-16 Thread elserj
ACCUMULO-2212 Fix UTF8 constant in ZooReaderWriterFactory The merge of ACCUMULO-2212 work from the 1.6.1-SNAPSHOT branch introduced the use of Constants.UTF8, which does not exist in the master branch. This commit replaces that constant with a locally defined one. Project: http://git-wip-us.ap

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

2014-05-16 Thread elserj
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c91d5540 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c91d5540 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c91d55

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

2014-05-16 Thread ctubbsii
Merge branch '1.6.1-SNAPSHOT' Conflicts: docs/src/main/asciidoc/chapters/administration.txt Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6b36d53a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b3

[2/3] git commit: ACCUMULO-2812 Pass options to compiler for native lib

2014-05-16 Thread ctubbsii
ACCUMULO-2812 Pass options to compiler for native lib Use system default architecture options when compiling, instead of forcing -m64. Allow passing additional arguments (USERFLAGS) to specify additional compiler options. Set USERFLAGS with the build_native_library.sh's command-line argume

[5/8] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT -sours

2014-05-16 Thread ctubbsii
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT -sours Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e86bfc29 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e86bfc29 Diff: http://git-wip-us.apache.org/rep

[1/3] git commit: ACCUMULO-2811: Move directory creation to the constructor so that the directory creation is only attempted once. Check that the directory does not exist first.

2014-05-16 Thread dlmarion
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT ff17423fa -> fd80bc615 refs/heads/master e0468b2e5 -> 246c415fa ACCUMULO-2811: Move directory creation to the constructor so that the directory creation is only attempted once. Check that the directory does not exist first. P

[06/50] [abbrv] git commit: ACCUMULO-378 Fix up some tests that failed on jenkins and remove now unnecessary test

2014-05-16 Thread elserj
ACCUMULO-378 Fix up some tests that failed on jenkins and remove now unnecessary test Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f247c8e2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f247c8e2 Diff: ht

[1/3] git commit: ACCUMULO-2821 Add/Update docs for building native lib

2014-05-16 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 7ccf20269 -> f61abc088 refs/heads/master c312fa6f8 -> 6b36d53a9 ACCUMULO-2821 Add/Update docs for building native lib Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf

[7/8] git commit: ACCUMULO-2762 Use all optimizations by default

2014-05-16 Thread ctubbsii
ACCUMULO-2762 Use all optimizations by default Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/10ce7af8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/10ce7af8 Diff: http://git-wip-us.apache.org/repos/asf/acc

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

2014-05-16 Thread ctubbsii
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18591bc9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18591bc9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18591b

[2/3] git commit: ACCUMULO-2821 Add/Update docs for building native lib

2014-05-16 Thread ctubbsii
ACCUMULO-2821 Add/Update docs for building native lib Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f61abc08 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f61abc08 Diff: http://git-wip-us.apache.org/repos/

[1/8] git commit: ACCUMULO-2762 Use more compiler optimizations for 1.5 native lib

2014-05-16 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT f83f9f968 -> c16f10582 refs/heads/1.6.1-SNAPSHOT 01e1181bf -> 10ce7af89 refs/heads/master 18591bc98 -> dc69bc80a ACCUMULO-2762 Use more compiler optimizations for 1.5 native lib Project: http://git-wip-us.apache.org/repos/as

[1/7] git commit: Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT

2014-05-16 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 57f27635b -> b2ecd1cdb refs/heads/1.6.1-SNAPSHOT d54de55f5 -> 0cdd5fd08 refs/heads/master 8195930ab -> 31ebacfec Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT Project:

[1/3] git commit: ACCUMULO-2813 Basic log4j appender configuration for new server modules at test time.

2014-05-16 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT c57bc8d5d -> bd3c2f086 refs/heads/master a119746bf -> 29e6dee85 ACCUMULO-2813 Basic log4j appender configuration for new server modules at test time. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http:

[3/8] git commit: ACCUMULO-2762 Use more compiler optimizations for 1.5 native lib

2014-05-16 Thread ctubbsii
ACCUMULO-2762 Use more compiler optimizations for 1.5 native lib Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c16f1058 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c16f1058 Diff: http://git-wip-us.apache

[3/3] git commit: Merge ACCUMULO-2761 from branch '1.6.1-SNAPSHOT'

2014-05-16 Thread dlmarion
Merge ACCUMULO-2761 from branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e0468b2e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e0468b2e Diff: http://git-wip-us.apache.org/repos/asf/a

[2/8] git commit: ACCUMULO-2762 Use more compiler optimizations for 1.5 native lib

2014-05-16 Thread ctubbsii
ACCUMULO-2762 Use more compiler optimizations for 1.5 native lib Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c16f1058 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c16f1058 Diff: http://git-wip-us.apache

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

2014-05-16 Thread ctubbsii
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c312fa6f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c312fa6f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c312fa

[3/6] git commit: ACCUMULO-2818 Create standard keystore for Jetty

2014-05-16 Thread ctubbsii
ACCUMULO-2818 Create standard keystore for Jetty Ensure keystore password is the same as the password for the default key it holds. Remove extraneous parameter for truststore generation. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/

[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-05-16 Thread ctubbsii
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/01e1181b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/01e1181b Diff: http://git-wip-us.apache.org/repos/asf/

[8/8] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-05-16 Thread ctubbsii
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc69bc80 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc69bc80 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc69bc

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-05-16 Thread ctubbsii
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/01e1181b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/01e1181b Diff: http://git-wip-us.apache.org/repos/asf/

[4/8] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT -sours

2014-05-16 Thread ctubbsii
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT -sours Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e86bfc29 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e86bfc29 Diff: http://git-wip-us.apache.org/rep

[6/8] git commit: ACCUMULO-2762 Use all optimizations by default

2014-05-16 Thread ctubbsii
ACCUMULO-2762 Use all optimizations by default Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/10ce7af8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/10ce7af8 Diff: http://git-wip-us.apache.org/repos/asf/acc

[1/6] git commit: ACCUMULO-2818 Create standard keystore for Jetty

2014-05-16 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT b2ecd1cdb -> f83f9f968 refs/heads/1.6.1-SNAPSHOT fd80bc615 -> 01e1181bf refs/heads/master 246c415fa -> 18591bc98 ACCUMULO-2818 Create standard keystore for Jetty Ensure keystore password is the same as the password for the

[1/3] git commit: ACCUMULO-2812 Pass options to compiler for native lib

2014-05-16 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 10ce7af89 -> 7ccf20269 refs/heads/master dc69bc80a -> c312fa6f8 ACCUMULO-2812 Pass options to compiler for native lib Use system default architecture options when compiling, instead of forcing -m64. Allow passing additional

[2/6] git commit: ACCUMULO-2818 Create standard keystore for Jetty

2014-05-16 Thread ctubbsii
ACCUMULO-2818 Create standard keystore for Jetty Ensure keystore password is the same as the password for the default key it holds. Remove extraneous parameter for truststore generation. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/

[47/50] [abbrv] git commit: ACCUMULO-2575 Fix bug in GC where files were being prematurely deleted and add tests to catch

2014-05-16 Thread elserj
ACCUMULO-2575 Fix bug in GC where files were being prematurely deleted and add tests to catch After realizing the deadlock potential when not having tservers write the initial replication entry to the metadata table, the garbage collection code was not updated for the shift in data layout. On a

[2/3] git commit: ACCUMULO-2761: Add regex to remove everything after the last slash

2014-05-16 Thread dlmarion
ACCUMULO-2761: Add regex to remove everything after the last slash Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ff17423f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff17423f Diff: http://git-wip-us.apac

[2/3] git commit: ACCUMULO-2813 Basic log4j appender configuration for new server modules at test time.

2014-05-16 Thread elserj
ACCUMULO-2813 Basic log4j appender configuration for new server modules at test time. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd3c2f08 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd3c2f08 Diff: ht

[07/50] [abbrv] git commit: ACCUMULO-378 Make sure to flush to get the entry written to metadata

2014-05-16 Thread elserj
ACCUMULO-378 Make sure to flush to get the entry written to metadata Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f584685a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f584685a Diff: http://git-wip-us.ap

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

2014-05-16 Thread elserj
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/29e6dee8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29e6dee8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/29e6de

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

2014-05-16 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/652253e0 Tree: htt

[2/3] git commit: ACCUMULO-2814 Specify absolute directory in test

2014-05-16 Thread mdrob
ACCUMULO-2814 Specify absolute directory in test In a real accumulo deployment we re-resolve relative paths based on ACCUMULO_HOME, which is good, but in test scenario having it set just messed things up. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apa

[09/10] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

2014-05-16 Thread elserj
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8195930a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8195930a Diff: http://git-wip-

[6/7] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-05-16 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0cdd5fd0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0cdd5fd0 Diff: http://git-wip-us.apache.org/repos/asf/

[02/10] git commit: ACCUMULO-2764 Wrap the MAC process termination in a Callable to get timeout semantics

2014-05-16 Thread elserj
ACCUMULO-2764 Wrap the MAC process termination in a Callable to get timeout semantics Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/57f27635 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/57f27635 Diff: ht

[2/3] git commit: ACCUMULO-2811: Move directory creation to the constructor so that the directory creation is only attempted once. Check that the directory does not exist first.

2014-05-16 Thread dlmarion
ACCUMULO-2811: Move directory creation to the constructor so that the directory creation is only attempted once. Check that the directory does not exist first. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fd80bc61 Tr

[10/10] git commit: Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT

2014-05-16 Thread elserj
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d54de55f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d

[3/7] git commit: ACCUMULO-2758 Remove non-observed offset argument from private encodeColumnFamily method

2014-05-16 Thread elserj
ACCUMULO-2758 Remove non-observed offset argument from private encodeColumnFamily method 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/b2ecd1cd Tree: http://git-wip-us.apache.org/repos/asf/

[04/10] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-05-16 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/652253e0 Tree: htt