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

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

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

2014-01-23 Thread kturner
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/182f1526 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/182f1526 Diff: http://git-wip-us.apache.org/repos/asf/

[3/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 Tree

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

2014-01-10 Thread ecn
Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/4822b131 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4

[3/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/1bddc574 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1bddc574 Diff: http://git-wip-us.apache.org/repos/asf/

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

2013-10-27 Thread elserj
Merge branch '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/bbaf3f93 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bbaf3f93 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bbaf3f