Skip to content

Commit

Permalink
Merge pull request #789 from mesosphere/fix/4338-taskKillGracePeriodS…
Browse files Browse the repository at this point in the history
…econds

Making taskKillGracePeriodSeconds a known property
  • Loading branch information
Orlando Hohmeier committed Dec 14, 2016
2 parents b0f6fc0 + 9f1028d commit 9c18504
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
### Fixed
- \#4569: npm run serve error
- \#4679: Updating "user" in configuration in web gui has no effect
- \#4338: Adding "taskKillGracePeriodSeconds" to known properties

## 1.1.5 - 2016-10-06
### Fixed
Expand Down
3 changes: 2 additions & 1 deletion src/js/constants/AppConfigDefaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const AllAppConfigDefaultValues = Util.deepFreeze(
"protocol": "tcp"
}],
readinessChecks: [],
user: null
user: null,
taskKillGracePeriodSeconds: null
})
);

0 comments on commit 9c18504

Please sign in to comment.