Conflicts:
	ethcore/src/miner/miner.rs
	parity/cli/config.full.toml
	parity/cli/mod.rs
	parity/configuration.rs

* Handle reorganizations in the state cache

* Renamed and documented a few methods

* Basic test

* Renamed pending to buffered

* Caching optimizations

* Fixed a test

* Fixed a test

* Fixing RPC Filter conversion to EthFilter

Conflicts:
	rpc/src/v1/impls/eth.rs
	rpc/src/v1/types/filter.rs

* Removing limit

* Fixing rpc tests

* Using pending block only if not old

Conflicts:
	ethcore/src/miner/miner.rs
	rpc/src/v1/impls/eth.rs
	rpc/src/v1/impls/eth_filter.rs

* Fixing compilation issues

* RocksDB version bump

* Preserve cache on reverting the snapshot (#2488)

* Preserve cache on reverting the snapshot

* Renamed merge_with into replace_with

* Renamed and documented snapshotting methods

* Track dirty accounts in the state (#2461)

* State to track dirty accounts

* Removed clone_for_snapshot

* Renaming stuff

* Documentation and other minor fixes

* Replaced MaybeAccount with Option

* Adjustable stack size for EVM (#2483)

* stack size for io workers & evm threshold

* rust way to remember stack size

* right value

* 24kb size

* some stack reduction

* Fixed overflow panic in handshake_panic (#2495)

Tomasz Drwięga authored Oct 07, 2016 and Arkadiy Paronyan committed Oct 07, 2016

* Alter gas priorities to include gas_price also

* CLI options and tests

* Adding ordering by gas

* whitespace

[ci:skip]

Nikolay Volf authored Oct 07, 2016 and Arkadiy Paronyan committed Oct 07, 2016

* Update migration.rs

In highly unlikely scenario when the bloom update fails it will at least try again on the next run

* proper exchange

Nikolay Volf authored Oct 05, 2016 and Arkadiy Paronyan committed Oct 05, 2016

* get rid of collects & zips

* not an option here!

fix windows

set RUSTFLAGS=-Zorbit=off windows

add RUSTFLAGS=-Zorbit=false in windows build

Beta backports

Marek Kotewicz authored Sep 28, 2016 and Arkadiy Paronyan committed Oct 04, 2016

* fixed #2263, geth keys with ciphertext shorter than 32 bytes

* replace unwrap with more helpful expect

* tests for decrypting short secrets

Nikolay Volf authored Oct 04, 2016 and Arkadiy Paronyan committed Oct 04, 2016

* bump json-ipc-server

* bump again

set RUST 1.11 for windows

fix broken beta compilation (backport to beta)

* v1.3.3

* Jumptable cache

add checksum

Tomasz Drwięga authored Sep 29, 2016 and Arkadiy Paronyan committed Sep 29, 2016

* Removing extras data from retracted blocks. (#2375)

* Removing extras data from retracted blocks.

* Adding a test case

Conflicts:
	ethcore/src/blockchain/blockchain.rs

* Fixing transaction queue

Conflicts:
	ethcore/src/miner/transaction_queue.rs

* Prioritizing re-imported transactions (#2372)

* Prioritizing re-imported transactions

* Fixing compilation on beta

Conflicts:
	Cargo.lock
	ethcore/src/client/client.rs
	ethcore/src/miner/transaction_queue.rs

* Post-merge fixes

Nikolay Volf authored Sep 29, 2016 and Arkadiy Paronyan committed Sep 29, 2016

* proper bloom

* incremental bloom updates

* crate update

* return of the column

* fix n^2 byteorder write

* add notes to funs

* working bloom commits

* Optimizations

* bloom diag

* migration basic

* migration ongoing

* migration finalizing

* mingration api workarounds

* fix test_client setups

* snapshot bloom update

* review fixes

* just forward keys in the migration

* migration extra tracing

* fix migration path

* remove close pray

* review issues

* Fixing jit feature compilation

* Fixing jit feature compilation (#2310)

Conflicts:
	Cargo.lock

* Delegatecall support

add RUST_BACKTRACE=1 in test stage

* State cache

* Reduced copying data between caches

Whitespace and optional symbols

* Set a limit on storage cache

* Style and docs

* Reorder transaction_by_hash to favour canon search

* Fix test.

* Lenient bytes deserialization

* Error when deserializing invalid hex

* Error when deserializing invalid hex

Conflicts:
	rpc/src/v1/types/bytes.rs