Skip to content
This repository has been archived by the owner on Jan 31, 2023. It is now read-only.

Update master 4 #1161

Merged
merged 9 commits into from
Jul 17, 2019
Merged

Update master 4 #1161

merged 9 commits into from
Jul 17, 2019

Conversation

cazfletch
Copy link
Contributor

No description provided.

heatherlp and others added 8 commits July 17, 2019 14:27
Signed-off-by: heatherlp <heatherpollard0@gmail.com>

(cherry picked from commit a3f6aef)
Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>
Signed-off-by: Jake Turner <jaketurner25@live.com>

(cherry picked from commit 39d4ea1)
Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>
Fix broken tests
Move to new way of testing
Disabled coverage as that isn't working with new way of testing
Disabled npm audit
Disabled sysTests

Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>

(cherry picked from commit 5a80e7d)
Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>
Use version 1.35.1 for unit tests
Updated rewritePackageJson to edit engine
Put code coverage back in
moved npm package to before unit test

Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>

(cherry picked from commit aa4b702)
Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>
Signed-off-by: Jake Turner <jaketurner25@live.com>

(cherry picked from commit a673598)
Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>
Signed-off-by: Akshat Shah <akshatshah@akshats-mbp.hursley.uk.ibm.com>

(cherry picked from commit 08a193b)
Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>
kill the chaincode container if running
move instantiate and upgrade to when play is pressed
update readme

closes #1118

Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>

(cherry picked from commit 959121c)
Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>
Signed-off-by: Jake Turner <jaketurner25@live.com>

(cherry picked from commit 17fdda2)
Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>
Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>
@cazfletch cazfletch merged commit ca8c925 into IBM-Blockchain:remote-deploy Jul 17, 2019
@cazfletch cazfletch deleted the update-master-4 branch October 16, 2019 12:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants