Merge branch 'feature/debugging' of https://github.com/wu-sheng/sky-walking into feature/debugging

# Conflicts: # apm-collector/apm-collector-boot/src/main/resources/application.yml
2017-09-04 23:34:14 +08:00 · 2017-09-04 23:34:14 +08:00 · 40a9686a33
parent f767431607 73ae751882
commit 40a9686a33
1 changed files with 1 additions and 3 deletions
--- a/apm-collector/apm-collector-boot/src/main/resources/application.yml
+++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml
@ -25,6 +25,4 @@ storage:
  elasticsearch:
    cluster_name: CollectorDBCluster
    cluster_transport_sniffer: true
-    cluster_nodes: localhost:9300
-
-
+    cluster_nodes: localhost:9300