rebase on master

elastic · Jul 11, 2018 · a7d8aee · a7d8aee
1 parent 3c30879
commit a7d8aee
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/metricbeat/include/fields.go b/metricbeat/include/fields.go
diff --git a/metricbeat/module/aerospike/fields.go b/metricbeat/module/aerospike/fields.go
diff --git a/metricbeat/module/etcd/fields.go b/metricbeat/module/etcd/fields.go
diff --git a/metricbeat/module/kibana/fields.go b/metricbeat/module/kibana/fields.go
diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go
diff --git a/metricbeat/module/redis/fields.go b/metricbeat/module/redis/fields.go