Murat Kabilov 307708435b Merge branch 'master' into feature/tests ...

# Conflicts:
#	pkg/cluster/k8sres.go
#	pkg/spec/types.go

2017-07-13 17:06:53 +02:00

..

cluster

Merge branch 'master' into feature/tests

2017-07-13 17:06:53 +02:00

controller

move cluster config struct to the spec package

2017-07-13 16:51:41 +02:00

spec

Merge branch 'master' into feature/tests

2017-07-13 17:06:53 +02:00

util

Configure load balancer on a per-cluster and operator-wide level (#57)

2017-06-30 13:38:49 +02:00