Commit Graph

10437 Commits

Author SHA1 Message Date
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
Richard Littauer
f92e407cd1 Capitalized Merkle, added single quotes, periods
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-02-04 17:24:48 -05: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
Jakub Sztandera
ac37d23662 Add dns and resolve commands to ROApi
Resolves #2287

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@gmail.com>
2016-02-04 09:14:19 +01: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
Jonathan Dahan
77bfa9d145 More robust version checking
License: MIT
Signed-off-by: Jonathan Dahan <jonathan@jonathan.is>
2016-02-01 16:34:00 -05: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
Jeromy
2263539c1c do that last thing again
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-31 15:37:39 -08:00
Michael Muré
e86c82c68d Add log events when blocks are added/removed from the blockstore
License: MIT
Signed-off-by: Michael Muré <mure.michael@gmail.com>
2016-01-31 19:31:39 +01:00
Jeromy
c0101c0c4b update libp2p dep
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-31 10:19:50 -08:00
Jeromy
4012c6bf1d documentation saves lives
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 16:32:12 -08:00
Jeromy
c900a1e6b9 also, yaml is a terrible format
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 16:29:27 -08:00
Jeromy
49ae649760 lets not have any documentation for this stupid file format, its awesome
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 16:22:03 -08:00
Jeromy
57c6e1edb7 circleci has bad documentation
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 16:17:18 -08:00
Jeromy
89bb3385f5 ciiiii issss awesome
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 11:39:56 -08:00
Jeromy
ed3841f687 on a scale from 1 to annoying, i don't like circleCI anymore at all
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 11:30:10 -08:00
Jeromy
bf3ad94a5b i'm beginning to dislike circleci
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 11:22:09 -08:00
Jeromy
1b6e426fce circleci fun fun fun
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 11:03:48 -08:00
Jeromy
d141589d62 travis file change
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 10:38:37 -08:00
Jeromy
b96c2e6100 circleci verbose
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 10:37:07 -08:00
Jeromy Johnson
62ba5eb913 Merge pull request #2270 from ipfs/feature/add-more-quotes
Added quotes to swarm and ping descriptions
2016-01-30 09:55:47 -08:00
Jeromy
b5a93ead62 gx install stuff in cmd/ipfs/Makefile
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-01-30 09:34:14 -08:00