You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2017/11/14 18:09:42 UTC
nifi git commit: NIFI-4576 - rewording processors / cores
Repository: nifi
Updated Branches:
refs/heads/master ad2d12a20 -> b9c53083c
NIFI-4576 - rewording processors / cores
NIFI-4576: Rewording processor load average to core load average
Signed-off-by: Matthew Burgess <ma...@apache.org>
This closes #2267
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b9c53083
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b9c53083
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b9c53083
Branch: refs/heads/master
Commit: b9c53083c4f7c5218b6438af89baed19d62444fa
Parents: ad2d12a
Author: Pierre Villard <pi...@gmail.com>
Authored: Fri Nov 10 20:14:00 2017 +0100
Committer: Matthew Burgess <ma...@apache.org>
Committed: Tue Nov 14 13:08:53 2017 -0500
----------------------------------------------------------------------
.../WEB-INF/partials/summary/system-diagnostics-dialog.jsp | 6 +++---
.../src/main/webapp/js/nf/cluster/nf-cluster-table.js | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/b9c53083/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp
index 4ad62a9..173791a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp
@@ -149,7 +149,7 @@
<div id="system-tab-content"class="configuration-tab">
<div class="settings-left">
<div class="setting">
- <div class="setting-name">Available Processors:</div>
+ <div class="setting-name">Available Cores:</div>
<div class="setting-field">
<div id="available-processors"></div>
</div>
@@ -159,8 +159,8 @@
<div class="settings-right">
<div class="setting">
<div class="setting-name">
- Processor Load Average:
- <div class="fa fa-question-circle" alt="Info" title="Processor load average for the last minute. Not available on all platforms."></div>
+ Core Load Average:
+ <div class="fa fa-question-circle" alt="Info" title="Core load average for the last minute. Not available on all platforms."></div>
</div>
<div class="setting-field">
<div id="processor-load-average"></div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/b9c53083/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
index 0c94b31..ef1d2f9 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js
@@ -145,7 +145,7 @@
{
id: 'processors',
field: 'processors',
- name: 'Processors',
+ name: 'Cores',
sortable: true,
resizable: true,
cssClass: 'cell-right',
@@ -155,7 +155,7 @@
{
id: 'processorLoadAverage',
field: 'processorLoadAverage',
- name: 'Processor Load Average',
+ name: 'Core Load Average',
sortable: true,
resizable: true,
cssClass: 'cell-right',