Skip to content

Commit

Permalink
Merge branch 'master' into basic-user-mgmt
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiaslohr committed Aug 16, 2019
2 parents bc7a31e + 1324ff4 commit 453da62
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ program
console.log(' config file. You must have permission to create a new sandbox for the realm. The number of');
console.log(' sandboxes allowed to create is limited. The command only trigger the creation and does not');
console.log(' wait until the sandbox is fully up and running. Use may use `sfcc-ci sandbox:list` to check');
console.log(' the status of the creation.');
console.log(' the status of the sandbox.');
console.log();
console.log(' You can force the command to wait until the creation of the sandbox has been finished and the');
console.log(' is available to use (in "started" status) by using the --sync flag.');
Expand Down
2 changes: 1 addition & 1 deletion lib/auth.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var util = require('util');

var jsonwebtoken = require('jsonwebtoken');
var opn = require('opn');
var opn = require('open');
var request = require('request');

var config = require('./config').obtain();
Expand Down
2 changes: 1 addition & 1 deletion lib/job.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var request = require('request');
var util = require('util');

var opn = require('opn');
var opn = require('open');

var auth = require('./auth');
var config = require('./config').obtain();
Expand Down
6 changes: 3 additions & 3 deletions lib/sandbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var request = require('request');
var util = require('util');

var {table} = require('table');
var open = require('opn');
var open = require('open');

var auth = require('./auth');
var instance = require('./instance');
Expand Down Expand Up @@ -564,7 +564,7 @@ module.exports.cli = {
var result = {
message : util.format('Creation of new sandbox %s for realm %s triggered and ongoing. ' +
'Sandbox id is %s, status of sandbox is %s. You may use `sfcc-ci sandbox:list` to ' +
'check the status of the creation.', newSandbox.instance, newSandbox.realm, newSandbox.id,
'check the status of the sandbox.', newSandbox.instance, newSandbox.realm, newSandbox.id,
newSandbox.state),
sandbox : newSandbox };

Expand Down Expand Up @@ -683,7 +683,7 @@ module.exports.cli = {
// TODO append message (e.g. from default set)
result['message'] = util.format('Creation of new sandbox %s for realm %s finished (%s ms). ' +
'Sandbox id is %s, status of sandbox is %s. You may use `sfcc-ci sandbox:list` to ' +
'check the status of the creation.', result['sandbox'].instance, result['sandbox'].realm,
'check the status of the sandbox.', result['sandbox'].instance, result['sandbox'].realm,
duration, result['sandbox'].id, result['sandbox'].state);
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"conf": "^2.0.0",
"inquirer": "^6.2.0",
"jsonwebtoken": "^8.3.0",
"opn": "^5.3.0",
"open": "^6.4.0",
"request": "^2.88.0",
"request-debug": "^0.2.0",
"table": "^5.0.2"
Expand Down

0 comments on commit 453da62

Please sign in to comment.