Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PD-370 Update Storj Content #1917

Merged
merged 7 commits into from
May 31, 2023
Merged

PD-370 Update Storj Content #1917

merged 7 commits into from
May 31, 2023

Conversation

micjohnson777
Copy link
Contributor

This commit updates the content with suggested changes made in the PR review. PR was merged too soon and before technical review. This PR makes changes to that content.

Thanks for contributing to TrueNAS documentation! By opening a Pull Request, you're acknowledging that your changes will be distributed under the Creative Commons 4.0 license.

This commit updates the content with suggested changes made in the PR review.
@micjohnson777 micjohnson777 requested a review from a team as a code owner May 23, 2023 13:16
This commit changes the wording of the front matter description parameter.
@micjohnson777
Copy link
Contributor Author

Added both Rehan and Stavros to provide a technical review of the changes requested by Morgan and verify the instructions provided in this PR are correct.

@Mrt134 Mrt134 changed the title PD-370 Update Content PD-370 Update Storj Content May 23, 2023
@RehanY147 RehanY147 requested review from Qubad786 and removed request for RehanY147 May 23, 2023 19:27
@RehanY147
Copy link

I think I was asked for a review by mistake. I've tagged my namesake from the middleware team for a review. If I was not tagged by mistake, please let me know.

@micjohnson777
Copy link
Contributor Author

micjohnson777 commented May 23, 2023 via email

@micjohnson777 micjohnson777 added the Version Specific This PR needs to be merged to a specific version branch or on a specific version release day. label May 24, 2023
@Mrt134 Mrt134 removed the Version Specific This PR needs to be merged to a specific version branch or on a specific version release day. label May 25, 2023
@stavros-k
Copy link

I don't see anything wrong!

Just an addition, if the identity is not present on the storage directory, it will generate and authorize one automatically.
But keep in mind that this can take long time and consume resources of the system while generating one.

Added Stavros suggested comments about identies.
@Mrt134
Copy link
Collaborator

Mrt134 commented May 31, 2023

@micjohnson777 there are a number of conflicts to review and make sure the correct content is merging in to master.

Mrt134 and others added 4 commits May 31, 2023 08:49
This commit pushes the locally-saved version of this article to the github version after conflicts and missing content was restored. Some changes were not restored in that process.
@micjohnson777
Copy link
Contributor Author

Conflicts finally resolved but some feedback comments/commits might be lost. This needs the once-over again.

@Mrt134 Mrt134 merged commit 452d04d into master May 31, 2023
3 checks passed
@Mrt134 Mrt134 deleted the PD-370-Update-Storj-App-Content branch May 31, 2023 14:44
Mrt134 added a commit that referenced this pull request Jun 1, 2023
commit 9e4c683
Merge: c4a1c03 4e986b4
Author: MicJ <92740932+micjohnson777@users.noreply.github.com>
Date:   Wed May 31 17:42:33 2023 -0400

    Merge pull request #1945 from truenas/editpagelinkfix

    Fix up "Edit Page" links at top of pages.

commit 4e986b4
Merge: e991208 c4a1c03
Author: Tim Moore <Mrt134@users.noreply.github.com>
Date:   Wed May 31 16:21:46 2023 -0400

    Merge branch 'master' into editpagelinkfix

commit e991208
Author: Tim Moore <Mrt134@users.noreply.github.com>
Date:   Wed May 31 16:21:23 2023 -0400

    Fix up "Edit Page" links at top of pages.

    Switch parameter to allow edit page links at bottom to continue to work as well.

commit c4a1c03
Merge: 452d04d a24015f
Author: Tim Moore <Mrt134@users.noreply.github.com>
Date:   Wed May 31 15:57:52 2023 -0400

    Merge pull request #1944 from truenas/Mrt134-patch-3

    Update COREReleaseNotes.md

commit a24015f
Author: Tim Moore <Mrt134@users.noreply.github.com>
Date:   Wed May 31 15:54:42 2023 -0400

    Update COREReleaseNotes.md

    Add issue link that was erroneously marked as private

commit 452d04d
Merge: 3e711b0 dc463c0
Author: Tim Moore <Mrt134@users.noreply.github.com>
Date:   Wed May 31 10:44:14 2023 -0400

    Merge pull request #1917 from truenas/PD-370-Update-Storj-App-Content

    PD-370 Update Storj Content

commit dc463c0
Merge: 396b01f e78d6e9
Author: MicJ <mjohnson@ixsystems.com>
Date:   Wed May 31 09:10:59 2023 -0400

    Merge branch 'PD-370-Update-Storj-App-Content' of https://github.com/truenas/documentation into PD-370-Update-Storj-App-Content

commit 396b01f
Merge: dea0ab2 3e711b0
Author: MicJ <mjohnson@ixsystems.com>
Date:   Wed May 31 09:08:41 2023 -0400

    Merge branch 'master' into PD-370-Update-Storj-App-Content

commit dea0ab2
Author: MicJ <mjohnson@ixsystems.com>
Date:   Wed May 31 08:58:27 2023 -0400

    PD-370 Push Changes After Conflict Resolution

    This commit pushes the locally-saved version of this article to the github version after conflicts and missing content was restored. Some changes were not restored in that process.

commit e78d6e9
Merge: 6022f96 3e711b0
Author: Tim Moore <Mrt134@users.noreply.github.com>
Date:   Wed May 31 08:49:40 2023 -0400

    Merge branch 'master' into PD-370-Update-Storj-App-Content

commit 6022f96
Author: MicJ <92740932+micjohnson777@users.noreply.github.com>
Date:   Fri May 26 16:34:48 2023 -0400

    Update AddStorjNode.md

    Added Stavros suggested comments about identies.

commit 69701de
Author: MicJ <mjohnson@ixsystems.com>
Date:   Tue May 23 09:19:33 2023 -0400

    PD-370 Correct description

    This commit changes the wording of the front matter description parameter.

commit 9f12f81
Author: MicJ <mjohnson@ixsystems.com>
Date:   Tue May 23 09:10:05 2023 -0400

    PD-370 Update Content

    This commit updates the content with suggested changes made in the PR review.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants