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

2014-02-25 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: src/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/62580184 Tree:

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

2014-02-24 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceProxy.java src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/TracerTest.java Project:

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

2014-02-20 Thread bhavanki
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/src/main/java/org/apache/accumulo/test/functional/RunTests.java test/system/auto/TestUtils.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

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

2014-02-19 Thread bhavanki
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/auto/README Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6c268e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6c268e5

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

2014-01-27 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: conf/examples/1GB/native-standalone/accumulo-env.sh conf/examples/1GB/standalone/accumulo-env.sh conf/examples/2GB/native-standalone/accumulo-env.sh conf/examples/2GB/standalone/accumulo-env.sh

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

2014-01-22 Thread bhavanki
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/bd67c465 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd67c465 Diff:

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

2014-01-22 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java

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

2014-01-17 Thread bhavanki
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/52ef7c6e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/52ef7c6e Diff:

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

2014-01-07 Thread mdrob
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/7088004c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7088004c Diff:

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

2013-12-31 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/auto/simple/readwrite.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/89c99622 Tree:

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

2013-12-17 Thread ecn
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/144d9d5b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/144d9d5b Diff:

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

2013-12-12 Thread mdrob
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/5fa1a75e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5fa1a75e Diff:

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

2013-11-26 Thread ecn
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/11ba435a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11ba435a Diff: