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

merge 1.6.x to master #82

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

merge 1.6.x to master #82

wants to merge 15 commits into from

Conversation

jgeddes2001
Copy link
Contributor

No description provided.

Joseph Tary and others added 10 commits December 13, 2016 09:44
 * add shrinkwrap (Joseph Tary)
* get the real length

* add comment
 * Fix DBCS issue (#63) (Jeremy Geddes)
Fix the loopback model definition of optimizedData
 * Add sub-type for the loopback model (Gary Tu)
 * Update shrinkwrap file (Gary Tu)
 * Update shrinkwrap (Ryan Graham)
@jgeddes2001
Copy link
Contributor Author

@garytu Can you look at trying to make sure everything from service is merged down to master properly? Appears we may be out of sync..

@garytu
Copy link
Contributor

garytu commented Oct 31, 2017

@jgeddes2001 from the point of source code, the merge is okay, but I am thinking it would be better to generate the shrinkwrap on master after the merge.

@jgeddes2001
Copy link
Contributor Author

jgeddes2001 commented Oct 31, 2017

@garytu sounds like a good plan

garytu added 5 commits March 6, 2018 14:08
 * Check existence of the env.yaml file (Gary Tu)
 * Update node engine to 6 at minimal (Gary Tu)
Update node version to 6 at minimal
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