2 commits

Author	SHA1	Message	Date
David Tootill	f93e618f67	Merge remote-tracking branch 'refs/remotes/containous/master' ... # Conflicts: # glide.lock # glide.yaml	2016-04-27 09:41:51 -07:00
emile	720912e880	Add kubernetes Ingress backend ... Signed-off-by: Emile Vauge <emile@vauge.com>	2016-04-22 13:57:00 +02:00