luci-0.10: Merge r6979

This commit is contained in:
Manuel Munz 2011-04-04 11:53:51 +00:00
parent 62b8fe1515
commit 3490606f2a
2 changed files with 2 additions and 2 deletions

View file

@ -293,7 +293,7 @@ function public_status_json()
end
rv[#rv+1] = {
time = os.date("%c"),
time = os.date("%a, %d %b %Y %H:%M:%S UTC"),
uptime = twa.date_format(tonumber(sys.uptime())),
load = string.format("%.2f, %.2f, %.2f", load1, load5, load15),
mem = mem,

View file

@ -6,7 +6,7 @@ local twa = require "luci.tools.webadmin"
-- System
local system, model, memtotal, memcached, membuffers, memfree, bogomips = sys.sysinfo()
local uptime = twa.date_format(tonumber(sys.uptime()))
local_time = os.date("%c")
local_time = os.date("%a, %d %b %Y %H:%M:%S UTC")
local load1, load5, load15 = sys.loadavg()
local load = string.format("%.2f, %.2f, %.2f", load1, load5, load15)