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.

Sign up for GitHub

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

Merge Stable to Master #1515

Merged
merged 188 commits into from
Mar 30, 2021
Merged

Merge Stable to Master #1515

Changes from all commits
Commits
Show all changes
188 commits
Select commit Hold shift + click to select a range
bf01b8d
Bugfix, choosing a free port to run client in a test (#70)
lovesh Feb 21, 2017
391c6fc
Feature Added: Jenkins (#100)
Mar 27, 2017
31ff569
Hotfix: Deps (#102)
Mar 28, 2017
38c26f4
Merge branch 'stable-sync-up' into stable
Mar 30, 2017
727919d
Merge pull request #105 from keenondrums/stable
Mar 30, 2017
fe68975
Versioning fix (#112)
Apr 6, 2017
46b1c21
Stable build (#146)
Apr 21, 2017
87adcdd
Stable release (#155)
May 3, 2017
5fd64c6
Stable release (#156)
May 3, 2017
91d90f0
Stable release (#189)
Jun 1, 2017
54effaf
Stable release (#205)
mzk-vct Jun 5, 2017
c5442af
resolved problems introduced from earlier merge
Jun 5, 2017
29fd5a2
Merge pull request #206 from evernym/0.3.15-rc-fix
dhh1128 Jun 5, 2017
179bc68
Stable (#218)
Jun 15, 2017
22c3b7a
Stable build (#227)
Jun 21, 2017
a2731bc
re-pin indy dependencies
Jul 6, 2017
f728949
Merge pull request #257 from devin-fisher/rc-7-6
evernym-ci Jul 6, 2017
7c33e84
Stable (#285)
Jul 18, 2017
dc1e39f
merge from master
Jul 25, 2017
9594765
merge from master
Jul 25, 2017
ae371fb
Merge pull request #308 from devin-fisher/rc-725
dhh1128 Jul 26, 2017
9f9c65e
Merge branch 'master' into stable
AlexanderShekhovcov Aug 16, 2017
8d91687
Merge pull request #342 from AlexanderShekhovcov/stable
ashcherbakov Aug 16, 2017
3e9bb31
Merge branches 'master' and 'rc-1.1' of github.com:hyperledger/indy-p…
ashcherbakov Aug 25, 2017
6ee41b0
Merge branches 'master' and 'rc-1.1' of github.com:hyperledger/indy-p…
ashcherbakov Aug 28, 2017
8ca0b3e
Merge pull request #361 from hyperledger/rc-1.1
andkononykhin Aug 28, 2017
2212f0d
Fixes for wallet and genesis pool txns migration (#363)
spivachuk Aug 29, 2017
d3cc376
Rc 2.1 (#373)
andkononykhin Sep 6, 2017
b4ecd89
Merge remote-tracking branch 'public/master' into rc-3.1
andkononykhin Sep 12, 2017
2676c26
Merge pull request #378 from andkononykhin/rc-3.1
Sep 12, 2017
616aec9
Merge remote-tracking branch 'public/master' into rc-3.2
andkononykhin Sep 13, 2017
7ebaacc
Merge pull request #379 from andkononykhin/rc-3.2
Sep 13, 2017
a01dcd0
Merge remote-tracking branch 'origin/master' into rc-17.23-28
Nov 16, 2017
2ffda1a
Merge pull request #450 from dsurnin/rc-17.23-28
andkononykhin Nov 16, 2017
aa03bfe
Fix client basedir initialization
Nov 21, 2017
a4a7e2f
Merge pull request #454 from dsurnin/fix-load_test-stable
ashcherbakov Nov 21, 2017
6765096
Merge remote-tracking branch 'origin/master' into stable-51
dsurnin Feb 9, 2018
e71d859
Merge pull request #527 from dsurnin/stable-51
andkononykhin Feb 9, 2018
99fa879
Merge branch 'master' of https://github.com/hyperledger/indy-plenum i…
Feb 15, 2018
514ef42
Merge pull request #534 from anikitinDSR/1.2.31-stable
andkononykhin Feb 15, 2018
73c931c
fix setting of 3PC key after catch-up
ashcherbakov Feb 21, 2018
4ad2c2e
Merge pull request #542 from hyperledger/hotfix/indy-1183
andkononykhin Feb 21, 2018
fc46d41
reset last_ordered_3PC for future views during view change.
ashcherbakov Feb 22, 2018
8320168
Merge pull request #546 from hyperledger/hotfix/indy-1183
ashcherbakov Feb 22, 2018
5a527f3
fix KeyError for "services" when pool ledger contains node update txns
Feb 23, 2018
1c19437
Merge pull request #550 from hyperledger/rc-55
ashcherbakov Feb 26, 2018
9210c9c
Merge remote-tracking branch 'public/master' into rc-1.2.35
Apr 12, 2018
34a3738
Merge remote-tracking branch 'public/master' into rc-1.2.35
Apr 12, 2018
685bafc
Merge pull request #627 from anikitinDSR/rc-1.2.35
andkononykhin Apr 12, 2018
62adb6f
[Increment libindy-crypto] Bumped libindy-crypto version to 0.4.0
Apr 13, 2018
778c31d
[Increment-crypto] Increment libindy version with new indy-crypto
Apr 16, 2018
110f4dd
[Increment crypto] Disable "pip3 install pip"
Apr 16, 2018
2edb8ec
[Increment crypto] Added pip version
Apr 16, 2018
51f9dfd
Merge pull request #629 from anikitinDSR/increment-crypto
ashcherbakov Apr 16, 2018
f020030
[Freeze pip] Pip version < 10.0.0
Apr 17, 2018
529e5c6
Merge branch 'stable' of github.com:hyperledger/indy-plenum into incr…
Apr 17, 2018
bf04d0a
Merge pull request #633 from anikitinDSR/increment-crypto
ashcherbakov Apr 17, 2018
3a19f4f
Hotfix https://jira.hyperledger.org/browse/INDY-1256
dsurnin Apr 19, 2018
69550e8
hotfix https://jira.hyperledger.org/browse/INDY-1256
dsurnin Apr 20, 2018
3056e1d
Hotfix https://jira.hyperledger.org/browse/INDY-1256
dsurnin Apr 25, 2018
cfc7bc0
Fix falke errors
dsurnin May 16, 2018
1226f74
Fix packets versions
dsurnin May 16, 2018
7e82198
Revert old base58
dsurnin May 16, 2018
e6fe58b
Merge pull request #679 from dsurnin/release-hotfix1
ashcherbakov May 16, 2018
5e33183
[Bump indy-crypto] Bump indy-crypto and python3-indy (#682)
May 17, 2018
231a771
Merge remote-tracking branch 'public/master' into rc-1.4.43
Jun 20, 2018
fd037e2
Merge remote-tracking branch 'public/master' into rc-1.4.43
Jun 25, 2018
c23c330
Merge pull request #761 from anikitinDSR/rc-1.4.43
andkononykhin Jun 25, 2018
fd5ac04
use protocolVersion=None in test genesis files
ashcherbakov Jun 26, 2018
99bee2b
Merge pull request #777 from anikitinDSR/rc-1.4.43
ashcherbakov Jun 27, 2018
f2f4219
fix get value from state if there is no BLS multi-sig
ashcherbakov Jun 28, 2018
44511fe
Merge pull request #779 from anikitinDSR/rc-1.4.45
ashcherbakov Jun 28, 2018
0001825
Merge remote-tracking branch 'public/master' into rc-1.5.46
Jul 18, 2018
c09c59f
Merge pull request #824 from anikitinDSR/rc-1.5.46
andkononykhin Jul 18, 2018
e875227
[Indy-plenum] rename package name to indy-plenum
Jul 19, 2018
6d93f79
Merge remote-tracking branch 'public/stable' into rc-1.5.46
Jul 19, 2018
1925c87
Merge pull request #825 from anikitinDSR/rc-1.5.46
ashcherbakov Jul 19, 2018
296a446
Add test for catchup with receiving incorrect ledger status
Toktar Jul 22, 2018
0ac4815
Add check discarding Ledger Statuses test_node_catchup_with_new_ls_form
Toktar Jul 22, 2018
a0091cc
INDY-1519: Fixed handling of message replies
spivachuk Jul 25, 2018
cf0a037
Merge pull request #116 from Toktar/test-catchup-after-upgrade
spivachuk Jul 25, 2018
b928bbb
INDY-1519: Fixes in handling of msg reqs / resps
spivachuk Jul 25, 2018
48c92c9
Merge pull request #840 from spivachuk/message-reply-fix
andkononykhin Jul 26, 2018
7d24537
Merge remote-tracking branch 'public/master' into rc-1.6.49
Aug 9, 2018
8e627cd
Merge pull request #864 from anikitinDSR/rc-1.6.49
ashcherbakov Aug 9, 2018
e25d0e3
get request handler by txn type
lovesh Aug 12, 2018
f488370
Merge pull request #885 from anikitinDSR/rc-1.6.50
ashcherbakov Aug 21, 2018
20cd086
Merge remote-tracking branch 'public/master' into rc-1.6.51
Aug 31, 2018
a178b67
Merge remote-tracking branch 'public/master' into rc-1.6.51
Aug 31, 2018
212e6a6
Merge pull request #909 from anikitinDSR/rc-1.6.51
ashcherbakov Aug 31, 2018
921c05d
Merge tag '1.6.554-master' into rc-1.6.52
Oct 5, 2018
34b059d
Merge pull request #937 from anikitinDSR/rc-1.6.52
andkononykhin Oct 5, 2018
57fc384
[bump indy-crypto] bump version for python3-indy-crypto
Oct 10, 2018
ba08dce
Merge pull request #942 from anikitinDSR/rc-1.6.53
ashcherbakov Oct 11, 2018
142d941
Merge remote-tracking branch 'public/master' into 1.6.54-rc
Nov 28, 2018
a2a82be
Merge pull request #1002 from anikitinDSR/1.6.54-rc
ashcherbakov Nov 29, 2018
f36746f
INDY-1872: add more logging
Toktar Nov 30, 2018
698eb98
INDY-1872: add more logging
Toktar Nov 30, 2018
9eff373
INDY-1872: fix problem with 'start_ts' in create_throughput_measurement
Toktar Dec 3, 2018
5d322d1
INDY-1872: refactoring throughput_measurements
Toktar Dec 3, 2018
3e5fa6c
INDY-1896: process read and action requests
Toktar Dec 6, 2018
32732f9
INDY-1896: test refactoring
Toktar Dec 6, 2018
0d86b62
INDY-1896: tests refactoring
Toktar Dec 7, 2018
da4b2ae
INDY-1879: add test that read requests are not discarded in view change
Toktar Dec 10, 2018
a9fae3e
INDY-1896: refactoring is_request_need_quorum
Toktar Dec 10, 2018
fe3be7b
Merge pull request #1026 from anikitinDSR/1.6.55-rc
ashcherbakov Dec 12, 2018
3077a87
INDY-1909: add old instance change messages discarding
Toktar Dec 13, 2018
019ca90
INDY-1909: add unit tests for models.py
Toktar Dec 13, 2018
9f9670f
INDY-1909: change InstanceChanges discarding interval to 2 hours.
Toktar Dec 14, 2018
fdbdca2
INDY-1909: change time counter in InstanceChanges in models.py
Toktar Dec 14, 2018
42aae27
INDY-1909: add logging
Toktar Dec 14, 2018
b853edf
INDY-1909: refactoring models.py and tests
Toktar Dec 14, 2018
315d054
Merge pull request #1036 from Toktar/1.6.56-rc
ashcherbakov Dec 18, 2018
699ede2
INDY-1836: increase ToleratePrimaryDisconnection and bind re-try time.
Dec 13, 2018
7f91c85
INDY-1926: add check for None of replica's primary name during logging.
Dec 19, 2018
3370620
Merge pull request #1041 from sergey-shilov/cherrypick/INDY-1836_INDY…
ashcherbakov Dec 19, 2018
d077e35
Merge remote-tracking branch 'public/master' into rc-1.6.58
Feb 5, 2019
2cb2c3e
Merge pull request #1075 from anikitinDSR/rc-1.6.58
ashcherbakov Feb 6, 2019
9e143b5
Merge remote-tracking branch 'public/master' into rc-1.7.0.rc1
Apr 23, 2019
237faac
[RC-1.7.0] change to rc version
Apr 23, 2019
1dc2fe8
Merge pull request #1178 from anikitinDSR/rc-1.7.0.rc1
ashcherbakov Apr 23, 2019
888e34f
release 1.7.0
sovbot Apr 23, 2019
8772ce1
Merge remote-tracking branch 'public/master' into hotfix-1.7.1.rc1
Apr 24, 2019
c119fd4
[RC-1.7.1.rc1] change version of indy-plenum
Apr 24, 2019
3492f65
Merge pull request #1184 from anikitinDSR/hotfix-1.7.1.rc1
andkononykhin Apr 24, 2019
370c718
release 1.7.1
sovbot Apr 24, 2019
f892920
Merge remote-tracking branch 'public/master' into rc-1.8.0.rc1
May 28, 2019
bf317f2
[RC1-1.8.0] change version to rc
May 28, 2019
33e0c59
Merge pull request #1219 from anikitinDSR/rc-1.8.0.rc1
ashcherbakov May 28, 2019
2d330d4
release 1.8.0
sovbot May 28, 2019
27839d9
Merge remote-tracking branch 'public/master' into hotfix-1.8.1
Jun 4, 2019
9e7d359
[HOTFIX-1.8.1] bump version to 1.8.1
Jun 4, 2019
3e8f309
Merge pull request #1230 from anikitinDSR/hotfix-1.8.1
ashcherbakov Jun 5, 2019
1043729
release 1.8.1
sovbot Jun 5, 2019
dbd8c20
Merge remote-tracking branch 'public/master' into rc-1.9.0.rc1
andkononykhin Jun 27, 2019
55ace5f
bumps version to 1.9.0.rc1
andkononykhin Jun 27, 2019
2cbdebc
Merge pull request #1252 from andkononykhin/rc-1.9.0.rc1
andkononykhin Jun 27, 2019
dc2b6c9
release 1.9.0
sovbot Jun 27, 2019
3935098
Merge branch 'master' into rc-1.9.1.rc1
Jul 29, 2019
dc70af8
INDY-2162: RC 1.9.1
Jul 29, 2019
5804882
Merge pull request #1283 from skhoroshavin/rc-1.9.1.rc1
skhoroshavin Jul 29, 2019
09d1caf
INDY-2162: 1.9.1.rc2
Jul 29, 2019
dcac112
Merge pull request #1285 from skhoroshavin/rc-1.9.1.rc2
skhoroshavin Jul 29, 2019
81a0278
INDY-2162: 1.9.1.rc3
Jul 29, 2019
158825b
Merge pull request #1286 from skhoroshavin/rc-1.9.1.rc3
skhoroshavin Jul 29, 2019
82d023e
release 1.9.1
sovbot Jul 29, 2019
cbcfc1e
Merge pull request #1303 from KitHat/INDY-1954
ashcherbakov Aug 26, 2019
36d9af0
Merge pull request #1308 from KitHat/INDY-1954
Toktar Aug 27, 2019
ccfa757
Merge pull request #1305 from Toktar/bug-2215-ls-reask
Toktar Aug 26, 2019
99da7a4
Merge pull request #1309 from anikitinDSR/public/indy-2218
Aug 28, 2019
1ab57b3
[rc-1.9.2.rc1] bump package version
Aug 28, 2019
e713d52
Merge pull request #1311 from anikitinDSR/rc-1.9.2.rc1
Aug 28, 2019
dcff8ae
release 1.9.2
sovbot Aug 28, 2019
1b94cbd
Merge pull request #1348 from donqui/master
ashcherbakov Sep 25, 2019
76dba25
Merge pull request #1350 from donqui/master
Sep 26, 2019
e39ac08
[INDY-2213]: Update pyzmq for Jenkins CD
nemqe Sep 26, 2019
feacbab
[RC-1.10.0] bump package version
Sep 30, 2019
816bb22
[RC-1.10.0] MC
Oct 1, 2019
7766698
Merge remote-tracking branch 'public/release-1.10.0' into rc-1.10.0
Oct 1, 2019
98b51c9
Merge pull request #1356 from KitHat/INDY-2233
ashcherbakov Oct 2, 2019
bd353ca
Merge pull request #1354 from anikitinDSR/rc-1.10.0
ashcherbakov Oct 3, 2019
46e2079
release 1.10.0
sovbot Oct 3, 2019
4dd463f
Merge remote-tracking branch 'public/master' into rc-1.11.0.rc1
Oct 29, 2019
de28748
[RC-1.11.0.rc1] bump package version
Oct 29, 2019
8f92f6c
Merge pull request #1389 from anikitinDSR/rc-1.11.0.rc1
Oct 29, 2019
5c7788c
release 1.11.0
sovbot Oct 30, 2019
c292f8f
Merge remote-tracking branch 'public/master' into rc-1.12.0.rc1
Nov 26, 2019
d7e0b45
[RC-1.12.0.rc1] bump package version to 1.12.0.rc1
Nov 26, 2019
59dcffb
Merge remote-tracking branch 'public/master' into rc-1.12.0.rc1
Nov 27, 2019
0c314a1
[RC-1.12.0.rc1] add new seed to exception set
Nov 28, 2019
acaba58
Merge pull request #1417 from anikitinDSR/rc-1.12.0.rc1
Nov 28, 2019
fd3f5b5
release 1.12.0
sovbot Nov 28, 2019
06365b1
bump release version
ashcherbakov Dec 26, 2019
318106f
bump release version
ashcherbakov Dec 26, 2019
b2e8eff
Merge pull request #1445 from ashcherbakov/rc-1.12.1.rc1
ashcherbakov Dec 26, 2019
6120d7c
release 1.12.1
sovbot Dec 26, 2019
8adbaf1
Merge remote-tracking branch 'public/master' into rc-1.12.2.rc1
Jan 27, 2020
5d87059
[RC1-1.12.2] bump package version
Jan 27, 2020
c9e3fd0
Merge pull request #1466 from anikitinDSR/rc-1.12.2.rc1
Jan 27, 2020
5b16b9a
release 1.12.2
sovbot Jan 27, 2020
1c41f38
Add validations for TAA_ACCEPTANCE_TIME and timestamps in the TAA txn
Toktar May 24, 2020
be90d21
[RC1-1.12.3] bump package version
Toktar May 24, 2020
a5aeb07
Merge pull request #1484 from Toktar/rc-1.12.3.rc1
Toktar May 26, 2020
a8443ff
release 1.12.3
sovbot May 26, 2020
52735f3
[RC1-1.12.4] bump package version
WadeBarnes Aug 11, 2020
c41a43b
Merge pull request #1493 from WadeBarnes/rc-1.12.4.rc1
WadeBarnes Aug 11, 2020
cbc4f74
release 1.12.4
sovbot Aug 12, 2020
9c32e95
Merge branch 'master' of https://github.com/hyperledger/indy-plenum i…
Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plenum/test/view_change/test_client_req_during_view_change.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ def test_client_msg_discard_in_view_change_with_request(test_node):

def check_nack_msg(req_key, reason, to_client):
assert "Client request is discarded since view " \
"change is in progress" == reason
"change is in progress" == reason