Oleksii Kliukin 6102b0368c Merge remote-tracking branch 'origin/databases-rest-endpoint' into databases-rest-endpoint ... # Conflicts: # pkg/apiserver/apiserver.go # pkg/controller/status.go		2017-12-22 13:08:50 +01:00
..
apiserver	WIP: Hold the proper locks while examining the list of databases.	2017-12-22 13:06:11 +01:00
cluster	WIP: Hold the proper locks while examining the list of databases.	2017-12-22 13:06:11 +01:00
controller	Merge remote-tracking branch 'origin/databases-rest-endpoint' into databases-rest-endpoint	2017-12-22 13:08:50 +01:00
spec	Fix an issue when not assigning the merge result.	2017-12-04 10:49:25 +01:00
util	Scalyr agent sidecar for log shipping (#190)	2017-12-21 15:34:26 +01:00