Develop rebase with main branch #83
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add ordering sequence to params Makes possible to add ordering sequence to Query. Fixes #72 Signed-off-by: Rafik Naccache <rafik@fekr.tech> * Add :param ordering_sequence: Signed-off-by: Rafik Naccache <rafik@fekr.tech> * Fix wrong example for :param ordering_sequence: Signed-off-by: Rafik Naccache <rafik@fekr.tech> * fix wrong ordering message construction in query After more documentation I got to the way to construct to ordering object Signed-off-by: Rafik Naccache <rafik@fekr.tech> * remove redundant OR clause to manage ordering_sequence Signed-off-by: Rafik Naccache <rafik@fekr.tech>
|
@Pawlak00 could You please take a look if I haven't damaged any Your changes? |
Pawlak00
reviewed
Sep 13, 2021
Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
Signed-off-by: G.Bazior <bazior@agh.edu.pl>
@LiraLemur @iceseer I've just added more things to the PR:
EDIT: And I've tested those changes by manually running script from: #72 (comment) |
iceseer
approved these changes
Feb 16, 2022
|
@iceseer Thanks for approve! So I'm merging its:). EDIT: It looks like I don't have permissions, so I'll ask @LiraLemur |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In iroha-python library many newest merges was being merged into
mainbranch instead of develop, that is why many changes are not available ondevelop.So I've made:
to fetch: 41a724b
it will contain commits which change
iroha/iroha.pyfile:Rest of commits are not cherry-picked (connected with documentation, Jenkins, etc)