Chander G 5732a555cb Concat and merge service fields when merging compose files (#1186) (#1226) ... according to docker compose specs, certain fields are merged and certain others are concatented		2020-01-03 23:17:29 +08:00
..
bundle	Added sirupsen and updated all occurances	2017-11-27 12:28:46 +05:30
compose	Concat and merge service fields when merging compose files (#1186) (#1226)	2020-01-03 23:17:29 +08:00
loader.go	kubernetes-incubator -> kubernetes	2017-07-12 15:42:13 -04:00