# Conflicts:
#	demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm
#	demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm
#	polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm
#	polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm
#	substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm
#	substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm
#	substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm
#	substrate/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.wasm

* Final tweaks for PoC-2 runtime upgrade

* Address grumble

* Avoid slow wasm

* New poc-2-era bootnodes

* Fix warning

* Typo

* Fix for allocation in wasm

* Fix & runtimes.

* PoC-1 should be default.

* Name testnet Krumme Lanke, update README

* YML update

* Use the right port

* Make Kademlia connection more robust

* Make custom connetions more robust

* Fix potential deadlock

* Style and minor changes

* Upgrade rust-libp2p

# Conflicts:
#	demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm
#	demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm
#	polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm
#	polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm
#	substrate/runtime/contract/src/lib.rs
#	substrate/runtime/staking/src/genesis_config.rs
#	substrate/runtime/staking/src/lib.rs

* heap-size is a CLI arg, make it 512 by default

* Fix tests

* Adaptive heap size.

* Allow storage_exists

Svyatoslav Nikolsky authored Jul 16, 2018 and Arkadiy Paronyan committed Jul 16, 2018

* fix light sync deadlock

* some more docs