Skip to content

Conversation

@abmusse
Copy link
Member

@abmusse abmusse commented Mar 19, 2019

Performed a git merge upstream/master while on upstream/v1.0-dev branch.

Had to resolve some conflicts because files where moved around.

jkdavew and others added 4 commits March 16, 2019 09:09
- it was previously being passed in the <data> attribute.
- this is similar to how the 'io' attribute is handled.
- this allows service programs procedures that use the VALUE keyword to work with node

Signed-off-by: Dave Weissman <weissmad@gmail.com>
Signed-off-by: Dave Weissman <weissmad@gmail.com>
- file names have changed since v1.0-dev branched from master
Copy link
Contributor

@markirish markirish left a comment

Choose a reason for hiding this comment

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

Run through the linter real fast, other than that it looks good

@abmusse
Copy link
Member Author

abmusse commented Mar 20, 2019

@markdirish

Thanks for catching the linting issues.

I added a commit to fix lint issues.

Copy link
Contributor

@markirish markirish left a comment

Choose a reason for hiding this comment

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

LGTM

@abmusse abmusse merged commit 424624b into IBM:v1.0-dev Mar 20, 2019
@abmusse abmusse deleted the sync branch May 8, 2020 02:49
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