Commit Graph

5401 Commits

Author SHA1 Message Date
Jeromy Johnson
471d4d10eb Merge pull request #2311 from ipfs/feature/fix-up-ipfs-file-comments
Fixed spelling errors, added oxford comma
2016-02-08 12:07:20 -08:00
Jeromy Johnson
f3d754c8e0 Merge pull request #2307 from ipfs/feature/diag-net-comments
Formatted diag net comments
2016-02-08 09:15:43 -08:00
Jeromy Johnson
537cd48337 Merge pull request #2310 from ipfs/docs/install-tips
add some tips for making dep installs go smoothly
2016-02-06 19:51:35 -08:00
Richard Littauer
93b6725220 Fixed spelling errors, added oxford comma
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-02-06 18:11:17 -05:00
Richard Littauer
7b1aa49c75 Added quotes around make install,
reworded

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-02-06 17:27:52 -05:00
Jeromy
455a785865 add some tips for making dep installs go smoothly
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-06 04:48:01 -08:00
Jeromy Johnson
5a0b8023be Merge pull request #2256 from ipfs/feat/gx-libp2p
vendor libp2p with gx
2016-02-05 16:52:02 -08:00
Jeromy
337313845d add deps target to nofuse
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-05 16:00:57 -08:00
Jeromy
5c5ad7ad71 note in assets test
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-05 16:00:29 -08:00
Jeromy
c9b83c506c makefile fixes
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-05 15:50:40 -08:00
Richard Littauer
d3b1bb4e10 Formatted diag net comments
Also added default notice aboue plain text

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-02-05 18:21:48 -05:00
Jeromy Johnson
ffc4831bcc Merge pull request #2302 from ipfs/feature/gx-libp2p-readme-edits
Cleaned up README
2016-02-05 12:30:20 -08:00
Jeromy Johnson
546fabd9a9 Merge pull request #2300 from ipfs/feature/add-example-to-id
Added an example to `ipfs id`
2016-02-05 12:22:07 -08:00
Richard Littauer
9ade2109ed Cleaned up README
I did the following:
- Capitalized IPFS wherever it did not explicitely refer to the CLI command
- Moved Dev Dependencies into the Install section
- Added a Table of Contents
- Capitalised and added periods to various sentences
- Capitalised Go
- Removed double empty lines
- Reindented a few sections to make the flow more clear.
- Added a note to the Install section about how to canonically install.

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-02-05 11:08:12 -05:00
Richard Littauer
062b3438a2 Added an example to ipfs id
I was super confused how to use the `-f` flag. This helped, but I had to go into
the test files to find it. Added it here.

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-02-05 11:05:51 -05:00
Lars Gierth
ce0d62dca3 docker: save image space by excluding .git/
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-02-05 04:03:30 +01:00
Lars Gierth
c103efc1a9 sharness: disable t0300-docker-image on Circle CI
The actual tests for the IPFS daemon within the image,
which were added in the previous commits, made Circle CI unhappy.

Circle CI runs an old version of Docker
which still uses LXC instead of libcontainer.
The existing lxc-attach hack is testament to that.

We might be able to get it work [1][2]
but it's really not worth it at the moment,
and Circle CI isn't a good option for Docker things, right now.

[1] https://jpetazzo.github.io/2014/03/23/lxc-attach-nsinit-nsenter-docker-0-9/
[2] https://github.com/jpetazzo/nsenter

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-02-05 03:11:50 +01:00
Jeromy Johnson
0de7104335 Merge pull request #2221 from rht/fix/gc-panic
Wire ctx to getdag operations in gc.GC
2016-02-04 16:13:06 -08:00
Jeromy Johnson
881ec275ae Merge pull request #2297 from ipfs/t0240-improvements
t0240 improvements
2016-02-04 16:10:26 -08:00
Jeromy Johnson
9300af5c58 Merge pull request #2285 from ipfs/docs/cleanup-id-mans
Cleaned up `ipfs id` mans
2016-02-04 15:12:28 -08:00
Christian Couder
91322346e2 t0240: improvements
This:

- uses startup_cluster() from iptb-lib.sh,
- avoids running test_expect_success() inside test_expect_success()
  as it makes the output confusing,
- makes the number of test nodes easily configurable.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-02-04 22:42:02 +01:00
Christian Couder
78f2f10ccf iptb-lib: small improvements
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-02-04 22:32:49 +01:00
Jeromy Johnson
268ec7899c Merge pull request #2292 from ipfs/docs/optional-template
Changed wording to make optional stand out
2016-02-04 10:47:36 -08:00
Jeromy Johnson
db4add4edb Merge pull request #2294 from ipfs/feat/active-clear
command to clear inactive requests from request log
2016-02-04 10:47:10 -08:00
Lars Gierth
81c8cffee9 Rework the Dockerfile
- Have two Dockerfiles doing essentially the same,
  but optimized for build time (for tests)
  and image size (for Docker Hub)
- Fetch gx dependencies
- Expose port 4002 for utp
- Specify go version, currently 1.5.3-r0
- Create ephemeral fs-repo if none is mounted
- Have t0300-docker-image actually test IPFS, not just an echo
- Make everything a bit less hardcoded
- Remove dead shacheck

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-02-04 10:46:26 -08:00
Jeromy Johnson
b11abe283b Merge pull request #2267 from rht/wire/ctx-http-request-2
Directly wire ctx into http request
2016-02-04 10:24:26 -08:00
Jeromy
1e1c89c2a8 command to clear inactive requests from request log
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-04 10:04:04 -08:00
Richard Littauer
2c0846c8e9 Changed wording to make optional stand out
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-02-04 09:48:16 -05:00
Jeromy
15d827b912 reword error message to confuse whyrusleeping less
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-03 11:40:13 -08:00
Richard Littauer
e51b82149a Cleaned up ipfs id mans
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-02-03 11:40:13 -08:00
Jeromy Johnson
e8c753d2e5 Merge pull request #2282 from ipfs/docs/remove-extra-space
Removed extra space
2016-02-03 09:24:46 -08:00
Jeromy Johnson
8fadb11ae3 Merge pull request #2284 from Kubuxu/fix/#2035
Change sample API origin settings from wildcard to example.com
2016-02-02 22:35:27 -08:00
Jeromy Johnson
82cc61614e Merge pull request #2288 from tomgg/tmg/trivial
trivial: various superficial fixes
2016-02-02 22:27:43 -08:00
Thomas Gardner
aaa6569f2c trivial: various superficial fixes
misc/completion/ipfs-completion.bash: add `ipfs stats` to BASH completion

core/commands/mount_unix.go: ensure error is not nil before printing it

contribute.md: fix bibliography indexing in example

core/commands/swarm.go: change tabs to spaces in USAGE message

*: 80-column readability improvements

License: MIT
Signed-off-by: Thomas Gardner <tmg@fastmail.com>
2016-02-03 15:46:28 +10:00
Jakub Sztandera
e26c1fe60a Change sample API origin settings from wildcard to example.com
Resolves #2035

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@gmail.com>
2016-02-02 22:24:07 +01:00
Richard Littauer
dc5b45e377 Removed extra space
This was coming up as an extra space. For instance:

```curl -i http://localhost:5001/api/v0/config?arg=kitten
//"Message": "Failed to get config value:  key has no attributes",
```

Removing it here.

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-02-02 15:26:01 -05:00
Jeromy Johnson
5274ad9e8f Merge pull request #2281 from ipfs/docs/add-quotes-to-config
Add quotes to ipfs config
2016-02-02 09:42:08 -08:00
Jeromy Johnson
585ef2b957 Merge pull request #2275 from ipfs/refactor-iptb-tests
Refactor iptb tests
2016-02-02 08:44:57 -08:00
Richard Littauer
548ad107a2 Add quotes to ipfs config
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-02-02 11:32:30 -05:00
Jeromy Johnson
f5e7a3b226 Merge pull request #2277 from ipfs/feat/active-cmds
commands diagnostics
2016-02-02 08:09:34 -08:00
Jeromy
4753e6c292 sort options and add id to verbose output
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-01 22:05:29 -08:00
Jeromy
df0f87a8eb verbose mode
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-01 17:21:31 -08:00
Jeromy
6e863830bf some comments
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-01 16:39:17 -08:00
Jeromy
c7c1e72eaf add sharness test
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-01 16:35:22 -08:00
Jeromy
366d7db3d3 add command to view active api requests
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-02-01 15:44:43 -08:00
Christian Couder
79b6297770 t0130: use startup_cluster() from iptb-lib.sh
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-02-01 23:23:53 +01:00
Christian Couder
e0a48ffcf6 iptb-lib: add startup_cluster()
While at it let's cleanup startup_cluster() too.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-02-01 23:22:35 +01:00
Christian Couder
8b875ebe77 t0121, t0130, t0240: use iptb-lib.sh
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-02-01 13:48:00 +01:00
Christian Couder
d1f15d445b iptb-lib: small cleanup
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-02-01 13:23:51 +01:00
Christian Couder
cacb1cc2d4 sharness: add lib/iptb-lib.sh
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-02-01 13:17:13 +01:00