diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-02-25 14:42:28 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-02-25 14:42:28 +0200 |
| commit | ecdec00e4d874918b4daf35d17f05de7bb10a88d (patch) | |
| tree | b6fd9f425887a3c4b2a98b1d486164c1e0d0ce3b /Software/Visual_Studio/Web/Tango.MachineService/Controllers | |
| parent | e7c2fd845a2a166b2a5fb9961081331839636469 (diff) | |
| parent | 602f49b2b0eb1f032f3dead60e8bf499ceca0a7b (diff) | |
| download | Tango-ecdec00e4d874918b4daf35d17f05de7bb10a88d.tar.gz Tango-ecdec00e4d874918b4daf35d17f05de7bb10a88d.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/Web/Tango.MachineService/Controllers')
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs index 29cc067d6..1a66d0fe6 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs @@ -206,7 +206,7 @@ namespace Tango.MachineService.Controllers /// <exception cref="System.ArgumentException">Invalid Token.</exception> [HttpPost] [JwtTokenFilter] - public UploadCompletedResponse NotifyUploadCompleted(UploadCompletedRequest request) + public UploadCompletedResponse NotifyVersionUploadCompleted(UploadCompletedRequest request) { MachineStudioPendingUpload upload = _pendingUploads.FirstOrDefault(x => x.Token == request.Token); diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs index 0f36fa040..b937afbb0 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs @@ -190,7 +190,7 @@ namespace Tango.MachineService.Controllers [HttpPost] [JwtTokenFilter] - public CheckForUpdateResponse CheckForUpdate(CheckForUpdateRequest request) + public CheckForUpdateResponse CheckForUpdates(CheckForUpdateRequest request) { CheckForUpdateResponse response = new CheckForUpdateResponse(); @@ -364,7 +364,7 @@ namespace Tango.MachineService.Controllers [HttpPost] [JwtTokenFilter] - public UploadCompletedResponse NotifyUploadCompleted(UploadCompletedRequest request) + public UploadCompletedResponse NotifyVersionUploadCompleted(UploadCompletedRequest request) { PPCPendingUpload upload = _pendingUploads.FirstOrDefault(x => x.Token == request.Token); |