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

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:

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

ACCUMULO-2758 Remove non-observed offset argument from private encodeColumnFamily method Signed-off-by: Josh Elser els...@apache.org Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b2ecd1cd Tree:

[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.

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

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

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:

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

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:

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

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:

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

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:

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

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

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:

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

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/7] git commit: Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT

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/8] git commit: ACCUMULO-2762 Use more compiler optimizations for 1.5 native lib

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:

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

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:

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

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: