Repository: oozie Updated Branches: refs/heads/master 776af774c -> addcaaf4c
OOZIE-1693 UI timeout while loading job table (puru via rohini) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/addcaaf4 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/addcaaf4 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/addcaaf4 Branch: refs/heads/master Commit: addcaaf4c7e29cf833db332b59105cee77de748c Parents: 776af77 Author: Rohini Palaniswamy <[email protected]> Authored: Mon Mar 17 14:25:28 2014 -0700 Committer: Rohini Palaniswamy <[email protected]> Committed: Mon Mar 17 14:25:28 2014 -0700 ---------------------------------------------------------------------- release-log.txt | 1 + webapp/src/main/webapp/oozie-console.js | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/addcaaf4/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 59a955e..807e6be 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1693 UI timeout while loading job table (puru via rohini) OOZIE-1698 Action sharelib configuration document lacks the "oozie." prefix (qwertymaniac via rohini) OOZIE-1712 Oozie page does not render in Internet Explorer 9 on Windows (omaliuvanchuk via rohini) OOZIE-1720 Oozie Hive action doesn't honour mapred.job.name (mithun via rohini) http://git-wip-us.apache.org/repos/asf/oozie/blob/addcaaf4/webapp/src/main/webapp/oozie-console.js ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/oozie-console.js b/webapp/src/main/webapp/oozie-console.js index b1cd612..2742485 100644 --- a/webapp/src/main/webapp/oozie-console.js +++ b/webapp/src/main/webapp/oozie-console.js @@ -1596,6 +1596,7 @@ var coord_jobs_store = new Ext.data.JsonStore({ url: getOozieBase() + 'jobs' }) }); +coord_jobs_store.proxy.conn.timeout = 300000; coord_jobs_store.proxy.conn.method = "GET"; /* @@ -1615,6 +1616,7 @@ var jobs_store = new Ext.data.JsonStore({ url: getOozieBase() + 'jobs' }) }); +jobs_store.proxy.conn.timeout = 300000; jobs_store.proxy.conn.method = "GET"; /* @@ -1636,6 +1638,7 @@ var bundle_jobs_store = new Ext.data.JsonStore({ url: getOozieBase() + 'jobs' }) }); +bundle_jobs_store.proxy.conn.timeout = 300000; bundle_jobs_store.proxy.conn.method = "GET"; var configGridData = new Ext.data.JsonStore({ @@ -2060,6 +2063,7 @@ var timeZones_store = new Ext.data.JsonStore({ url: getOozieBase() + 'admin' + "/available-timezones" }) }); +timeZones_store.proxy.conn.timeout = 300000; timeZones_store.proxy.conn.method = "GET"; function showCoordJobContextMenu(thisGrid, rowIndex, cellIndex, e) {
