From: Vincent Le Gallic Date: Fri, 6 Sep 2013 22:46:34 +0000 (+0200) Subject: Merge branch 'master' into perso X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=43e807910d1e37a8baa77eb8676f48447e4155fc;p=config-20-100.git Merge branch 'master' into perso Conflicts: .ssh/config --- 43e807910d1e37a8baa77eb8676f48447e4155fc diff --cc .ssh/config index 948571e,cee0f71..04f9bd2 --- a/.ssh/config +++ b/.ssh/config @@@ -864,7 -718,8 +864,8 @@@ Host hexagon hexagon.federez.ne Host tselin tselin.clietu tselin.clietu.ens-cachan.fr acces1.rip.ens-cachan.fr acces1 rip HostName tselin.clietu.ens-cachan.fr - User loginENS - ProxyCommand ssh loginENS@tahines.ens-cachan.fr -W %h:%p + User vlegalli ++ ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p Host tahines.ens-cachan.fr tahines2 tahines HostName tahines.ens-cachan.fr