Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Conversation

@jt-nti
Copy link
Contributor

@jt-nti jt-nti commented Jun 22, 2017

DO NOT SQUASH!

jt-nti and others added 4 commits June 20, 2017 11:57
- remove property syntax (wasn't fully implemented anyway)
- support .* and .** globs on namespaces
- check type hierarchy for resources (already implemented for
  participants and transactions)
- add aditional validation

Signed-off-by: James Taylor <jamest@uk.ibm.com>
Signed-off-by: James Taylor <jamest@uk.ibm.com>
# Conflicts:
#	.travis/before-install.sh
#	lerna.json
#	package.json
#	packages/composer-admin/package.json
#	packages/composer-cli/package.json
#	packages/composer-client/package.json
#	packages/composer-common/package.json
#	packages/composer-connector-embedded/package.json
#	packages/composer-connector-hlf/package.json
#	packages/composer-connector-hlfv1/package.json
#	packages/composer-connector-proxy/package.json
#	packages/composer-connector-server/package.json
#	packages/composer-connector-web/package.json
#	packages/composer-cucumber-steps/package.json
#	packages/composer-playground-api/package.json
#	packages/composer-playground/package.json
#	packages/composer-rest-server/package.json
#	packages/composer-runtime-embedded/package.json
#	packages/composer-runtime-hlf/package.json
#	packages/composer-runtime-hlfv1/package.json
#	packages/composer-runtime-web/package.json
#	packages/composer-runtime/package.json
#	packages/composer-systests/package.json
#	packages/composer-website/package.json
#	packages/generator-hyperledger-composer/package.json
#	packages/loopback-connector-composer/package.json
@sstone1 sstone1 self-requested a review June 22, 2017 14:10
Copy link
Contributor

@sstone1 sstone1 left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@jt-nti jt-nti merged commit 8ea4529 into hyperledger-archives:master Jun 22, 2017
@jt-nti jt-nti deleted the merge-0.9.0 branch June 22, 2017 14:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants