Merge 187f56d into 2325502

jaegertracing · Apr 27, 2018 · e560c72 · e560c72
2 parents 2325502 + 187f56d
commit e560c72
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,24 +7,24 @@ dist: trusty
 
 matrix:
   include:
-  - go: 1.9
+  - go: "1.10"
     env:
     - TESTS=true
     - COVERAGE=true
-  - go: 1.9
+  - go: "1.10"
     env:
     - ALL_IN_ONE=true
-  - go: 1.9
+  - go: "1.10"
     env:
     - CROSSDOCK=true
-  - go: 1.9
+  - go: "1.10"
     env:
     - DOCKER=true
     - DEPLOY=true
-  - go: 1.9
+  - go: "1.10"
     env:
     - ES_INTEGRATION_TEST=true
-  - go: 1.9
+  - go: "1.10"
     env:
     - HOTROD=true
 

diff --git a/cmd/env/command.go b/cmd/env/command.go
@@ -40,8 +40,7 @@ their names to upper case and replacing punctuation with underscores. For exampl
       --cassandra.connections-per-host    CASSANDRA_CONNECTIONS_PER_HOST
       --metrics-backend                   METRICS_BACKEND
 
-The following configuration options are only available via environment variables:
-`)
+The following configuration options are only available via environment variables:\n`)
 			fs := new(pflag.FlagSet)
 			fs.String(storage.SpanStorageTypeEnvVar, "cassandra", "The type of backend (cassandra, elasticsearch, memory) used for trace storage.")
 			fs.String(storage.DependencyStorageTypeEnvVar, "${SPAN_STORAGE}", "The type of backend used for service dependencies storage.")