klizhentas b57e288540 Merge branch 'master' into pre-production ...

Conflicts:
	lib/srv/srv.go

2016-02-26 09:21:43 -08:00

..

ctx.go

reverse tunnel roundrobin, refs #114

2016-02-19 20:56:25 -08:00

exec.go

reverse tunnel roundrobin, refs #114

2016-02-19 20:56:25 -08:00

fwd.go

Replaced our own logger with logrus

2016-02-02 17:53:21 -08:00

hangouts.go

Added auth client retries to fix rare client errors

2016-02-24 19:52:08 +03:00

ls.go

Replaced our own logger with logrus

2016-02-02 17:53:21 -08:00

mux.go

Replaced our own logger with logrus

2016-02-02 17:53:21 -08:00

proxy.go

Fixed tsh tests, changed tests ports

2016-02-25 20:30:44 +03:00

resolver.go

Apply apache license to teleport

2015-10-31 11:56:49 -07:00

sess.go

add support for nodes and sessions

2016-02-25 17:10:23 -08:00

sites.go

Fixed client test, fixed srv test, minor changes

2016-02-22 22:38:37 +03:00

srv_test.go

Changed limiter initialization

2016-02-26 16:59:35 +03:00

srv.go

Merge branch 'master' into pre-production

2016-02-26 09:21:43 -08:00

subsystem.go

Joined regular and hangouts reverse tunnels, changed authentication, minor fixes

2016-02-19 00:23:22 +03:00

term.go

Merged: added user mapping

2016-02-05 03:29:49 +03:00

tun.go

Replaced our own logger with logrus

2016-02-02 17:53:21 -08:00