Skip to content

Commit

Permalink
Merge pull request #168 from smartdevicelink/develop
Browse files Browse the repository at this point in the history
2.10.0 Release
  • Loading branch information
crokita authored May 10, 2022
2 parents 3a4a360 + b983e44 commit 66201be
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 30 deletions.
10 changes: 1 addition & 9 deletions api/v2/app/interfaces/job/manticore/core-image-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,7 @@ function configurationToImageInfo (coreVersion, coreBuild, id) {
},
{
name: `core-tcp-${id}`,
port: "tcp",
checks: [
{
Type: "tcp",
Interval: 3000000000, //3 seconds
Timeout: 1000000000, //1 second
Protocol: "tcp"
}
]
port: "tcp"
},
{
name: `core-file-${id}`,
Expand Down
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: ["8.0.0"], //ex. 5.0.1, master, develop
versions: ["8.1.0"], //ex. 5.0.1, master, develop
builds: ["default"]
},
hmis: [{
type: "generic",
versions: ["minimal-0.11.0"] //ex. master, minimal-0.5.1
versions: ["minimal-0.12.0"] //ex. master, minimal-0.5.1
}]
};

Expand Down Expand Up @@ -313,12 +313,12 @@ function formatAddresses (id, services) {
function exampleJobOption () {
return {
core: {
version: "8.0.0",
version: "8.1.0",
build: "default"
},
hmi: {
type: "generic",
version: "minimal-0.11.0"
version: "minimal-0.12.0"
}
};
}
Expand Down
32 changes: 16 additions & 16 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "manticore",
"version": "2.8.0",
"version": "2.10.0",
"description": "",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 66201be

Please sign in to comment.