Skip to content

Commit

Permalink
Merge pull request #147 from smartdevicelink/develop
Browse files Browse the repository at this point in the history
Manticore 2.8.0 Release
  • Loading branch information
renonick87 authored May 17, 2021
2 parents 02b455f + b84b1a3 commit 69121b8
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 76 deletions.
8 changes: 4 additions & 4 deletions api/v2/app/interfaces/job/manticore/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ const HMI_HEALTH_TIME = 8000;

const jobInfo = {
core: {
versions: ["7.0.0"], //ex. 5.0.1, master, develop
versions: ["7.1.1"], //ex. 5.0.1, master, develop
builds: ["default"]
},
hmis: [{
type: "generic",
versions: ["minimal-0.9.0"] //ex. master, minimal-0.5.1
versions: ["minimal-0.10.0"] //ex. master, minimal-0.5.1
}]
};

Expand Down Expand Up @@ -313,12 +313,12 @@ function formatAddresses (id, services) {
function exampleJobOption () {
return {
core: {
version: "7.0.0",
version: "7.1.1",
build: "default"
},
hmi: {
type: "generic",
version: "minimal-0.9.0"
version: "minimal-0.10.0"
}
};
}
Expand Down
125 changes: 56 additions & 69 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "manticore",
"version": "2.7.0",
"version": "2.8.0",
"description": "",
"main": "index.js",
"scripts": {
Expand All @@ -11,7 +11,7 @@
"license": "ISC",
"dependencies": {
"aws-sdk": "^2.319.0",
"axios": "^0.19.0",
"axios": "^0.21.1",
"check-types": "^7.4.0",
"consul": "^0.33.1",
"dotenv": "^6.0.0",
Expand All @@ -20,7 +20,7 @@
"koa-compose": "^4.1.0",
"koa-cors": "0.0.16",
"koa-jwt": "^3.3.2",
"koa-router": "^7.4.0",
"koa-router": "^10.0.0",
"koa-static": "^5.0.0",
"koa-websocket": "^5.0.1",
"nomad-helper": "^3.6.1",
Expand Down

0 comments on commit 69121b8

Please sign in to comment.