|  | 253f345fc4 | outposts: save certificate fingerprint and check before re-fetching to cleanup logs Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> | 2021-07-21 23:53:43 +02:00 |  | 
			
				
					|  | b3159a74e5 | Merge branch 'master' into inbuilt-proxy Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
# Conflicts:
#	Dockerfile
#	internal/outpost/ak/api.go
#	internal/outpost/ak/api_uag.go
#	internal/outpost/ak/global.go
#	internal/outpost/ldap/api_tls.go
#	internal/outpost/ldap/instance_bind.go
#	internal/outpost/ldap/utils.go
#	internal/outpost/proxy/api_bundle.go
#	outpost/go.mod
#	outpost/go.sum
#	outpost/pkg/ak/cert.go | 2021-07-17 12:49:38 +02:00 |  | 
			
				
					|  | 3dc9e247d5 | Merge branch 'master' into inbuilt-proxy Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
# Conflicts:
#	internal/constants/constants.go
#	outpost/pkg/version.go | 2021-07-02 16:23:30 +02:00 |  | 
			
				
					|  | ff42663d3c | root: more code merging Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> | 2021-06-29 16:21:00 +02:00 |  | 
			
				
					|  | 690b7be1d8 | root: initial merging of outpost and main project Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> | 2021-06-16 12:02:02 +02:00 |  |