Skip to content

Commit

Permalink
Revert diego patch
Browse files Browse the repository at this point in the history
This reverts the following two commits:

commit 678cdae
Author: Colin Saliceti <c.saliceti@gmail.com>
Date:   Mon Mar 20 10:10:28 2017 +0000

    Use diego-patched release in jobs

    We only require the updated release in 2 jobs to fix the ssh upload
    issue:

    * ssh_proxy: the ssh connection is proxied through it
    * file_server: it serves the diego_ssh binary that is downloaded when
    apps are staged

    This should be reverted when diego is officially updated with the fix.

commit b83c5c4
Author: Colin Saliceti <c.saliceti@gmail.com>
Date:   Mon Mar 20 10:10:21 2017 +0000

    Add diego-patched release

    This release is based on diego 1.8.1 and has an updated gloang crypto
    library. This fixes issue:
    https://github.com/cloudfoundry/diego-ssh/issues/31
  • Loading branch information
henrytk committed Apr 18, 2017
1 parent 8dc8272 commit 1a64505
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions manifests/cf-manifest/manifest/000-base-cf-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ releases:
version: 1.8.1
url: https://bosh.io/d/github.com/cloudfoundry/diego-release?v=1.8.1
sha1: a8c9fdecf59a1fceb2837ac0cfbde6a939427adb
- name: diego-patched
version: 1.8.1
url: https://s3-eu-west-1.amazonaws.com/gds-paas-build-releases/diego-patched-1.8.1.tgz
sha1: 26f7599cfe41db8ecd335f19d7c8337cd2ac20e2
- name: garden-runc
version: 1.2.0
url: https://bosh.io/d/github.com/cloudfoundry/garden-runc-release?v=1.2.0
Expand Down
4 changes: 2 additions & 2 deletions manifests/cf-manifest/manifest/010-cf-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -480,11 +480,11 @@ jobs:
- name: datadog-consul-agent-client
release: datadog-for-cloudfoundry
- name: ssh_proxy
release: diego-patched
release: diego
- name: metron_agent
release: cf
- name: file_server
release: diego-patched
release: diego
- name: cfdot
release: diego
instances: 2
Expand Down

0 comments on commit 1a64505

Please sign in to comment.