Merge branch 'master' into separate_experiments (97c66061) · Commits · dstat / dstat-interface · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption, please take a look at our documentation.

Commit 97c66061 authored 8 years ago by

Michael DM Dryden

Merge branch 'master' into separate_experiments

# Conflicts:
#	dstat_interface/interface/db.glade
#	dstat_interface/interface/dstatinterface.glade
#	dstat_interface/main.py

parents d2384020 c25da7fc

Branches

Tags

1 merge request!10Move to gtk3 and new command protocol

Hide whitespace changes

Inline Side-by-side

Showing with 57 additions and 331 deletions

Please register or to comment