Merge branch '7.5' into backport/7.5/pr-50189

elasticmachine · web-flow · commit 37bb50cbddaa · 2019-11-13T08:06:01.000-08:00
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   ],
   "private": true,
   "version": "7.5.0",
-  "branch": "7.x",
+  "branch": "7.5",
   "types": "./kibana.d.ts",
   "tsdocMetadata": "./build/tsdoc-metadata.json",
   "build": {
diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
@@ -168,7 +168,7 @@ export default function ({ getService, getPageObjects }) {
         await inspector.close();
       });
 
-      it('scales when enabled count agg', async () => {
+      it.skip('scales when enabled count agg', async () => {
         const expectedTableData = [
           [ '2015-09-20 00:00', '0.002' ],
           [ '2015-09-20 01:00', '0.003' ],
@@ -200,7 +200,7 @@ export default function ({ getService, getPageObjects }) {
         await inspector.close();
       });
 
-      it('does not scale top hit agg', async () => {
+      it.skip('does not scale top hit agg', async () => {
         const expectedTableData = [
           [ '2015-09-20 00:00', '6', '9.035KB' ],
           [ '2015-09-20 01:00', '9', '5.854KB' ],
