Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into container_stats
Browse files Browse the repository at this point in the history
  • Loading branch information
zanchin committed Dec 20, 2015
2 parents 011a16d + a85d4c5 commit fdebc2f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions cli-subcommands/container-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ exports.run = function(amour) {
var Server = amour.ContainerManager;
var server = new Server();
var config = amour.config;
process.title = 'probo-cm';
server.configure(config, function(error) {
if (error) throw error;
server.run(amour, function(error) {
Expand Down
1 change: 1 addition & 0 deletions cli-subcommands/github-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ exports.configure = function(config) {
};

exports.run = function(amour) {
process.title = 'probo-ghh';
server.start();
};

Expand Down

0 comments on commit fdebc2f

Please sign in to comment.