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

2014-02-20 Thread ecn
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/decce44c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/decce44c Diff:

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

2014-01-10 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9f563741

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

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

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

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

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