[04/14] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

2014-03-25 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/22f95590 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/22f95590 Diff: http://git-wip-us.apache.org/repos/asf/

[04/14] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (--strategy ours)

2014-03-24 Thread mdrob
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (--strategy ours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/70e50f31 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/70e50f31 Diff: http://git-wip-us.apa

[04/14] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours)

2014-03-11 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/19231a25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/19231a25 Diff: http://git-wip-us.apache.org/r