nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject nifi git commit: NIFI-730: - Fixing capitalization to remain consistent.
Date Fri, 16 Oct 2015 14:47:13 GMT
Repository: nifi
Updated Branches:
  refs/heads/NIFI-730 a87240383 -> 570202eb3


NIFI-730:
- Fixing capitalization to remain consistent.

Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/570202eb
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/570202eb
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/570202eb

Branch: refs/heads/NIFI-730
Commit: 570202eb3059595394599300e810c22eb801d3cd
Parents: a872403
Author: Matt Gilman <matt.c.gilman@gmail.com>
Authored: Fri Oct 16 10:47:02 2015 -0400
Committer: Matt Gilman <matt.c.gilman@gmail.com>
Committed: Fri Oct 16 10:47:02 2015 -0400

----------------------------------------------------------------------
 .../org/apache/nifi/controller/queue/DropFlowFileState.java    | 6 +++---
 .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/570202eb/nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java
----------------------------------------------------------------------
diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java
b/nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java
index 32efcbb..0f258b0 100644
--- a/nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java
+++ b/nifi-api/src/main/java/org/apache/nifi/controller/queue/DropFlowFileState.java
@@ -21,11 +21,11 @@ package org.apache.nifi.controller.queue;
  */
 public enum DropFlowFileState {
 
-    WAITING_FOR_LOCK("Waiting for Destination Component to complete its action"),
+    WAITING_FOR_LOCK("Waiting for destination component to complete its action"),
     DROPPING_FLOWFILES("Dropping FlowFiles from queue"),
     FAILURE("Failed"),
-    CANCELED("Canceled by User"),
-    COMPLETE("Completed Successfully");
+    CANCELED("Canceled by user"),
+    COMPLETE("Completed successfully");
 
     private final String description;
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/570202eb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index 3bd9c54..e67472a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -895,7 +895,7 @@ nf.Actions = (function () {
             // prompt the user before emptying the queue
             nf.Dialog.showYesNoDialog({
                 headerText: 'Empty Queue',
-                dialogContent: 'Are you sure you want to empty this queue? All flowfiles
waiting at the time of the request will be removed.',
+                dialogContent: 'Are you sure you want to empty this queue? All FlowFiles
waiting at the time of the request will be removed.',
                 overlayBackground: false,
                 noText: 'Cancel',
                 yesText: 'Empty',


Mime
View raw message