Skip to content

Commit

Permalink
Merge branch 'master' into lens/transpose-columns
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Mar 9, 2021
2 parents 9fde78a + bd354b4 commit 2f5790e
Show file tree
Hide file tree
Showing 938 changed files with 17,984 additions and 11,037 deletions.
10 changes: 5 additions & 5 deletions api_docs/alerting.json
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@
"description": [],
"source": {
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
"lineNumber": 131
"lineNumber": 132
}
},
{
Expand All @@ -871,7 +871,7 @@
"description": [],
"source": {
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
"lineNumber": 132
"lineNumber": 133
}
},
{
Expand All @@ -882,7 +882,7 @@
"description": [],
"source": {
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
"lineNumber": 133
"lineNumber": 134
}
},
{
Expand All @@ -893,7 +893,7 @@
"description": [],
"source": {
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
"lineNumber": 134
"lineNumber": 135
},
"signature": [
"Pick<",
Expand All @@ -910,7 +910,7 @@
],
"source": {
"path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
"lineNumber": 130
"lineNumber": 131
},
"initialIsOpen": false
},
Expand Down
6 changes: 3 additions & 3 deletions api_docs/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -11290,7 +11290,7 @@
"description": [],
"source": {
"path": "src/plugins/data/common/kbn_field_types/types.ts",
"lineNumber": 57
"lineNumber": 64
},
"initialIsOpen": false
},
Expand Down Expand Up @@ -20312,7 +20312,7 @@
"description": [],
"source": {
"path": "src/plugins/data/common/kbn_field_types/types.ts",
"lineNumber": 57
"lineNumber": 64
},
"initialIsOpen": false
},
Expand Down Expand Up @@ -26902,7 +26902,7 @@
"description": [],
"source": {
"path": "src/plugins/data/common/kbn_field_types/types.ts",
"lineNumber": 57
"lineNumber": 64
},
"initialIsOpen": false
}
Expand Down
8 changes: 4 additions & 4 deletions api_docs/data_field_formats.json
Original file line number Diff line number Diff line change
Expand Up @@ -3306,7 +3306,7 @@
"description": [],
"source": {
"path": "src/plugins/data/common/field_formats/converters/string.ts",
"lineNumber": 80
"lineNumber": 83
},
"signature": [
"({ kind: boolean; text: string; } | { kind: string; text: string; })[]"
Expand All @@ -3325,7 +3325,7 @@
"returnComment": [],
"source": {
"path": "src/plugins/data/common/field_formats/converters/string.ts",
"lineNumber": 82
"lineNumber": 85
}
},
{
Expand All @@ -3342,7 +3342,7 @@
"description": [],
"source": {
"path": "src/plugins/data/common/field_formats/converters/string.ts",
"lineNumber": 102
"lineNumber": 105
}
}
],
Expand All @@ -3353,7 +3353,7 @@
"label": "textConvert",
"source": {
"path": "src/plugins/data/common/field_formats/converters/string.ts",
"lineNumber": 102
"lineNumber": 105
},
"tags": [],
"returnComment": []
Expand Down
Loading

0 comments on commit 2f5790e

Please sign in to comment.