Skip to content
This repository has been archived by the owner on May 27, 2022. It is now read-only.

Commit

Permalink
Merge pull request #5 from XbyOrange/v1.1.0
Browse files Browse the repository at this point in the history
Upgrade Mercury. Fix license
  • Loading branch information
javierbrea authored Jun 28, 2019
2 parents 25f1efc + 692df74 commit a257c8d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Removed
### BREAKING CHANGES

## [1.1.0] - 2019-06-28
### Changed
- Upgrade mercury version

### Fixed
- Fix license

## [1.0.0] - 2019-06-03
### BREAKING CHANGES
- Forked from xByOrange reactive-data-source v1.7.0 private library. (Only origins.Api is exposed from now)
Expand Down
13 changes: 1 addition & 12 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -175,18 +175,7 @@

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2019 XByOrange

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xbyorange/mercury-memory",
"version": "1.0.0",
"version": "1.1.0",
"description": "Mercury memory origin",
"keywords": [
"reactive",
Expand Down Expand Up @@ -28,7 +28,7 @@
"coveralls": "cat ./coverage/lcov.info | coveralls"
},
"dependencies": {
"@xbyorange/mercury": "1.0.0",
"@xbyorange/mercury": "1.1.0",
"lodash": "4.17.11"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sonar.organization=javierbrea
sonar.projectKey=xbyorange-mercury-memory
sonar.projectVersion=1.0.0
sonar.projectVersion=1.1.0

sonar.sources=src,test
sonar.exclusions=node_modules/**
Expand Down

0 comments on commit a257c8d

Please sign in to comment.