FAREAST\canwan f048ddcec6 Merge remote-tracking branch 'origin/master' into folder-refactor ... # Conflicts: # deployment/k8sPaiLibrary/maintainconf/deploy.yaml		2018-09-12 12:47:37 +08:00
..
cluster-configuration.yaml.template	Merge remote-tracking branch 'origin/master' into canwan/update-jenkins	2018-09-10 13:07:56 +08:00
k8s-role-definition.yaml.template	Refactor qick-start (#1066)	2018-08-13 16:27:51 +08:00
kubernetes-configuration.yaml.template	Merge remote-tracking branch 'origin/master' into canwan/update-jenkins	2018-09-10 13:07:56 +08:00
quick-start-example.yaml	Merge remote-tracking branch 'origin/master' into folder-refactor	2018-09-12 12:47:37 +08:00
services-configuration.yaml.template	Merge remote-tracking branch 'origin/master' into folder-refactor	2018-09-12 12:47:37 +08:00