Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump @dcos/mesos-client 0.1.9 #2571

Merged
merged 3 commits into from
Jan 3, 2018
Merged

Bump @dcos/mesos-client 0.1.9 #2571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1846cb3
fix(fixShrinkwrap): catch non-existent paths
nLight Dec 14, 2017
4d9ed29
chore(@dcos/mesos-client): bump 0.1.9
nLight Dec 14, 2017
36cac61
fix(MesosStateUtil): add default value for tasks
nLight Jan 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,12 @@ gulp.task("serve", function() {
// remove 'fsevents' from shrinkwrap, since it causes errors on non-Mac hosts
// see https://github.com/npm/npm/issues/2679
gulp.task("fixShrinkwrap", function(done) {
delete shrinkwrap.dependencies.fsevents;
delete shrinkwrap
.dependencies["babel-cli"].dependencies.chokidar.dependencies.fsevents;
try {
delete shrinkwrap.dependencies.fsevents;
delete shrinkwrap
.dependencies["babel-cli"].dependencies.chokidar.dependencies.fsevents;
} catch (e) {}

var shrinkwrapString = JSON.stringify(shrinkwrap, null, " ") + "\n";
fs.writeFile("./npm-shrinkwrap.json", shrinkwrapString, done);
});
39 changes: 28 additions & 11 deletions npm-shrinkwrap.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"externalplugins": ""
},
"dependencies": {
"@dcos/http-service": "0.2.0",
"@dcos/mesos-client": "0.1.8",
"@dcos/http-service": "0.2.1",
"@dcos/mesos-client": "0.1.9",
"babel-polyfill": "6.23.0",
"browser-info": "0.4.0",
"classnames": "2.2.3",
Expand Down
2 changes: 1 addition & 1 deletion src/js/utils/MesosStateUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const MesosStateUtil = {
* @returns {Object} A map of frameworks running on host
*/
getHostResourcesByFramework(state, filter = []) {
return state.tasks.reduce(function(memo, task) {
return (state.tasks || []).reduce(function(memo, task) {
if (memo[task.slave_id] == null) {
memo[task.slave_id] = {};
}
Expand Down