Merge branch 'sync' into beta

Merge remote-tracking branch 'origin/transaction_queue_race' into beta
Merge remote-tracking branch 'origin/sync' into beta
2016-03-15 19:44:15 +01:00 · 2016-03-15 12:56:30 +01:00 · 2016-03-15 12:56:17 +01:00 · 2016-03-14 19:13:07 +01:00 · 2016-03-14 18:58:23 +01:00 · 2016-03-14 18:56:27 +01:00
11 changed files with 38 additions and 38 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,18 +1,18 @@
 [root]
 name = "parity"
-version = "1.1.0"
+version = "1.0.0"
 dependencies = [
 "clippy 0.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
 "ctrlc 1.1.1 (git+https://github.com/tomusdrw/rust-ctrlc.git)",
 "daemonize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "docopt 0.6.78 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.1.0",
- "ethcore-devtools 1.1.0",
- "ethcore-rpc 1.1.0",
- "ethcore-util 1.1.0",
- "ethminer 1.1.0",
- "ethsync 1.1.0",
+ "ethcore 1.0.0",
+ "ethcore-devtools 1.0.0",
+ "ethcore-rpc 1.0.0",
+ "ethcore-util 1.0.0",
+ "ethminer 1.0.0",
+ "ethsync 1.0.0",
 "fdlimit 0.1.0",
 "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "number_prefix 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -197,7 +197,7 @@ dependencies = [

 [[package]]
 name = "ethash"
-version = "1.1.0"
+version = "1.0.0"
 dependencies = [
 "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "primal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -206,14 +206,14 @@ dependencies = [

 [[package]]
 name = "ethcore"
-version = "1.1.0"
+version = "1.0.0"
 dependencies = [
 "clippy 0.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethash 1.1.0",
- "ethcore-devtools 1.1.0",
- "ethcore-util 1.1.0",
+ "ethash 1.0.0",
+ "ethcore-devtools 1.0.0",
+ "ethcore-util 1.0.0",
 "heapsize 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -225,21 +225,21 @@ dependencies = [

 [[package]]
 name = "ethcore-devtools"
-version = "1.1.0"
+version = "1.0.0"
 dependencies = [
 "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "ethcore-rpc"
-version = "1.1.0"
+version = "1.0.0"
 dependencies = [
 "clippy 0.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethash 1.1.0",
- "ethcore 1.1.0",
- "ethcore-util 1.1.0",
- "ethminer 1.1.0",
- "ethsync 1.1.0",
+ "ethash 1.0.0",
+ "ethcore 1.0.0",
+ "ethcore-util 1.0.0",
+ "ethminer 1.0.0",
+ "ethsync 1.0.0",
 "jsonrpc-core 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "jsonrpc-http-server 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -253,7 +253,7 @@ dependencies = [

 [[package]]
 name = "ethcore-util"
-version = "1.1.0"
+version = "1.0.0"
 dependencies = [
 "arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "bigint 0.1.0",
@@ -263,7 +263,7 @@ dependencies = [
 "elastic-array 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "eth-secp256k1 0.5.4 (git+https://github.com/ethcore/rust-secp256k1)",
- "ethcore-devtools 1.1.0",
+ "ethcore-devtools 1.0.0",
 "heapsize 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "igd 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -288,12 +288,12 @@ dependencies = [

 [[package]]
 name = "ethminer"
-version = "1.1.0"
+version = "1.0.0"
 dependencies = [
 "clippy 0.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.1.0",
- "ethcore-util 1.1.0",
+ "ethcore 1.0.0",
+ "ethcore-util 1.0.0",
 "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "rayon 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -302,13 +302,13 @@ dependencies = [

 [[package]]
 name = "ethsync"
-version = "1.1.0"
+version = "1.0.0"
 dependencies = [
 "clippy 0.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
 "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.1.0",
- "ethcore-util 1.1.0",
- "ethminer 1.1.0",
+ "ethcore 1.0.0",
+ "ethcore-util 1.0.0",
+ "ethminer 1.0.0",
 "heapsize 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
 name = "parity"
-version = "1.1.0"
+version = "1.0.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore development/test/build tools"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-devtools"
-version = "1.1.0"
+version = "1.0.0"
 authors = ["Ethcore <admin@ethcore.io>"]

 [dependencies]
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ethash"
-version = "1.1.0"
+version = "1.0.0"
 authors = ["arkpar <arkadiy@ethcore.io"]

 [lib]
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore"
-version = "1.1.0"
+version = "1.0.0"
 authors = ["Ethcore <admin@ethcore.io>"]

 [dependencies]
--- a/evmjit/Cargo.toml
+++ b/evmjit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "evmjit"
-version = "1.1.0"
+version = "1.0.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]

 [lib]
--- a/miner/Cargo.toml
+++ b/miner/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethminer library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethminer"
-version = "1.1.0"
+version = "1.0.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"

--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore jsonrpc"
 name = "ethcore-rpc"
-version = "1.1.0"
+version = "1.0.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
 build = "build.rs"
--- a/sync/Cargo.toml
+++ b/sync/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore blockchain sync"
 name = "ethsync"
-version = "1.1.0"
+version = "1.0.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]

--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "1.1.0"
+version = "1.0.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"

--- a/util/src/misc.rs
+++ b/util/src/misc.rs
@@ -70,7 +70,7 @@ pub fn contents(name: &str) -> Result<Bytes, UtilError> {

 /// Get the standard version string for this software.
 pub fn version() -> String {
-	format!("Parity/v{}-unstable-{}-{}/{}-{}-{}/rustc{}", env!("CARGO_PKG_VERSION"), short_sha(), commit_date().replace("-", ""), Target::arch(), Target::os(), Target::env(), rustc_version::version())
+	format!("Parity/v{}-beta-{}-{}/{}-{}-{}/rustc{}", env!("CARGO_PKG_VERSION"), short_sha(), commit_date().replace("-", ""), Target::arch(), Target::os(), Target::env(), rustc_version::version())
 }

 /// Get the standard version data for this software.
Author	SHA1	Message	Date
arkpar	570d2c21d3	Merge branch 'sync' into beta	2016-03-15 19:44:15 +01:00
arkpar	b9fc5bdda0	Merge remote-tracking branch 'origin/transaction_queue_race' into beta	2016-03-15 12:56:30 +01:00
arkpar	1964ed7eb3	Merge remote-tracking branch 'origin/sync' into beta	2016-03-15 12:56:17 +01:00
arkpar	60bcab3e48	Merge remote-tracking branch 'origin/docker' into beta	2016-03-14 19:13:07 +01:00
arkpar	ebb7699da2	Merge remote-tracking branch 'origin/pv63-receipts' into beta	2016-03-14 18:58:23 +01:00
arkpar	78821bb935	Merge remote-tracking branch 'origin/unclesminingfix' into beta	2016-03-14 18:56:27 +01:00
arkpar	e8a21116f7	missing mut	2016-03-14 15:50:45 +01:00
Gav Wood	9f81b07224	Lock reports to avoid out of order badness.	2016-03-14 15:50:32 +01:00
arkpar	8eeda2b1a3	Fixed handshake leak	2016-03-14 15:50:03 +01:00
Arkadiy Paronyan	0087568c16	Merge pull request #712 from ethcore/beta-version Version 1.0 in beta	2016-03-14 14:56:44 +01:00
arkpar	75a11ba9be	Merge remote-tracking branch 'origin/targetgaslimit' into beta	2016-03-14 14:05:38 +01:00
Nikolay Volf	4ac9807bc1	fixing tests for beta	2016-03-14 11:12:15 +01:00
arkpar	1c26ffa208	Merge branch 'network' into beta	2016-03-14 11:11:36 +01:00
arkpar	f8b18d5d7b	Merge remote-tracking branch 'origin/rpc-personal-tests' into beta	2016-03-14 10:30:22 +01:00
arkpar	b327e79b42	Merge remote-tracking branch 'origin/fixing_warnings' into beta	2016-03-14 10:28:38 +01:00
arkpar	8e2f35856a	Merge remote-tracking branch 'origin/docoptclean' into beta	2016-03-14 10:26:59 +01:00
arkpar	a029551b0b	Merge branch 'build' into beta	2016-03-14 09:56:44 +01:00
arkpar	320581a3e4	Merge branch 'fix-discovery' into beta	2016-03-14 01:33:41 +01:00
arkpar	f77b4119da	Version 1.0	2016-03-14 01:01:15 +01:00