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.

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

V2.x #72

Merged
merged 15 commits into from
Mar 16, 2017
Merged

V2.x #72

merged 15 commits into from
Mar 16, 2017

Conversation

subeeshcbabu-zz
Copy link
Member

@subeeshcbabu-zz subeeshcbabu-zz commented Oct 25, 2016

@subeeshcbabu-zz subeeshcbabu-zz added this to the v2.0.0 milestone Oct 25, 2016
@@ -0,0 +1,101 @@
//const Fs = require('fs');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lingering comment


return Promise.all([ apiResolver, fileResolver, validatorResolver ]).then(resolved => {
let routes = [];
let [ api, files, validators ] = resolved;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guessing order is maintained from Promise.all ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

} else {
//If handlers options is not set, use the default dir name `handlers` (only if the dir exists).
let defaultPath = Path.join(basedir, './handlers');
////For a one time lookup and invocation during configuration,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra //

@subeeshcbabu-zz
Copy link
Member Author

Can this be merged? Because the target is a new branch altogether - v2.x, can I proceed with the merge?

@subeeshcbabu-zz
Copy link
Member Author

merging this PR to v2.x branch. Will define the acceptance criterion and test cases for move to v2.x

@subeeshcbabu-zz subeeshcbabu-zz merged commit 9b91431 into krakenjs:v2.x Mar 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants