Commit Graph

686 Commits

Author SHA1 Message Date
hunjixin
d023026cb0 fix confilct 2021-07-15 14:55:03 +08:00
Anton Evangelatov
d89ddb9315 resolve conflicts 2021-07-12 11:34:37 +02:00
Łukasz Magiera
8f7bf1df86
Merge pull request #6697 from filecoin-project/feat/dealpublish-ctl-config
Config for deal publishing control addresses
2021-07-08 19:00:29 +02:00
Łukasz Magiera
2dc27d6ab4 itests: Fix deal provider collateral flakiness 2021-07-07 19:41:46 +02:00
Travis Person
9977a6d1d7 Add genesis for interop network 2021-07-06 17:06:55 +00:00
Travis Person
9d6d1f5715 Reset interop network 2021-07-06 17:06:55 +00:00
Anton Evangelatov
4f0a96c9c7 resolved conflicts 2021-06-30 13:16:52 +02:00
Łukasz Magiera
df86efbd43 docsgen 2021-06-29 11:27:06 +02:00
Aayush Rajasekaran
07487b6d20
Update version.go 2021-06-28 22:43:14 -04:00
Łukasz Magiera
c1303f1eac gateway: Add support for Version method 2021-06-28 19:05:27 +02:00
Łukasz Magiera
fa2be42eb0 Merge remote-tracking branch 'origin/release/v1.10.0' into chore/merge-1.10 2021-06-23 15:51:00 +02:00
Aayush Rajasekaran
2dd498297f Set HyperDrive upgrade epoch 2021-06-22 19:34:03 -04:00
Anton Evangelatov
e656aad298 regenerate docs 2021-06-22 13:36:24 +02:00
Anton Evangelatov
6720463799 resolve merge conflicts 2021-06-22 11:28:23 +02:00
Raúl Kripalani
c0a8a9f5b5 make gen. 2021-06-21 20:52:59 +01:00
Łukasz Magiera
b37a66c7c9 Merge remote-tracking branch 'origin/release/v1.10.0' into chore/merge-1.10 2021-06-21 17:03:03 +02:00
Jennifer Wang
e1c2567136 docs gen 2021-06-18 22:20:13 -04:00
Jennifer Wang
b01189467a version bump to lotus v1.10.0-rc6 2021-06-18 22:05:19 -04:00
Travis Person
c11a32cf69 Add calibration genesis 2021-06-19 00:53:21 +00:00
Travis Person
65844761b6 Calibration network reset 2021-06-18 23:55:01 +00:00
Aayush Rajasekaran
71785f9099 Lotus version 1.10.0-rc5 2021-06-16 22:15:11 -04:00
Łukasz Magiera
7640ae47de docsgen 2021-06-16 14:51:40 +02:00
Jennifer Wang
c1529714e6 v1.10.0-rc4 have this version base off the right head = v1.9.0 tag 2021-06-15 22:16:41 -04:00
Aayush Rajasekaran
520a0091f5 Merge branch 'releases' into release/v1.10.0 2021-06-15 17:40:36 -04:00
Jennifer Wang
9d7f94bc67 make gen happy 2021-06-14 22:02:00 -04:00
Jennifer Wang
ad6ddcb590 update lotus version to v1.10.0-rc3 2021-06-14 21:44:03 -04:00
Anton Evangelatov
31e6fb154e resolve conflicts 2021-06-14 11:27:54 +02:00
Aayush Rajasekaran
c4c71802f2 Lotus version 1.10.0-rc2 2021-06-09 23:31:52 -04:00
Jennifer Wang
0379adc9f1 Set ntwk v13 HyperDrive Calibration upgrade epoch 2021-06-09 23:27:58 -04:00
Jennifer Wang
55b77a3c99 Set ntwk v13 HyperDrive Calibration upgrade epoch 2021-06-09 23:26:11 -04:00
Cory Schwartz
4bff4f25ad network reset friday 2021-06-08 18:28:01 -04:00
Aayush Rajasekaran
71909c5642 Fix nerpa build 2021-06-08 16:46:53 -04:00
Anton Evangelatov
9ab84bdc0a upgrade docsgen 2021-06-08 15:59:37 +02:00
Anton Evangelatov
9f3ec82cc1 initial resolution of conflicts 2021-06-08 13:01:22 +02:00
aarshkshah1992
21e6b50294 finished rebasing PR 2021-06-07 16:02:15 +05:30
Łukasz Magiera
42ec5928e3
Merge pull request #6337 from filecoin-project/feat/list-retrievals
Add a command to list retrievals
2021-06-04 21:13:25 +02:00
Łukasz Magiera
a7746961fb Merge remote-tracking branch 'origin/master' into feat/list-retrievals 2021-06-04 20:49:01 +02:00
Anton Evangelatov
ed634bc3a4 rebuild docs 2021-06-04 17:06:55 +02:00
Travis Person
e89e0679b5 Interop genesis 2021-06-03 23:27:45 +00:00
Travis Person
96e67b80c3 Add interop network 2021-06-03 22:43:27 +00:00
Aayush Rajasekaran
4a321c6da2 Fix nerpa build 2021-06-02 19:19:32 -04:00
Aayush Rajasekaran
1f10600f13 Lotus version 1.10.0-rc1 2021-06-02 19:04:17 -04:00
Aayush Rajasekaran
55193bf36d Merge branch 'release/v1.9.0' into asr/specs-update 2021-06-02 14:58:14 -04:00
Łukasz Magiera
e1dc7ad6eb build: Use go embed for srs-inner-product.json 2021-06-02 15:12:26 +02:00
Łukasz Magiera
6d9779ecae Merge remote-tracking branch 'origin/master' into feat/nv13-1.11 2021-06-02 15:07:13 +02:00
Cory Schwartz
e13dea7da8 use go:embed 2021-06-02 12:16:09 +02:00
Łukasz Magiera
dc642d0b7b Merge remote-tracking branch 'origin/feat/nv13' into feat/nv13-1.11 2021-06-01 21:06:58 +02:00
Łukasz Magiera
482e1110c2 precommit batcher: Improve error propagation 2021-06-01 14:35:30 +02:00
Łukasz Magiera
084b0e7f60 Handle collateral when submitting aggregated commits 2021-06-01 12:09:15 +02:00
Łukasz Magiera
3671f2a6ff fix 2k build 2021-05-31 21:52:23 +02:00