Merge pull request #867 from jwforres/bug_1300899_cancelling

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/build.js

@@ -139,7 +139,7 @@ angular.module('openshiftConsole')
               // TODO: common alerts service to eliminate duplication
               $scope.alerts["cancel"] = {
                 type: "success",
-                message: "Cancelling build " + build.metadata.name + " of " + $scope.buildConfigName + "."
+                message: "Cancelled build " + build.metadata.name + " of " + $scope.buildConfigName + "."
               };
             }, function reject(result) {
               // TODO: common alerts service to eliminate duplication

app/scripts/services/deployments.js

@@ -178,7 +178,7 @@ angular.module("openshiftConsole")
           $scope.alerts["cancel"] =
             {
               type: "success",
-              message: "Cancelling deployment " + deploymentName + " of " + deploymentConfigName + ".",
+              message: "Cancelled deployment " + deploymentName + " of " + deploymentConfigName + ".",
             };
         },
         function(result) {

dist/scripts/scripts.js

@@ -2514,7 +2514,7 @@ var f = a.metadata.name, g = c("annotation")(a, "deploymentConfig"), h = angular
 h.metadata.annotations[i] = "true", h.metadata.annotations[j] = "The deployment was cancelled by the user", b.update("replicationcontrollers", f, h, d).then(function() {
 e.alerts = e.alerts || {}, e.alerts.cancel = {
 type:"success",
-message:"Cancelling deployment " + f + " of " + g + "."
+message:"Cancelled deployment " + f + " of " + g + "."
 };
 }, function(a) {
 e.alerts = e.alerts || {}, e.alerts.cancel = {
@@ -5283,7 +5283,7 @@ a.showSecret = !0;
 d.cancelBuild(a.build, a.buildConfigName, i).then(function(b) {
 a.alerts.cancel = {
 type:"success",
-message:"Cancelling build " + b.metadata.name + " of " + a.buildConfigName + "."
+message:"Cancelled build " + b.metadata.name + " of " + a.buildConfigName + "."
 };
 }, function(c) {
 a.alerts.cancel = {