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

Gateway/composite upload #1843

Closed
wants to merge 122 commits into from
Closed

Gateway/composite upload #1843

wants to merge 122 commits into from
+21,610 −4,797

Conversation

rht
Copy link
Contributor

@rht rht commented Oct 15, 2015

  • fix merge conflict
  • tests

Sorry, something went wrong.

whyrusleeping and others added 30 commits September 9, 2015 10:50
@whyrusleeping
implement unwant command to remove blocks from wantlist
c38ca00 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@chriscool
sharness: generalize test_check_peerid()
5c118a2 
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
@chriscool
t0060: simplify peerid check
0aa5936 
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
@chriscool
t0110: add peerid check
9563cb2 
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
@chriscool
t0062: add peerid check
bec8224 
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
@chriscool
t0100: add peerid check
e22cbce 
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
@chriscool
test-lib: improve test_check_peerid
6e59b39 
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
@jbenet
Merge pull request ipfs#1692 from ipfs/generalize-peerid-check
a8dc708 
Generalize peerid check
@rht
Fix t0090 tar&gz unexpected EOF error
23dd82f 
License: MIT
Signed-off-by: rht <rhtbot@gmail.com>
@whyrusleeping
dont use coremock for fuse tests
192ee64 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@jbenet
Merge pull request ipfs#1694 from rht/fix/tar
e2f60c7 
Fix t0090 tar&gz unexpected EOF error
@jbenet
Merge pull request ipfs#1695 from ipfs/fix/ipns-fuse-tests
d2d397a 
dont use coremock for fuse tests
Remove dead jenkins script
6658775 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
docs: update authors list
d5c7a36 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
@jbenet
Merge pull request ipfs#1696 from ipfs/gardening
a56c9b7 
Remove dead jenkins script, update AUTHORS
@Luzifer
Added dockerhub trigger
8b6d2b4 
License: MIT
Signed-off-by: Knut Ahlers <knut@ahlers.me>
@jbenet
Merge pull request ipfs#1698 from Luzifer/notify_dockerhub
495827b 
Added dockerhub trigger
@Luzifer
Fix: Use the right repo to encrypt secrets.
5649c7e 
refs ipfs#1698

License: MIT
Signed-off-by: Knut Ahlers <knut@ahlers.me>
@jbenet
Merge pull request ipfs#1699 from Luzifer/notify_dockerhub
ae1e452 
Fix: Use the right repo to encrypt secrets.
@whyrusleeping
add a basic test for unwant
6c02259 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@whyrusleeping
extract logging
e5a2896 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@jbenet
Merge pull request ipfs#1672 from ipfs/feat/unwant
df861af 
implement unwant command to remove blocks from wantlist
@Luzifer
Use exec to start IPFS daemon
1cdafc7 
This incorporates feedback from @RX14 in ipfs#1685 and might fix ipfs#1537 as the ipfs daemon would get the stop signal from the docker daemon... Maybe that way it stops in a cleaner manner...

License: MIT
Signed-off-by: Knut Ahlers <knut@ahlers.me>
@klauspost
Fix gzip compression level not being set.
4b81d9e 
If "compression-level" is set, the compression is set to gzip.Nocompression.

License: MIT
Signed-off-by: Klaus Post <klauspost@gmail.com>
@jbenet
Merge pull request ipfs#1701 from ipfs/feat/extract-logging
46e888b 
extract logging
@jbenet
Merge pull request ipfs#1703 from Luzifer/signals
c77a96f 
Use exec to start IPFS daemon
@whyrusleeping
update go-peerstream to newest version
973c5fa 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@whyrusleeping
update go-datastore to latest
35a5ca0 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@jbenet
Merge pull request ipfs#1709 from ipfs/godep-update
889603f 
Godep update
@whyrusleeping
dont need blockservice workers anymore
47b85c7 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
chriscool and others added 25 commits October 4, 2015 11:39
@chriscool
sharness: swap test_*cmp arguments
e499ee4 
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
@jbenet
Merge pull request ipfs#1792 from ipfs/fix-test-cmp-args
f70846f 
Fix test cmp args
@jbenet
mocknet: conn close idempotent with process.
a7576c9 
License: MIT
Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
@jbenet
Merge pull request ipfs#1796 from ipfs/mocknet-fix
e0f0417 
mocknet: conn close idempotent with process.
@rht
Use common progressbar function for cat and get
7caba7e 
License: MIT
Signed-off-by: rht <rhtbot@gmail.com>
@rht
Add context to coreunix.Cat argument
6ae0973 
License: MIT
Signed-off-by: rht <rhtbot@gmail.com>
daemon: instrument the gateway and api HTTP handlers
dd20f48 
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
@jbenet
Merge pull request ipfs#1799 from ipfs/prometheus-http
bb8e231 
daemon: instrument the gateway and api HTTP handlers
@whyrusleeping @jbenet
rate limit concurrent peer dials
1c2223d 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@jbenet
Merge pull request ipfs#1797 from rht/fix/cat
b415e06 
Add context to coreunix.Cat argument
@whyrusleeping
fix too many FD error on osx
c1c9a74 
License: MIT
Signed-off-by: Jeromy Johnson <why@ipfs.io>
@whyrusleeping
update go-msgio dependency
8e79770 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@frrist
Added an xml decoder, Fixes ipfs#1612
6e24352 
License: MIT
Signed-off-by: Forrest Weston <forrest.weston@gmail.com>
@jbenet
Merge pull request ipfs#1815 from ipfs/update/msgio
9cfa23e 
update go-msgio dependency
@jbenet
Merge pull request ipfs#1811 from ForrestWeston/master
a0f119f 
Added an xml decoder, Fixes ipfs#1612
@jbenet
Merge pull request ipfs#1802 from ipfs/fix/too-many-fd
26d40b2 
rate limit concurrent peer dials
@caioalonso
adds -H as short option for 'ipfs add --hidden'
dc85abb 
License: MIT
Signed-off-by: Caio Alonso <caio@caioalonso.com>
@jbenet
Merge pull request ipfs#1825 from CaioAlonso/short-hidden-opt
29dc32f 
Adds -H as short option for 'ipfs add --hidden'
@jbenet
Merge pull request ipfs#1779 from rht/latest-progressbar
bc0f0c2 
Use common progressbar function for cat and get
@whyrusleeping
update go-multiaddr-net dependency
67d17c6 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@jbenet
Merge pull request ipfs#1829 from ipfs/update-maddr-net
fef7030 
update go-multiaddr-net dependency
@whyrusleeping
update go-peerstream dependency
31d7f03 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@whyrusleeping
vendor in new iptb code (and as a result, go-multiaddr-net and friends
4ace45d 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@whyrusleeping
fix random bitswap hangs
c6f9338 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@jbenet
Merge pull request ipfs#1832 from ipfs/fix/bitswap-hang
bea47c9 
Fix/bitswap hang
@jbenet jbenet added the status/in-progress In progress label Oct 15, 2015
@whyrusleeping
Copy link
Member

what is going on here?

@rht
Copy link
Contributor Author

rht commented Oct 15, 2015

ctx: pushed from the wrong branch then dropped out of internet

@rht rht closed this Oct 15, 2015
@jbenet jbenet removed the status/in-progress In progress label Oct 15, 2015
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