[06/11] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)

2014-01-15 Thread bhavanki
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d183132c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d183132c Diff: http://git-wip-us.apache.org/r

[06/11] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2014-01-13 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0603edbb Tree: h

[06/11] 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/dc70a30d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc70a30d Diff: http://git-wip-us.apache.org/repos/asf/

[06/11] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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