more updates

elastic · Mar 27, 2020 · 86383ce · 86383ce
1 parent 141b9c0
commit 86383ce
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 48 deletions.
diff --git a/dev/import-beats/datasources.go b/dev/import-beats/datasources.go
@@ -6,6 +6,7 @@ package main
 
 import (
  "fmt"
+
  "github.com/elastic/package-registry/util"
 )
 

diff --git a/docs/api/package.json b/docs/api/package.json
@@ -106,10 +106,5 @@
  }
  ],
  "download": "/epr/example/example-1.0.0.tar.gz",
-<<<<<<< HEAD
- "path": "/package/example-1.0.0"
-}
-=======
  "path": "/package/example/1.0.0"
-}
->>>>>>> aaf31b8... Change package path from {packagename}-{version} to {packagename}/{version}
+}
diff --git a/testdata/public/package/example-0.0.2/index.json b/testdata/public/package/example-0.0.2/index.json
diff --git a/testdata/public/package/example/0.0.2/index.json b/testdata/public/package/example/0.0.2/index.json
@@ -13,6 +13,9 @@
  "requirement": {
  "kibana": {
  "versions": "\u003e=6.0.0"
+ },
+ "elasticsearch": {
+ "versions": "\u003e=6.0.0 \u003c=6.8.0"
  }
  },
  "assets": [