From 794690c0db1a1eb604c6eedb91967cc09284e95e Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Thu, 9 Jun 2016 16:48:32 +0100
Subject: [PATCH] Convert turbine config to YAML to match docs

---
 turbine/src/main/resources/application.properties |  5 -----
 turbine/src/main/resources/application.yml        | 11 +++++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)
 delete mode 100644 turbine/src/main/resources/application.properties
 create mode 100644 turbine/src/main/resources/application.yml

diff --git a/turbine/src/main/resources/application.properties b/turbine/src/main/resources/application.properties
deleted file mode 100644
index 1660d2e..0000000
--- a/turbine/src/main/resources/application.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-server.port: 8989
-spring.application.name: turbine
-turbine.appConfig: simple,other
-turbine.aggregator.clusterConfig: MAIN
-turbine.clusterNameExpression: metadata['cluster']
\ No newline at end of file
diff --git a/turbine/src/main/resources/application.yml b/turbine/src/main/resources/application.yml
new file mode 100644
index 0000000..85116f5
--- /dev/null
+++ b/turbine/src/main/resources/application.yml
@@ -0,0 +1,11 @@
+server:
+  port: 8989
+spring:
+  application:
+    name: turbine
+turbine:
+  appConfig: simple,other
+  aggregator:
+    clusterConfig: MAIN
+  clusterNameExpression: metadata['cluster']
+  combineHostPort: true
\ No newline at end of file