Skip to content

Commit 7a237ef

Browse files
author
Alejandro Fernández Gómez
committed
Merge branch 'master' into 64634-policy-permissions-per-package-policy
2 parents 340999b + 451f64b commit 7a237ef

1,102 files changed

Lines changed: 48986 additions & 30733 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ npm-debug.log*
6363
.vagrant
6464

6565
## @cypress/snapshot from apm plugin
66-
snapshots.js
66+
/snapshots.js
6767

6868
# release notes script output
6969
report.csv

‎api_docs/actions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@
10541054
],
10551055
"source": {
10561056
"path": "x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts",
1057-
"lineNumber": 121
1057+
"lineNumber": 129
10581058
},
10591059
"deprecated": false,
10601060
"initialIsOpen": false

‎api_docs/apm.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
],
7979
"source": {
8080
"path": "x-pack/plugins/apm/public/plugin.ts",
81-
"lineNumber": 45
81+
"lineNumber": 47
8282
},
8383
"deprecated": false,
8484
"lifecycle": "setup",
@@ -96,7 +96,7 @@
9696
],
9797
"source": {
9898
"path": "x-pack/plugins/apm/public/plugin.ts",
99-
"lineNumber": 47
99+
"lineNumber": 49
100100
},
101101
"deprecated": false,
102102
"lifecycle": "start",
@@ -144,7 +144,7 @@
144144
],
145145
"source": {
146146
"path": "x-pack/plugins/apm/server/plugin.ts",
147-
"lineNumber": 55
147+
"lineNumber": 54
148148
},
149149
"deprecated": false,
150150
"children": [
@@ -160,7 +160,7 @@
160160
],
161161
"source": {
162162
"path": "x-pack/plugins/apm/server/plugin.ts",
163-
"lineNumber": 65
163+
"lineNumber": 64
164164
},
165165
"deprecated": false,
166166
"children": [
@@ -183,7 +183,7 @@
183183
],
184184
"source": {
185185
"path": "x-pack/plugins/apm/server/plugin.ts",
186-
"lineNumber": 65
186+
"lineNumber": 64
187187
},
188188
"deprecated": false,
189189
"isRequired": true
@@ -237,7 +237,7 @@
237237
],
238238
"source": {
239239
"path": "x-pack/plugins/apm/server/plugin.ts",
240-
"lineNumber": 69
240+
"lineNumber": 68
241241
},
242242
"deprecated": false,
243243
"children": [
@@ -262,7 +262,7 @@
262262
],
263263
"source": {
264264
"path": "x-pack/plugins/apm/server/plugin.ts",
265-
"lineNumber": 70
265+
"lineNumber": 69
266266
},
267267
"deprecated": false,
268268
"isRequired": true
@@ -281,7 +281,7 @@
281281
],
282282
"source": {
283283
"path": "x-pack/plugins/apm/server/plugin.ts",
284-
"lineNumber": 71
284+
"lineNumber": 70
285285
},
286286
"deprecated": false,
287287
"isRequired": true
@@ -309,7 +309,7 @@
309309
],
310310
"source": {
311311
"path": "x-pack/plugins/apm/server/plugin.ts",
312-
"lineNumber": 269
312+
"lineNumber": 260
313313
},
314314
"deprecated": false,
315315
"children": [
@@ -331,7 +331,7 @@
331331
],
332332
"source": {
333333
"path": "x-pack/plugins/apm/server/plugin.ts",
334-
"lineNumber": 269
334+
"lineNumber": 260
335335
},
336336
"deprecated": false,
337337
"isRequired": true
@@ -351,7 +351,7 @@
351351
],
352352
"source": {
353353
"path": "x-pack/plugins/apm/server/plugin.ts",
354-
"lineNumber": 288
354+
"lineNumber": 279
355355
},
356356
"deprecated": false,
357357
"children": [],

0 commit comments

Comments
 (0)