Skip to content
This repository has been archived by the owner on Oct 4, 2019. It is now read-only.

Commit

Permalink
Merge pull request #258 from whilei/3.5
Browse files Browse the repository at this point in the history
Very minor accuracy edits
  • Loading branch information
whilei authored Jun 2, 2017
2 parents d48745b + 3100f66 commit 402c170
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ The external chain configuration file specifies valid settings for the following
| `bootstrap` | Determines __bootstrap nodes__ in [enode format](https://github.com/ethereumproject/wiki/wiki/enode-url-format). |


*Only the `name` field is optional. Geth will panic if any required field is missing, invalid, or in conflict with another flag. This renders `--chain-config` __incompatible__ with `--chain`, `--bootnodes`, and `--testnet`. It remains __compatible__ with `--data-dir`.*
*Only the `name` field is optional. Geth will panic if any required field is missing, invalid, or in conflict with another flag. This renders `--chain` __incompatible__ with `--bootnodes`, and `--testnet`. It remains __compatible__ with `--data-dir`.*

To learn more about external chain configuration, please visit the [External Command Line Options Wiki page](https://github.com/ethereumproject/go-ethereum/wiki/Command-Line-Options.md).

Expand Down
2 changes: 1 addition & 1 deletion cmd/geth/migrate_datadir.bats
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ teardown() {

# 13 is last test.
# Important: You must update this number if the number of tests change.
if [ "$BATS_TEST_NUMBER" -eq 13 ]; then
if [ "$BATS_TEST_NUMBER" -eq 11 ]; then
# Remove downloaded executables.
rm -rf "$CMD_DIR"

Expand Down

0 comments on commit 402c170

Please sign in to comment.