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

Jump to bottom

Merge 0.4.3 release candidate changes back into master #3248

Merged
merged 53 commits into from
Sep 21, 2016
Merged

Merge 0.4.3 release candidate changes back into master #3248

merged 53 commits into from
Sep 21, 2016
+610 −263

Conversation

whyrusleeping
Copy link
Member

No description provided.

Kubuxu and others added 30 commits August 27, 2016 19:02
@Kubuxu
cli: Fix stdin help text being show multiple times
0883aa5 
Also remove '\n' from msgStdinInfo as we use Fprintln.

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@kevina
Revert "Resolve symlink if it is directly referenced in cli (#2897)"
88e4b11 
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 <k@kevina.org>
@kevina
Fix "ipfs add -r ." to always add the contents of the current directory.
10a692f 
License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
@whyrusleeping
Merge pull request #3134 from ipfs/fix/cmd/repeated-help-text
050985c 
cli: Fix stdin help text being show multiple times
@Kubuxu
test: do explicit check of CORS headers
3754803 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@kevina
Add back still useful test from fe7b01f (Resolve symlink if ...)
802d3f9 
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 <k@kevina.org>
@Kubuxu
test: revert few stdin tests that were removed
384fb10 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@whyrusleeping
repo/verify: add better testing on repo verify command
7baac76 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping
Merge pull request #3148 from ipfs/test/improve-verify
686882b 
Improve sharness testing on ipfs repo verify
@whyrusleeping
bash: bring --unrestricted-api completion back (sorry!)
5807e5c 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
@whyrusleeping
fsrepo: improve migrations copy

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
b213d69 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
@whyrusleeping
fix tests for changed migrations text

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
b4718a2 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping
Merge pull request #3142 from ipfs/test/CORS/defaults

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
ea343fb 
test: do explicit check of CORS headers
@whyrusleeping
Merge pull request #3144 from ipfs/test/add/revert

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
4286cd3 
test: revert few stdin tests that were removed
@whyrusleeping
Merge pull request #3158 from ipfs/feat/migrations-help

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
40159e5 
fsrepo: improve migrations copy
@whyrusleeping
Merge pull request #3159 from ipfs/feat/bash-unrestricted-api

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
04d3e79 
bash: bring --unrestricted-api completion back (sorry!)
@whyrusleeping @Kubuxu
bump go requirement to 1.7

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
9997fce 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping @Kubuxu
update gx binary requirements

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
3c30fee 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@Kubuxu
docker: switch to alpine dev channel, for go1.7

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
f629271 
Go 1.7 funnily demands gcc for installing gx.

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
@kevina
Enhance tests for files API root best-effort pin.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
6e4f3ac 
License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
@whyrusleeping
Merge pull request #3135 from ipfs/kevina/2839directfix
ade598e 
Directly Fix #2839
@whyrusleeping
Merge pull request #3163 from ipfs/feat/go-1.7
9a23442 
Update release candidate branch to Go 1.7
@Kubuxu
test: introduce go-timeout
7639a2f 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@Kubuxu
test: add go-timeotu to test build system
f012b5a 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@Kubuxu
test: remove time-out script, use go-timeout instead
f59751d 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@whyrusleeping
Merge pull request #3152 from ipfs/feat/test/time-out-license
0e5e6cf 
test: change time-out script to one from coreutils
@whyrusleeping
fdlimit: improve fdlimit autoraising tests
6c34056 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping
add better test to be more sure that file descriptor limits were actu…
af914c5 
…ally raised

License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping
bitswap: add better tests around wantlist clearing
feb653b 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping
Merge pull request #3151 from ipfs/kevina/more3138tests
309535c 
Enhance tests for files API root best-effort pin.
whyrusleeping and others added 18 commits September 4, 2016 06:44
@whyrusleeping
bitswap: clear wantlists when GetBlocks calls are cancelled
1548c8a 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@Kubuxu @whyrusleeping
cmd: harden config show with key
671425e 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@whyrusleeping
config: guard against privkey being overwritten in fsrepo setConfig
91dd044 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping
replace string with constant in fsrepo privkey check
667f8a6 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping
Merge pull request #3182 from ipfs/fix/bitswap/want-cancel
d6092eb 
Remove entries from wantlists when their related requests are cancelled
@whyrusleeping
Merge pull request #3169 from ipfs/fix/bitswap-goro-leak
6f437fb 
bitswap: Don't clear 'active' until Connect calls are finished
@whyrusleeping
Merge pull request #3141 from ipfs/feat/cmd/config-priv
8803a76 
cmd: harden the security of privkey field in config show
@Kubuxu
blockstore: change unit of bloom filter to byte from bits
27279cd 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
@whyrusleeping
Merge pull request #3196 from ipfs/feat/config/bloombytes
3950079 
blockstore: change unit of bloom filter to byte from bits
@whyrusleeping
bitswap: search for wantlist providers a little less often
803af90 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping
Merge pull request #3192 from ipfs/fix/bitswap/too-many-findprovs
7c00bcf 
bitswap: search for wantlist providers a little less often
@whyrusleeping
dht: protect against a panic in case record on pbmessage is nil
8f362d2 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
docs: fix changelog list oneliner
4c5b32b 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
changelog: add notes for 0.4.3-rc4
2c5109c 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
@whyrusleeping
Merge pull request #3200 from ipfs/fix/dht-pmes-panic
268b757 
dht: protect against a panic in case record on pbmessage is nil
@whyrusleeping
bump version to 0.4.3-rc4
a0e0a65 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping
Merge pull request #3193 from ipfs/feat/changelog-v0.4.3-rc4
db509ec 
changelog: add notes for 0.4.3-rc4
@whyrusleeping
ipfs version 0.4.3
189fa76 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping whyrusleeping added the status/in-progress In progress label Sep 20, 2016
@Kubuxu
Copy link
Member

Kubuxu commented Sep 20, 2016

Have you already started resolving those conflicts?

@whyrusleeping
Copy link
Member Author

@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 whyrusleeping changed the title Version/0.4.3 rc4 Merge 0.4.3 release candidate changes back into master Sep 20, 2016
Lars Gierth and others added 2 commits September 20, 2016 19:53
changelog: update for 0.4.3
15c40f1 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
@whyrusleeping
Merge branch 'version/0.4.3-rc4'
5457a85 
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
@whyrusleeping whyrusleeping merged commit 4db17ae into master Sep 21, 2016
@whyrusleeping whyrusleeping deleted the version/0.4.3-rc4 branch September 21, 2016 06:39
@whyrusleeping whyrusleeping removed the status/in-progress In progress label Sep 21, 2016
@ghost ghost mentioned this pull request Dec 23, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@whyrusleeping @Kubuxu @kevina