Skip to content
This repository was archived by the owner on Aug 2, 2021. It is now read-only.

cmd/swarm: correct bzznetworkid flag description#1761

Merged
skylenet merged 4 commits intomasterfrom
fix-default-network-flag
Sep 20, 2019
Merged

cmd/swarm: correct bzznetworkid flag description#1761
skylenet merged 4 commits intomasterfrom
fix-default-network-flag

Conversation

@skylenet
Copy link
Copy Markdown
Contributor

@skylenet skylenet commented Sep 16, 2019

As reported by @holisticode , the flag description is currently wrong.

Before:
--bzznetworkid value Network identifier (integer, default 3=swarm testnet) (default: 0) [$SWARM_NETWORK_ID]

After:
--bzznetworkid value Numerical network identifier. The default is the public swarm testnet (default: 4) [$SWARM_NETWORK_ID]

@zelig
Copy link
Copy Markdown
Member

zelig commented Sep 20, 2019

@skylenet please resolve conflict

@skylenet skylenet merged commit 6f9d3c0 into master Sep 20, 2019
chadsr added a commit to chadsr/swarm that referenced this pull request Sep 23, 2019
* 'master' of github.com:ethersphere/swarm: (32 commits)
  network/stream: refactor cursors tests (ethersphere#1786)
  network: Add capabilities if peer from store does not have it (ethersphere#1791)
  Swap logger (ethersphere#1754)
  network: Add capability filtered depth calculation (ethersphere#1787)
  travis: remove go1.12 job (ethersphere#1784)
  cmd/swarm: correct bzznetworkid flag description (ethersphere#1761)
  network, pss: Capability in pss (ethersphere#1764)
  network/stream: handle nil peer in TestNodesExchangeCorrectBinIndexes (ethersphere#1779)
  protocols, retrieval: swap-enabled messages implement Price (ethersphere#1771)
  cmd/swarm-smoke: fix waitToPushSynced connection closing (ethersphere#1781)
  cmd/swarm: simplify testCluster.StartNewNodes (ethersphere#1777)
  build: increase golangci-lint deadline (ethersphere#1778)
  docker: ignore build/bin when copying files (ethersphere#1780)
  swap: fix and rename Peer.getLastSentCumulativePayout (ethersphere#1769)
  network/stream: more resilient TestNodesCorrectBinsDynamic (ethersphere#1776)
  network: Add Capabilities to Kademlia database (ethersphere#1713)
  network: add own address to KademliaInfo (ethersphere#1775)
  pss: Refactor. Step 2. Refactor forward cache (ethersphere#1742)
  all: configurable payment/disconnect thresholds (ethersphere#1729)
  network/stream/v2: more resilient TestNodesExchangeCorrectBinIndexes (ethersphere#1760)
  ...
@skylenet skylenet deleted the fix-default-network-flag branch September 30, 2019 11:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants