# HG changeset patch
# User jbe
# Date 1427053153 -3600
# Node ID 4dc2ec12643c6ccc39847e765d7b38e5d9e70d0b
# Parent a7e4f552f8a5a8275a6dca8dcb8d8c95a36e7ad0# Parent 2b2bc360aabc9966d143020bb6beca8d53e8f55c
merge
diff -r a7e4f552f8a5 -r 4dc2ec12643c framework/env/trace/_render_sub_tree.lua
--- a/framework/env/trace/_render_sub_tree.lua Sun Mar 22 20:16:54 2015 +0100
+++ b/framework/env/trace/_render_sub_tree.lua Sun Mar 22 20:39:13 2015 +0100
@@ -48,7 +48,7 @@
' | ',
'total:',
' ',
- '', format_triple(total_real_time, total_proc_time, total_db_time), '',
+ '', format_triple(total_real_time, total_proc_time, total_db_time), ' ms',
''
)
end
@@ -209,7 +209,8 @@
else
slot.put(encode.html(node.command))
end
- slot.put(" (execution time: ", format_time(node.execution_time), ")")
+ slot.put(" ")
+ slot.put('', format_time(node.execution_time), "")
close();
elseif node_type == "error" then
open("error")