Merge 0.4.3 release candidate changes back into master #3248
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
Also remove '\n' from msgStdinInfo as we use Fprintln. License: MIT Signed-off-by: Jakub Sztandera <[email protected]>
This reverts commit fe7b01f. Conflicts: commands/cli/parse.go Revert "Merge pull request #3023 from ipfs/feature/eval-symlink-windows" This reverts commit 16c5a89, reversing changes made to 8c77ff8. Conflicts: commands/cli/parse.go License: MIT Signed-off-by: Kevin Atkinson <[email protected]>
License: MIT Signed-off-by: Kevin Atkinson <[email protected]>
cli: Fix stdin help text being show multiple times
License: MIT Signed-off-by: Jakub Sztandera <[email protected]>
Add back still useful test from reverted commit: fe7b01f Resolve symlink if it is directly referenced in cli (#2897) License: MIT Signed-off-by: Kevin Atkinson <[email protected]>
License: MIT Signed-off-by: Jakub Sztandera <[email protected]>
License: MIT Signed-off-by: Jeromy <[email protected]>
Improve sharness testing on ipfs repo verify
License: MIT Signed-off-by: Lars Gierth <[email protected]>
License: MIT Signed-off-by: Lars Gierth <[email protected]>
License: MIT Signed-off-by: Jeromy <[email protected]>
test: do explicit check of CORS headers
test: revert few stdin tests that were removed
fsrepo: improve migrations copy
bash: bring --unrestricted-api completion back (sorry!)
License: MIT Signed-off-by: Jeromy <[email protected]>
License: MIT Signed-off-by: Jeromy <[email protected]>
Go 1.7 funnily demands gcc for installing gx. License: MIT Signed-off-by: Lars Gierth <[email protected]>
License: MIT Signed-off-by: Kevin Atkinson <[email protected]>
Directly Fix #2839
Update release candidate branch to Go 1.7
License: MIT Signed-off-by: Jakub Sztandera <[email protected]>
License: MIT Signed-off-by: Jakub Sztandera <[email protected]>
License: MIT Signed-off-by: Jakub Sztandera <[email protected]>
test: change time-out script to one from coreutils
License: MIT Signed-off-by: Jeromy <[email protected]>
…ally raised License: MIT Signed-off-by: Jeromy <[email protected]>
License: MIT Signed-off-by: Jeromy <[email protected]>
Enhance tests for files API root best-effort pin.
License: MIT Signed-off-by: Jeromy <[email protected]>
License: MIT Signed-off-by: Jakub Sztandera <[email protected]>
License: MIT Signed-off-by: Jeromy <[email protected]>
License: MIT Signed-off-by: Jeromy <[email protected]>
Remove entries from wantlists when their related requests are cancelled
bitswap: Don't clear 'active' until Connect calls are finished
cmd: harden the security of privkey field in config show
License: MIT Signed-off-by: Jakub Sztandera <[email protected]>
blockstore: change unit of bloom filter to byte from bits
License: MIT Signed-off-by: Jeromy <[email protected]>
bitswap: search for wantlist providers a little less often
License: MIT Signed-off-by: Jeromy <[email protected]>
License: MIT Signed-off-by: Lars Gierth <[email protected]>
License: MIT Signed-off-by: Lars Gierth <[email protected]>
dht: protect against a panic in case record on pbmessage is nil
License: MIT Signed-off-by: Jeromy <[email protected]>
changelog: add notes for 0.4.3-rc4
License: MIT Signed-off-by: Jeromy <[email protected]>
|
Have you already started resolving those conflicts? |
|
@Kubuxu Yeah, i've started. If you really want to though you can take over. I'm going to sleep soon. Just keep in mind I don't want to rebase this one. |
whyrusleeping
changed the title
License: MIT Signed-off-by: Lars Gierth <[email protected]>
License: MIT Signed-off-by: Jeromy <[email protected]>
whyrusleeping
force-pushed
the
version/0.4.3-rc4
branch
from
3a2f6fe
to
5457a85
Compare
changelog: update for 0.4.3
ghost
mentioned this pull request
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.
No description provided.