Skip to content

Commit

Permalink
Release v2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
moul committed Oct 24, 2017
1 parent e134ab2 commit c10162f
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .goxc.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"BuildConstraints": "darwin,!386 linux windows freebsd,!arm",
"ResourcesExclude": "*.go .goxc-temp",
"MainDirsExclude": "vendor,Godeps,testdata",
"PackageVersion": "2.6.0+dev",
"PackageVersion": "2.7.0",
"ConfigVersion": "0.9"
}
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ USAGE:
assh [global options] command [command options] [arguments...]

VERSION:
2.6.0 (HEAD)
2.7.0 (HEAD)

AUTHOR(S):
Manfred Touron <https://github.com/moul/advanced-ssh-config>
Expand Down Expand Up @@ -797,7 +797,7 @@ Convert an `assh.yml` file to `ssh_config` format:

```console
$ http --form POST https://assh-dev.herokuapp.com/assh-to-ssh assh_config=@~/.ssh/assh.d/test.yml | jq -r .ssh_config
# This file was automatically generated by assh v2.6.0
# This file was automatically generated by assh v2.7.0
# on 2017-01-31 21:06:56 +0000 UTC, based on ~/.ssh/assh.yml
#
# more info: https://github.com/moul/advanced-ssh-config
Expand Down Expand Up @@ -829,7 +829,7 @@ Host *

## Changelog

### master (unreleased)
### v2.7.0 (2017-10-24)

* Automatically detect available shell when using the 'exec' hook ([#254](https://github.com/moul/advanced-ssh-config/issues/254))
* Automatically detect if `-q` is passed to the parent ssh process to disable logging ([#253](https://github.com/moul/advanced-ssh-config/pull/253)) by [@cao](https://github.com/cao)
Expand All @@ -847,7 +847,7 @@ Host *
* Generate full assh binary path in ~/.ssh/config ([#148](https://github.com/moul/advanced-ssh-config/issues/148))
* Initial version of `assh ping` command

[Full commits list](https://github.com/moul/advanced-ssh-config/compare/v2.6.0...master)
[Full commits list](https://github.com/moul/advanced-ssh-config/compare/v2.6.0...v2.7.0)

### v2.6.0 (2017-02-03)

Expand Down
6 changes: 3 additions & 3 deletions examples/gateways-wildcard/ssh_config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was automatically generated by assh v2.6.0+dev
# on 2017-04-07 13:24:43 +0200 CEST, based on ~/.ssh/assh.yml
# This file was automatically generated by assh v2.7.0
# on 2017-10-24 10:10:29 +0200 CEST, based on ~/.ssh/assh.yml
#
# more info: https://github.com/moul/advanced-ssh-config

Expand All @@ -12,4 +12,4 @@ Host tricky

# global configuration
Host *
ProxyCommand ./assh connect --port=%p %h
ProxyCommand /Users/moul/Git/moul/advanced-ssh-config/assh connect --port=%p %h
2 changes: 1 addition & 1 deletion examples/readme-example-gateways/graphviz.dot
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
digraph G {
"hostb"->"hosta"[ color=red, label=1 ];
"hostc"->"hostb"[ color=red, label=1 ];
"hostd"->"hosta"[ color=red, label=1 ];
"hostb"->"hosta"[ color=red, label=1 ];
"hosta" [ color=blue ];
"hostb" [ color=blue ];
"hostc" [ color=blue ];
Expand Down
Binary file modified examples/readme-example-gateways/graphviz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions examples/readme-example-gateways/ssh_config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was automatically generated by assh v2.6.0+dev
# on 2017-04-07 13:24:43 +0200 CEST, based on ~/.ssh/assh.yml
# This file was automatically generated by assh v2.7.0
# on 2017-10-24 10:10:29 +0200 CEST, based on ~/.ssh/assh.yml
#
# more info: https://github.com/moul/advanced-ssh-config

Expand All @@ -21,4 +21,4 @@ Host hostd

# global configuration
Host *
ProxyCommand ./assh connect --port=%p %h
ProxyCommand /Users/moul/Git/moul/advanced-ssh-config/assh connect --port=%p %h
2 changes: 1 addition & 1 deletion examples/readme-full-example/graphviz.dot
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
digraph G {
"bart"->"homer"[ color=red, label=1 ];
"vm-*.school.com"->"schoolgw"[ color=red, label=1 ];
"vm-*.school.com"->"schooltemplate"[ color=black, style=dashed ];
"bart"->"homer"[ color=red, label=1 ];
"bart" [ color=blue ];
"homer" [ color=blue ];
"schoolgw" [ color=blue ];
Expand Down
Binary file modified examples/readme-full-example/graphviz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions examples/readme-full-example/ssh_config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was automatically generated by assh v2.6.0+dev
# on 2017-04-07 13:24:43 +0200 CEST, based on ~/.ssh/assh.yml
# This file was automatically generated by assh v2.7.0
# on 2017-10-24 10:10:29 +0200 CEST, based on ~/.ssh/assh.yml
#
# more info: https://github.com/moul/advanced-ssh-config

Expand Down Expand Up @@ -105,4 +105,4 @@ Host *
Port 22
User bob
ProxyCommand /Users/moul/bin/assh connect --port=%p %h
# Hooks: {"OnConnect":["exec echo {{.}} | jq . \u003e\u003e ~/.ssh/last_connected_host.txt","notify New SSH connection to {{.Host.Prototype}} at {{.Stats.ConnectedAt}}","write New SSH connection to {{.Host.Prototype}}"],"OnDisconnect":["write SSH connection to {{.Host.HostName}} closed, {{.Stats.WrittenBytes }} bytes written in {{.Stats.ConnectionDuration}} ({{.Stats.AverageSpeed}}bps)","notify SSH connection to {{.Host.HostName}} closed, {{.Stats.WrittenBytes }} bytes written in {{.Stats.ConnectionDuration}} ({{.Stats.AverageSpeed}}bps)"]}
# Hooks: {"AfterConfigWrite":["exec cat ~/.ssh/my-heroku-generated-config \u003e\u003e {{.SSHConfigPath}}","notify \"{{.SSHConfigPath}} has been rewritten\""],"BeforeConfigWrite":["exec set -x; cp {{.SSHConfigPath}} {{.SSHConfigPath}}.bkp"],"OnConnect":["exec echo {{.}} | jq . \u003e\u003e ~/.ssh/last_connected_host.txt","notify New SSH connection to {{.Host.Prototype}} at {{.Stats.ConnectedAt}}","write New SSH connection to {{.Host.Prototype}}"],"OnDisconnect":["write SSH connection to {{.Host.HostName}} closed, {{.Stats.WrittenBytes }} bytes written in {{.Stats.ConnectionDuration}} ({{.Stats.AverageSpeed}}bps)","notify SSH connection to {{.Host.HostName}} closed, {{.Stats.WrittenBytes }} bytes written in {{.Stats.ConnectionDuration}} ({{.Stats.AverageSpeed}}bps)"]}
6 changes: 3 additions & 3 deletions examples/readme-troubleshooting-gateways/ssh_config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was automatically generated by assh v2.6.0+dev
# on 2017-04-07 13:24:43 +0200 CEST, based on ~/.ssh/assh.yml
# This file was automatically generated by assh v2.7.0
# on 2017-10-24 10:10:30 +0200 CEST, based on ~/.ssh/assh.yml
#
# more info: https://github.com/moul/advanced-ssh-config

Expand All @@ -12,4 +12,4 @@ Host myserver

# global configuration
Host *
ProxyCommand ./assh connect --port=%p %h
ProxyCommand /Users/moul/Git/moul/advanced-ssh-config/assh connect --port=%p %h
4 changes: 2 additions & 2 deletions examples/resolvecommand-with-gateway/ssh_config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was automatically generated by assh v2.6.0+dev
# on 2017-05-29 22:53:58 +0200 CEST, based on ~/.ssh/assh.yml
# This file was automatically generated by assh v2.7.0
# on 2017-10-24 10:10:30 +0200 CEST, based on ~/.ssh/assh.yml
#
# more info: https://github.com/moul/advanced-ssh-config

Expand Down
4 changes: 2 additions & 2 deletions examples/resolvecommand-with-gateway/test.log
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ level=info msg=" Port 22"
level=info msg=" # HostName: a"
level=info msg=" # Gateways: [b/c]"
level=info msg=" # ResolveCommand: echo h=%h p=%p name=%name n=%n g=%g"
level=debug msg="Host: {\"Port\":\"22\",\"HostName\":\"a\",\"Gateways\":[\"b/c\"],\"ResolveCommand\":\"echo h=%h p=%p name=%name n=%n g=%g\",\"Hooks\":{}}"
level=debug msg="Host: {"Port":"22","HostName":"a","Gateways":["b/c"],"ResolveCommand":"echo h=%h p=%p name=%name n=%n g=%g","Hooks":{}}"
level=debug msg=Proxying
level=debug msg="Trying gateways: [b/c]"
level=debug msg="Resolving host: \"a\" using command: \"echo h=%h p=%p name=%name n=%n g=%g\""
level=debug msg="Resolving host: "a" using command: "echo h=%h p=%p name=%name n=%n g=%g""
level=debug msg="Resolved host is: h=a p=22 name=a n=a g=b/c"
level=debug msg="Using gateway 'b/c': ssh -W h=a p=22 name=a n=a g=b/c:22 %name"
level=debug msg="ProxyCommand: ssh -W h=a p=22 name=a n=a g=b/c:22 b/c"
Expand Down
4 changes: 2 additions & 2 deletions examples/same-option-multiple-times/ssh_config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was automatically generated by assh v2.6.0+dev
# on 2017-05-29 21:25:07 +0200 CEST, based on ~/.ssh/assh.yml
# This file was automatically generated by assh v2.7.0
# on 2017-10-24 10:10:30 +0200 CEST, based on ~/.ssh/assh.yml
#
# more info: https://github.com/moul/advanced-ssh-config

Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package version

var (
// Version should be updated by hand at each release
VERSION = "2.6.0+dev"
VERSION = "2.7.0"
// GitCommit will be overwritten automatically by the build system
GITCOMMIT = "HEAD"
)

0 comments on commit c10162f

Please sign in to comment.