Skip to content

Commit

Permalink
Merge branch 'master' into renovate/toml-0.x-lockfile
Browse files Browse the repository at this point in the history
  • Loading branch information
gurinderu committed Jul 1, 2024
2 parents 850e4cc + 70bccf3 commit 1921b76
Show file tree
Hide file tree
Showing 283 changed files with 3,871 additions and 2,672 deletions.
2 changes: 1 addition & 1 deletion .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.24.0"
".": "0.25.0"
}
1 change: 0 additions & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ jobs:
- nox-snapshot
uses: fluencelabs/cli/.github/workflows/tests.yml@main
with:
ref: change-nox-config
nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"


Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Changelog

## [0.25.0](https://github.com/fluencelabs/nox/compare/nox-v0.24.0...nox-v0.25.0) (2024-06-05)


### ⚠ BREAKING CHANGES

* **network:** Network isolation [fixes NET-818] ([#2245](https://github.com/fluencelabs/nox/issues/2245))

### Features

* **connector:** add get_deals builtin ([#2180](https://github.com/fluencelabs/nox/issues/2180)) ([b6e15d5](https://github.com/fluencelabs/nox/commit/b6e15d51c087883105fb88d519f86bae6efe7a5a))
* **core-distributor:** core-manager refactoring [fixes NET-820] ([#2265](https://github.com/fluencelabs/nox/issues/2265)) ([58ea53d](https://github.com/fluencelabs/nox/commit/58ea53dc175798041704badee88141d5b2c19d6f))
* **network:** Network isolation [fixes NET-818] ([#2245](https://github.com/fluencelabs/nox/issues/2245)) ([f5eb980](https://github.com/fluencelabs/nox/commit/f5eb9808364ba0343292f5a46d82dbe9df05655b))


### Bug Fixes

* **config:** network case ([#2278](https://github.com/fluencelabs/nox/issues/2278)) ([c52b74e](https://github.com/fluencelabs/nox/commit/c52b74ef529cbc56dd25b55121401b85edef9b1e))
* **listener:** listener fixes ([#2249](https://github.com/fluencelabs/nox/issues/2249)) ([b69f1cb](https://github.com/fluencelabs/nox/commit/b69f1cbe93dc826e4780f759b2bcd0c37b5697c2))
* **system-services:** Update to the new decider ([#2253](https://github.com/fluencelabs/nox/issues/2253)) ([d8be027](https://github.com/fluencelabs/nox/commit/d8be027f726966796f4a6e0275f00379fe4c8279))

## [0.24.0](https://github.com/fluencelabs/nox/compare/nox-v0.23.6...nox-v0.24.0) (2024-05-27)


Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Things you need to know:

### Contributor License Agreement

When you contribute, you have to be aware that your contribution is covered by **[Apache License 2.0](./LICENSE)**, but might relicensed under few other software licenses mentioned in the **Contributor License Agreement**. In particular, you need to agree to the Contributor License Agreement. If you agree to its content, you simply have to click on the link posted by the CLA assistant as a comment to the pull request. Click it to check the CLA, then accept it on the following screen if you agree to it. The CLA assistant will save this decision for upcoming contributions and will notify you if there is any change to the CLA in the meantime.
When you contribute, you have to be aware that your contribution is covered by [GNU Affero General Public License version 3](./LICENSE)**, but might relicensed under few other software licenses mentioned in the **Contributor License Agreement**. In particular, you need to agree to the Contributor License Agreement. If you agree to its content, you simply have to click on the link posted by the CLA assistant as a comment to the pull request. Click it to check the CLA, then accept it on the following screen if you agree to it. The CLA assistant will save this decision for upcoming contributions and will notify you if there is any change to the CLA in the meantime.
2 changes: 1 addition & 1 deletion Cargo.lock

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

41 changes: 20 additions & 21 deletions FluenceCLA.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
Thank you for your interest in Fluence Labs projects.
Thank you for your interest in Fluence DAO projects.

In order to clarify the intellectual property license
granted with Contributions from any person or entity, Fluence Labs
granted with Contributions from any person or entity, Fluence DAO
must have a Contributor License Agreement ("CLA") on file that has
been signed by each Contributor, indicating agreement to the license
terms below. This license is for your protection as a Contributor as
well as the protection of Fluence Labs and its users; it does not
well as the protection of Fluence DAO and its users; it does not
change your rights to use your own Contributions for any other purpose.
This contribution license is based on the Apache Contribution License
for individuals.
This contribution license is based on the GNU Affero General Public License version 3.

Please read this document carefully before signing and keep a copy
for your records.

You accept and agree to the following terms and conditions for Your
present and future Contributions submitted to Fluence Labs. Except
for the license granted herein to Fluence Labs and recipients of
software distributed by Fluence Labs, You reserve all right, title,
present and future Contributions submitted to Fluence DAO. Except
for the license granted herein to Fluence DAO and recipients of
software distributed by Fluence DAO, You reserve all right, title,
and interest in and to Your Contributions.

1. Definitions.
"You" (or "Your") shall mean the copyright owner or legal entity
authorized by the copyright owner that is making this Agreement
with Fluence Labs. For legal entities, the entity making a
with Fluence DAO. For legal entities, the entity making a
Contribution and all other entities that control, are controlled
by, or are under common control with that entity are considered to
be a single Contributor. For the purposes of this definition,
Expand All @@ -32,29 +31,29 @@ and interest in and to Your Contributions.
outstanding shares, or (iii) beneficial ownership of such entity.
"Contribution" shall mean any original work of authorship,
including any modifications or additions to an existing work, that
is intentionally submitted by You to Fluence Labs for inclusion
is intentionally submitted by You to Fluence DAO for inclusion
in, or documentation of, any of the products owned or managed by
Fluence Labs (the "Work"). For the purposes of this definition,
Fluence DAO (the "Work"). For the purposes of this definition,
"submitted" means any form of electronic, verbal, or written
communication sent to Fluence Labs or its representatives,
communication sent to Fluence DAO or its representatives,
including but not limited to communication on electronic mailing
lists, source code control systems, and issue tracking systems that
are managed by, or on behalf of, Fluence Labs for the purpose of
are managed by, or on behalf of, Fluence DAO for the purpose of
discussing and improving the Work, but excluding communication that
is conspicuously marked or otherwise designated in writing by You
as "Not a Contribution."

2. Grant of Copyright License. Subject to the terms and conditions of
this Agreement, You hereby grant to Fluence Labs and to
recipients of software distributed by Fluence Labs a perpetual,
this Agreement, You hereby grant to Fluence DAO and to
recipients of software distributed by Fluence DAO a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare derivative works of,
publicly display, publicly perform, sublicense, and distribute Your
Contributions and such derivative works.

3. Grant of Patent License. Subject to the terms and conditions of
this Agreement, You hereby grant to Fluence Labs and to
recipients of software distributed by Fluence Labs a perpetual,
this Agreement, You hereby grant to Fluence DAO and to
recipients of software distributed by Fluence DAO a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have
made, use, offer to sell, sell, import, and otherwise transfer the
Expand All @@ -75,8 +74,8 @@ and interest in and to Your Contributions.
that you create that includes your Contributions, you represent
that you have received permission to make Contributions on behalf
of that employer, that your employer has waived such rights for
your Contributions to Fluence Labs, or that your employer has
executed a separate Corporate CLA with Fluence Labs.
your Contributions to Fluence DAO, or that your employer has
executed a separate Corporate CLA with Fluence DAO.

5. You represent that each of Your Contributions is Your original
creation (see section 7 for submissions on behalf of others). You
Expand All @@ -96,14 +95,14 @@ and interest in and to Your Contributions.
INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.

7. Should You wish to submit work that is not Your original creation,
You may submit it to Fluence Labs separately from any
You may submit it to Fluence DAO separately from any
Contribution, identifying the complete details of its source and of
any license or other restriction (including, but not limited to,
related patents, trademarks, and license agreements) of which you
are personally aware, and conspicuously marking the work as
"Submitted on behalf of a third-party: [named here]".

8. You agree to notify Fluence Labs of any facts or circumstances of
8. You agree to notify Fluence DAO of any facts or circumstances of
which you become aware that would make these representations
inaccurate in any respect.

Loading

0 comments on commit 1921b76

Please sign in to comment.