chore(docs): updated readme to reflect password character minimum

README.md

@@ -101,9 +101,9 @@ $ bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influx setup
 Welcome to InfluxDB 2.0!
 Please type your primary username: user
 
-Please type your password: hunter2
+Please type your password: my-password
 
-Please type your password again: hunter2
+Please type your password again: my-password
 
 Please type your primary organization name.: my-org
 
@@ -128,7 +128,7 @@ Your token has been stored in /Users/you/.influxdbv2/credentials
 You may get into a development loop where `influx setup` becomes tedious.
 Some added flags can help:
 ```
-$ bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influx setup --username user --password hunter2 --org my-org --bucket my-bucket --retention 168 --token my-token --force
+$ bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influx setup --username user --password my-password --org my-org --bucket my-bucket --retention 168 --token my-token --force
 ```
 
 `~/.influxdbv2/credentials` contains your auth token.

logger/fields.go

@@ -87,6 +87,7 @@ func Shard(id uint64) zapcore.Field {
 	return zap.Uint64(DBShardIDKey, id)
 }
 
+<<<<<<< HEAD
 // TraceInfo returns the traceID and if it was sampled from the Jaeger span
 // found in the given context. It returns if a span associated to the context has been found.
 func TraceInfo(ctx context.Context) (traceID string, sampled bool, found bool) {
@@ -100,7 +101,7 @@ func TraceInfo(ctx context.Context) (traceID string, sampled bool, found bool) {
 	return "", false, false
 }
 
-// OTTraceID returns a fields "ot_trace_id" and "ot_trace_sampled", values pulled from the (Jaeger) trace ID
+// Trace returns a fields "ot_trace_id" and "ot_trace_sampled", values pulled from the (Jaeger) trace ID
 // found in the given context. Returns zap.Skip() if the context doesn't have a trace ID.
 func Trace(ctx context.Context) []zap.Field {
 	if span := opentracing.SpanFromContext(ctx); span != nil {