Commit Graph

1035 Commits

Author SHA1 Message Date
GitLab Build Bot
1a9a142a69 [ci skip] js-precompiled 20161213-171715 2016-12-13 17:19:48 +00:00
Gav Wood
c6281fc1c7
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-13 17:26:09 +01:00
Robert Habermeier
45ef986c04 light: finish basic header chain and add tests 2016-12-13 14:48:03 +01:00
Tomasz Drwięga
f47be50843 Using jsonrpc-macros 2016-12-13 14:40:35 +01:00
GitLab Build Bot
1114ad3ca7 [ci skip] js-precompiled 20161213-051314 2016-12-13 05:15:44 +00:00
Gav Wood
ab4d666681
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-12 16:35:11 +01:00
GitLab Build Bot
d2a34acdfd [ci skip] js-precompiled 20161212-143454 2016-12-12 14:37:25 +00:00
GitLab Build Bot
1db4647327 [ci skip] js-precompiled 20161212-052342 2016-12-12 05:26:15 +00:00
GitLab Build Bot
f1096619a5 [ci skip] js-precompiled 20161212-034026 2016-12-12 03:43:28 +00:00
Gav Wood
758744449f
Expose all other RPCs. 2016-12-12 02:57:19 +01:00
GitLab Build Bot
29af24519d [ci skip] js-precompiled 20161211-234535 2016-12-11 23:48:03 +00:00
Gav Wood
d81d9d77b2
Wire-in Updater to parity RPC 2016-12-11 23:15:52 +01:00
Gav Wood
d8ad09b654
Make updater an IPC module. 2016-12-11 22:47:43 +01:00
GitLab Build Bot
2de64bb5e4 [ci skip] js-precompiled 20161211-202217 2016-12-11 20:24:36 +00:00
GitLab Build Bot
f4134cf634 [ci skip] js-precompiled 20161211-193650 2016-12-11 19:39:15 +00:00
Gav Wood
e528ac9217
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-11 20:20:09 +01:00
GitLab Build Bot
282178e1fa [ci skip] js-precompiled 20161211-190404 2016-12-11 19:06:28 +00:00
Gav Wood
33f266fffe
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-11 19:26:24 +01:00
Gav Wood
10b0898bdf
Crate tidyups.
- Move Updater into its own crate.
- Change ethcore -> parity in authors, homepages and licenses.
2016-12-11 19:14:42 +01:00
GitLab Build Bot
797d787a7b [ci skip] js-precompiled 20161211-164839 2016-12-11 16:51:09 +00:00
Gav Wood
e09b1faf20
Fix semver version issues. 2016-12-11 17:13:26 +01:00
GitLab Build Bot
839e3385dd [ci skip] js-precompiled 20161211-155716 2016-12-11 16:00:49 +00:00
Gav Wood
74a6203f72
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-11 15:43:28 +01:00
GitLab Build Bot
778f5bbfaf [ci skip] js-precompiled 20161211-141210 2016-12-11 14:14:41 +00:00
arkpar
a49ff3fb32 Merge branch 'master' of github.com:ethcore/parity into cli-rpc 2016-12-11 13:30:48 +01:00
arkpar
2c653d2c2e Merge w master 2016-12-11 13:11:08 +01:00
GitLab Build Bot
95af942fc9 [ci skip] js-precompiled 20161211-093638 2016-12-11 09:40:44 +00:00
GitLab Build Bot
17dee5f1a2 [ci skip] js-precompiled 20161211-091947 2016-12-11 09:22:07 +00:00
GitLab Build Bot
bfb684a641 [ci skip] js-precompiled 20161211-012647 2016-12-11 01:28:52 +00:00
Gav Wood
0a494962e4
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-11 02:13:52 +01:00
Gav Wood
120564ff29
Avoid pulling in hash_fetch. 2016-12-11 02:12:52 +01:00
Gav Wood
0302d582d2
Fix build. 2016-12-11 02:02:40 +01:00
GitLab Build Bot
62492a915e [ci skip] js-precompiled 20161210-230517 2016-12-10 23:07:55 +00:00
GitLab Build Bot
5ec1ff43ea [ci skip] js-precompiled 20161210-212741 2016-12-10 21:29:53 +00:00
Gav Wood
316c25d9f8
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-10 14:08:41 +01:00
Gav Wood
edd5e76050
Merge branch 'consistent-id' into check-updates 2016-12-09 23:12:36 +01:00
Kristoffer Ström
0e516162c3 Rebased on master 2016-12-09 22:27:32 +01:00
Robert Habermeier
503b126c93 Merge branch 'master' into lightserv 2016-12-09 21:37:55 +01:00
Gav Wood
2226324495 Merge pull request #3778 from ethcore/auth-round-test
AuthorityRound network simulation test
2016-12-09 20:58:05 +01:00
Gav Wood
46af3d18da
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-09 20:45:15 +01:00
arkpar
97f358ced9 AuthorityRound network simulation test 2016-12-09 20:38:06 +01:00
GitLab Build Bot
647b62b4a2 [ci skip] js-precompiled 20161209-182130 2016-12-09 18:23:46 +00:00
GitLab Build Bot
fd23a2972c [ci skip] js-precompiled 20161209-165845 2016-12-09 17:00:59 +00:00
GitLab Build Bot
1213ada59c [ci skip] js-precompiled 20161209-125036 2016-12-09 12:52:50 +00:00
GitLab Build Bot
83f791fa5d [ci skip] js-precompiled 20161209-044115 2016-12-09 04:43:19 +00:00
GitLab Build Bot
12592689dd [ci skip] js-precompiled 20161209-014235 2016-12-09 01:44:45 +00:00
Jaco Greeff
7eeac232b4 Merge branch 'master' into lightserv 2016-12-09 02:36:55 +01:00
GitLab Build Bot
e1ad347cdb [ci skip] js-precompiled 20161209-003004 2016-12-09 00:32:45 +00:00
Robert Habermeier
eec1929658 Merge branch 'master' into lightserv 2016-12-09 01:29:46 +01:00
Robert Habermeier
6f5f1f5e26 light: integrate with sync + serve_light CLI 2016-12-08 23:21:47 +01:00
Robert Habermeier
efd66f566d ethsync: optional ipc codegen 2016-12-08 19:52:48 +01:00
GitLab Build Bot
4e1b72b45c [ci skip] js-precompiled 20161208-150237 2016-12-08 15:04:38 +00:00
GitLab Build Bot
69e010bbf9 [ci skip] js-precompiled 20161208-144436 2016-12-08 14:46:49 +00:00
Robert Habermeier
3e8ee9d423 light IPC feature and mock state proofs 2016-12-08 13:44:17 +01:00
Arkadiy Paronyan
15ec63750e Enable Panic=abort (#3423)
* Enable panic=abort

* Update remaining crate versions to 1.5

* Run tests in release mode

* Enable panic=abort for release profile only

* Added travis_wait

* Travis timeout set to 40
2016-12-08 11:31:57 +01:00
Gav Wood
8903384840
Merge branch 'master' into check-updates 2016-12-07 19:19:44 +01:00
GitLab Build Bot
9e8d90b5ba [ci skip] js-precompiled 20161207-173717 2016-12-07 17:39:18 +00:00
Robert Habermeier
cdc758368a les: flesh out event handler 2016-12-07 13:52:45 +01:00
GitLab Build Bot
3388eab76a [ci skip] js-precompiled 20161207-123833 2016-12-07 12:40:35 +00:00
GitLab Build Bot
2e40a00768 [ci skip] js-precompiled 20161207-122336 2016-12-07 12:26:14 +00:00
Robert Habermeier
b38d95328d light: conditional compilation 2016-12-07 10:50:24 +01:00
Robert Habermeier
60680e1913 Merge pull request #3730 from ethcore/jsonrpc-ipc-bump
bump jsonrpc-ipc-server to fix windows build
2016-12-07 09:32:10 +01:00
Robert Habermeier
085b8ad553 Merge pull request #3527 from ethcore/client-provider
LES Part 2
2016-12-07 09:31:50 +01:00
GitLab Build Bot
97e60a6e9c [ci skip] js-precompiled 20161207-042556 2016-12-07 04:28:25 +00:00
Robert Habermeier
d28f615482 bump jsonrpc-ipc-server to fix windows build 2016-12-06 19:32:19 +01:00
GitLab Build Bot
0f76533713 [ci skip] js-precompiled 20161206-084538 2016-12-06 08:47:58 +00:00
Gav Wood
d708922d29 Merge pull request #3716 from ethcore/fdlimit
Use fdlimit utility crate from crates.io
2016-12-05 10:36:42 -08:00
GitLab Build Bot
98bfbdc5cb [ci skip] js-precompiled 20161205-174841 2016-12-05 17:50:43 +00:00
NikVolf
ebd4173d21 bump version 2016-12-05 20:15:05 +03:00
Gav Wood
afe4cc6a05
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-05 07:09:42 -08:00
GitLab Build Bot
e6ed49b2c9 [ci skip] js-precompiled 20161205-150312 2016-12-05 15:05:10 +00:00
NikVolf
42fc770d30 use crates.io crate 2016-12-05 16:25:03 +03:00
GitLab Build Bot
cf796d3ea4 [ci skip] js-precompiled 20161205-105433 2016-12-05 10:56:28 +00:00
Gav Wood
90a20a217f
Merge branch 'master' into check-updates 2016-12-04 09:01:50 -08:00
Gav Wood
0c7b7fc8bc Merge pull request #3627 from ethcore/rpc-middleware
Dapps-specific accounts
2016-12-04 08:46:05 -08:00
GitLab Build Bot
a9424bdf26 [ci skip] js-precompiled 20161204-042533 2016-12-04 04:27:27 +00:00
GitLab Build Bot
ca4aa42615 [ci skip] js-precompiled 20161203-062111 2016-12-03 06:23:18 +00:00
GitLab Build Bot
f093b077a4 [ci skip] js-precompiled 20161203-043512 2016-12-03 04:37:04 +00:00
GitLab Build Bot
f15906fe8d [ci skip] js-precompiled 20161202-201514 2016-12-02 20:18:10 +00:00
GitLab Build Bot
4c32d3ced4 [ci skip] js-precompiled 20161202-142708 2016-12-02 14:29:56 +00:00
Robert Habermeier
6e1a1f9dec Merge branch 'master' into client-provider 2016-12-02 10:06:09 +01:00
GitLab Build Bot
986e8ef9a2 [ci skip] js-precompiled 20161202-052414 2016-12-02 05:26:08 +00:00
GitLab Build Bot
f30a8f79f2 [ci skip] js-precompiled 20161202-034812 2016-12-02 03:50:41 +00:00
Gav Wood
1dd13372b6
Merge remote-tracking branch 'origin/master' into rpc-middleware 2016-12-01 19:43:31 -08:00
GitLab Build Bot
0f987a2206 [ci skip] js-precompiled 20161201-044643 2016-12-01 04:48:29 +00:00
GitLab Build Bot
3ef569329a [ci skip] js-precompiled 20161201-011624 2016-12-01 01:21:59 +00:00
GitLab Build Bot
4f4bfb2239 [ci skip] js-precompiled 20161130-204501 2016-11-30 20:46:47 +00:00
GitLab Build Bot
837ff1bc7d [ci skip] js-precompiled 20161130-104916 2016-11-30 10:54:38 +00:00
Gav Wood
d525a6d7f0 Merge pull request #3654 from ethcore/clippy-bump
Bumping clippy
2016-11-29 18:00:13 +01:00
Gav Wood
9115214cea Merge pull request #3636 from ethcore/fatdb
Return of the Fat DB
2016-11-29 16:47:09 +01:00
Tomasz Drwięga
44314c5d02 Merge branch 'master' into clippy-bump
Conflicts:
	rpc/src/v1/types/filter.rs
2016-11-29 11:56:55 +01:00
GitLab Build Bot
cfc1dabd57 [ci skip] js-precompiled 20161129-050158 2016-11-29 05:07:32 +00:00
GitLab Build Bot
261aa29db3 [ci skip] js-precompiled 20161128-232953 2016-11-28 23:31:43 +00:00
GitLab Build Bot
3c9983cf25 [ci skip] js-precompiled 20161128-164710 2016-11-28 16:48:55 +00:00
Tomasz Drwięga
f5a899606e Merge branch 'master' into rpc-middleware 2016-11-28 17:20:02 +01:00
GitLab Build Bot
ecf283e2fc [ci skip] js-precompiled 20161128-151919 2016-11-28 15:21:01 +00:00
Tomasz Drwięga
e1e7886918 Bumping clippy 2016-11-28 12:23:06 +01:00
arkpar
8b3cdc513b Seekable iterator 2016-11-28 01:37:24 +01:00
Gav Wood
ce3f4911a2
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-27 15:01:17 +01:00
Tomasz Drwięga
a9028ca986 Merge branch 'master' into rpc-middleware
Conflicts:
	Cargo.lock
	rpc/src/v1/tests/mocked/parity_accounts.rs
2016-11-25 21:18:02 +01:00
Gav Wood
de8dd47ff9
Fetch binaries. 2016-11-25 19:29:13 +01:00
Tomasz Drwięga
789d6608cf Bumping jsonrpc 2016-11-25 16:16:24 +01:00
Tomasz Drwięga
f080f33c41 JSON-RPC bump / update hyper
Conflicts:
	Cargo.lock
2016-11-25 15:21:18 +01:00
GitLab Build Bot
686978fa97 [ci skip] js-precompiled 20161125-113155 2016-11-25 11:36:32 +00:00
Gav Wood
befb0bf2bd
Merge branch 'fix-number' into check-updates 2016-11-25 12:17:58 +01:00
GitLab Build Bot
4d9492a01d [ci skip] js-precompiled 20161124-231507 2016-11-24 23:16:52 +00:00
GitLab Build Bot
815cdc6ba1 [ci skip] js-precompiled 20161124-164849 2016-11-24 16:50:27 +00:00
GitLab Build Bot
51afc3afbe [ci skip] js-precompiled 20161124-163141 2016-11-24 16:40:11 +00:00
GitLab Build Bot
905d0c0b43 [ci skip] js-precompiled 20161124-154751 2016-11-24 15:50:50 +00:00
GitLab Build Bot
8f9f5cd5a3 [ci skip] js-precompiled 20161123-205310 2016-11-23 20:55:02 +00:00
Gav Wood
90b5d1c62d
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-23 20:13:47 +01:00
Gav Wood
34ab265b68 Merge pull request #3592 from ethcore/mio-cpu-fix
Fix CPU usage when idle
2016-11-23 19:58:39 +01:00
GitLab Build Bot
273165e982 [ci skip] js-precompiled 20161123-185249 2016-11-23 18:54:40 +00:00
arkpar
4e9c690640 Use patched MIO 2016-11-23 19:08:40 +01:00
Tomasz Drwięga
cd6f565f69 RPC Middleware & Get/Set dapp-specific accounts 2016-11-23 16:27:05 +01:00
Gav Wood
4c9bb5aa25
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-23 14:45:55 +01:00
GitLab Build Bot
e7dd222142 [ci skip] js-precompiled 20161123-131908 2016-11-23 13:20:46 +00:00
GitLab Build Bot
24ffb30bc2 [ci skip] js-precompiled 20161123-105837 2016-11-23 11:00:19 +00:00
GitLab Build Bot
5bd6d5e3ac [ci skip] js-precompiled 20161123-102835 2016-11-23 10:32:27 +00:00
GitLab Build Bot
cbeb2dc3f9 [ci skip] js-precompiled 20161122-175502 2016-11-22 17:57:03 +00:00
GitLab Build Bot
9f74c76f07 [ci skip] js-precompiled 20161122-162239 2016-11-22 16:25:02 +00:00
GitLab Build Bot
12ff42a513 [ci skip] js-precompiled 20161122-151225 2016-11-22 15:14:06 +00:00
Gav Wood
bf9ed2d444
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-22 10:25:34 +01:00
Gav Wood
45dead9d49
Naming consistency and make Updater improvements.
- ID -> Id (consistency with rust libs)
2016-11-22 10:24:22 +01:00
GitLab Build Bot
b97763e13d [ci skip] js-precompiled 20161121-233309 2016-11-21 23:35:10 +00:00
GitLab Build Bot
eb94eda30b [ci skip] js-precompiled 20161121-181249 2016-11-21 18:16:10 +00:00
GitLab Build Bot
65785475f3 [ci skip] js-precompiled 20161121-173542 2016-11-21 17:37:37 +00:00
Robert Habermeier
06f5bf809f Merge branch 'master' into client-provider 2016-11-21 12:19:11 +01:00
Gav Wood
601e0fb0fd
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-21 11:43:29 +01:00
GitLab Build Bot
21b2b4ac27 [ci skip] js-precompiled 20161121-093611 2016-11-21 09:37:54 +00:00
Gav Wood
9c0b630d20 Merge pull request #3543 from ethcore/hash-fetch
Moving fetching of hash-addressed dapps/content to separate crate.
2016-11-21 10:16:40 +01:00
Tomasz Drwięga
94328e9784 Fixing main 2016-11-20 22:40:23 +01:00
Tomasz Drwięga
cc8a9d410b Adding fetch API to the crate 2016-11-20 18:44:23 +01:00
Tomasz Drwięga
845bc52e36 Moving contract resolver to separate crate 2016-11-20 17:40:28 +01:00
GitLab Build Bot
92a34d9dd8 [ci skip] js-precompiled 20161120-160026 2016-11-20 16:06:52 +00:00
GitLab Build Bot
9832be395f [ci skip] js-precompiled 20161120-133314 2016-11-20 13:35:00 +00:00
GitLab Build Bot
ab4941b5ee [ci skip] js-precompiled 20161120-132620 2016-11-20 13:28:04 +00:00
Gav Wood
0848a9ec3c
Merge branch 'master' into transactions-propagate 2016-11-20 13:24:08 +01:00
Gav Wood
44eda379ad
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-19 03:43:43 +01:00
GitLab Build Bot
60922b61c9 [ci skip] js-precompiled 20161118-192308 2016-11-18 19:27:32 +00:00
Robert Habermeier
f1c665081a Merge branch 'master' into client-provider 2016-11-18 16:07:50 +01:00
GitLab Build Bot
55a3da8f0a [ci skip] js-precompiled 20161118-134410 2016-11-18 13:46:22 +00:00
Gav Wood
28aabcdb6c
Merge branch 'master' into check-updates 2016-11-18 11:45:04 +08:00
GitLab Build Bot
b79d65c0f3 [ci skip] js-precompiled 20161117-160039 2016-11-17 16:02:23 +00:00
GitLab Build Bot
7b866b4a1b [ci skip] js-precompiled 20161117-141135 2016-11-17 14:13:10 +00:00
Tomasz Drwięga
3bfd6c5998 Merge branch 'master' into transactions-propagate 2016-11-17 14:37:29 +01:00
GitLab Build Bot
76ac87af8b [ci skip] js-precompiled 20161117-101458 2016-11-17 10:16:40 +00:00
Tomasz Drwięga
cd686b5d68 Merge branch 'master' into transactions-propagate 2016-11-16 18:07:44 +01:00
GitLab Build Bot
a7574a1108 [ci skip] js-precompiled 20161116-161024 2016-11-16 16:12:55 +00:00
Tomasz Drwięga
66e327dfcb Keep track of local transactions 2016-11-16 15:58:14 +01:00
GitLab Build Bot
a9596abf5c [ci skip] js-precompiled 20161115-212437 2016-11-15 21:26:09 +00:00
GitLab Build Bot
3addae9313 [ci skip] js-precompiled 20161115-194902 2016-11-15 19:50:43 +00:00
GitLab Build Bot
b5dedd8aeb [ci skip] js-precompiled 20161115-135402 2016-11-15 13:55:35 +00:00
GitLab Build Bot
19b8b48579 [ci skip] js-precompiled 20161115-130035 2016-11-15 13:02:08 +00:00
GitLab Build Bot
771ce13ddc [ci skip] js-precompiled 20161115-114313 2016-11-15 11:44:42 +00:00
GitLab Build Bot
9857f632d8 [ci skip] js-precompiled 20161115-085029 2016-11-15 08:52:53 +00:00
GitLab Build Bot
c4885a1423 [ci skip] js-precompiled 20161114-201022 2016-11-14 20:11:54 +00:00
GitLab Build Bot
3bfa56c72a [ci skip] js-precompiled 20161114-174654 2016-11-14 17:48:20 +00:00
GitLab Build Bot
5127b997eb [ci skip] js-precompiled 20161114-155241 2016-11-14 15:54:09 +00:00
GitLab Build Bot
c061eae64b [ci skip] js-precompiled 20161114-154454 2016-11-14 15:46:21 +00:00
Gav Wood
ef471af4ee Merge pull request #3428 from ethcore/ws-rs
Bump ws-rs
2016-11-14 16:32:33 +01:00
Tomasz Drwięga
d66cc0907d Bump ws-rs 2016-11-14 16:10:04 +01:00
GitLab Build Bot
6fc7c15644 [ci skip] js-precompiled 20161114-142451 2016-11-14 14:26:16 +00:00
Robert Habermeier
3c7533831e Merge branch 'master' into client-provider 2016-11-14 15:16:26 +01:00
Gav Wood
4bb4ed9551
Initial checking. 2016-11-13 15:52:33 +01:00
GitLab Build Bot
d1848117ef [ci skip] js-precompiled 20161113-131856 2016-11-13 13:20:20 +00:00
GitLab Build Bot
5a259be290 [ci skip] js-precompiled 20161113-131228 2016-11-13 13:13:54 +00:00
GitLab Build Bot
0c302376b6 [ci skip] js-precompiled 20161113-011451 2016-11-13 01:16:28 +00:00
GitLab Build Bot
e5486f5d58 [ci skip] js-precompiled 20161112-202502 2016-11-12 20:26:39 +00:00
GitLab Build Bot
c656b53ce6 [ci skip] js-precompiled 20161111-161748 2016-11-11 16:19:10 +00:00
GitLab Build Bot
d5d1c1b674 [ci skip] js-precompiled 20161111-141616 2016-11-11 14:17:40 +00:00
GitLab Build Bot
5d8f74ed57 [ci skip] js-precompiled 20161111-082057 2016-11-11 08:22:24 +00:00
GitLab Build Bot
0456d4e5d0 [ci skip] js-precompiled 20161110-180734 2016-11-10 18:08:55 +00:00
GitLab Build Bot
529633e9b2 [ci skip] js-precompiled 20161110-163203 2016-11-10 16:33:24 +00:00
GitLab Build Bot
0ed8114726 [ci skip] js-precompiled 20161110-141839 2016-11-10 14:20:08 +00:00
GitLab Build Bot
aa0f05a186 [ci skip] js-precompiled 20161110-140631 2016-11-10 14:07:52 +00:00
Robert Habermeier
8c2c048444 clean up errors 2016-11-10 14:05:47 +01:00
GitLab Build Bot
29aecc2cff [ci skip] js-precompiled 20161109-171832 2016-11-09 17:19:59 +00:00
GitLab Build Bot
599f214ad9 [ci skip] js-precompiled 20161109-132407 2016-11-09 13:25:39 +00:00
GitLab Build Bot
29add4e40a [ci skip] js-precompiled 20161109-111303 2016-11-09 11:14:24 +00:00
GitLab Build Bot
9325fe44f3 [ci skip] js-precompiled 20161108-234705 2016-11-08 23:48:24 +00:00
GitLab Build Bot
418474ad27 [ci skip] js-precompiled 20161107-170338 2016-11-07 17:04:56 +00:00
GitLab Build Bot
43ec40d572 [ci skip] js-precompiled 20161107-142633 2016-11-07 14:27:49 +00:00
GitLab Build Bot
6388c814ea [ci skip] js-precompiled 20161107-113204 2016-11-07 11:33:25 +00:00
GitLab Build Bot
eb0c92e8c8 [ci skip] js-precompiled 20161106-165954 2016-11-06 17:01:11 +00:00
GitLab Build Bot
a453f99885 [ci skip] js-precompiled 20161106-165021 2016-11-06 16:51:51 +00:00
GitLab Build Bot
d172c83c26 [ci skip] js-precompiled 20161106-120902 2016-11-06 12:10:21 +00:00
GitLab Build Bot
78f2d88182 [ci skip] js-precompiled 20161105-173004 2016-11-05 17:31:24 +00:00
GitLab Build Bot
f2faf3609b [ci skip] js-precompiled 20161105-144817 2016-11-05 14:49:31 +00:00
GitLab Build Bot
2cb41f96f5 [ci skip] js-precompiled 20161105-112525 2016-11-05 11:26:40 +00:00
GitLab Build Bot
7b043047f0 [ci skip] js-precompiled 20161105-095429 2016-11-05 09:55:44 +00:00
GitLab Build Bot
8351c5d500 [ci skip] js-precompiled 20161105-053734 2016-11-05 05:38:51 +00:00
GitLab Build Bot
0e9d70a85d [ci skip] js-precompiled 20161105-053249 2016-11-05 05:34:04 +00:00
GitLab Build Bot
08d92fe3aa [ci skip] js-precompiled 20161104-222946 2016-11-04 22:31:01 +00:00
GitLab Build Bot
67715da827 [ci skip] js-precompiled 20161104-222646 2016-11-04 22:28:04 +00:00
GitLab Build Bot
20bb0e5f59 [ci skip] js-precompiled 20161104-222329 2016-11-04 22:24:43 +00:00
GitLab Build Bot
9db28e12ac [ci skip] js-precompiled 20161104-191028 2016-11-04 19:11:43 +00:00
GitLab Build Bot
7f0310921d [ci skip] js-precompiled 20161104-175104 2016-11-04 17:52:19 +00:00
GitLab Build Bot
2563189316 [ci skip] js-precompiled 20161104-170459 2016-11-04 17:06:13 +00:00
Arkadiy Paronyan
d37f4cc82f v1.5 (#3195) 2016-11-04 17:27:11 +01:00
GitLab Build Bot
75d100476e [ci skip] js-precompiled 20161104-162426 2016-11-04 16:25:41 +00:00
GitLab Build Bot
df33aa920b [ci skip] js-precompiled 20161104-130943 2016-11-04 13:11:00 +00:00
GitLab Build Bot
67b1bde355 [ci skip] js-precompiled 20161104-121251 2016-11-04 12:14:06 +00:00
Tomasz Drwięga
7ff73a9533 Exposing v,r,s from transaction signature in RPC (#3172) 2016-11-04 12:05:10 +01:00
GitLab Build Bot
f9274d178b [ci skip] js-precompiled 20161104-104936 2016-11-04 10:50:43 +00:00
GitLab Build Bot
4b92881592 [ci skip] js-precompiled 20161104-094125 2016-11-04 09:42:28 +00:00
GitLab Build Bot
0ee332f8e2 [ci skip] js-precompiled 20161104-090141 2016-11-04 09:02:49 +00:00
GitLab Build Bot
155eb02c69 [ci skip] js-precompiled 20161104-085547 2016-11-04 08:56:51 +00:00
GitLab Build Bot
a892fcd723 [ci skip] js-precompiled 20161104-063713 2016-11-04 06:38:42 +00:00
GitLab Build Bot
e267405893 [ci skip] js-precompiled 20161104-054932 2016-11-04 05:50:39 +00:00
GitLab Build Bot
4f548952db [ci skip] js-precompiled 20161104-033042 2016-11-04 03:31:46 +00:00
GitLab Build Bot
471bdf7c22 [ci skip] js-precompiled 20161103-235828 2016-11-03 23:59:34 +00:00
GitLab Build Bot
084492e71e [ci skip] js-precompiled 20161103-215018 2016-11-03 21:51:28 +00:00
GitLab Build Bot
3aba31114c [ci skip] js-precompiled 20161103-213602 2016-11-03 21:37:24 +00:00
GitLab Build Bot
7e592e5389 [ci skip] js-precompiled 20161103-202525 2016-11-03 20:26:28 +00:00
GitLab Build Bot
f32c6af6c4 [ci skip] js-precompiled 20161103-194213 2016-11-03 19:43:20 +00:00
GitLab Build Bot
b447d69b88 [ci skip] js-precompiled 20161103-192710 2016-11-03 19:28:14 +00:00
GitLab Build Bot
29c8350bf2 [ci skip] js-precompiled 20161103-190201 2016-11-03 19:03:12 +00:00
GitLab Build Bot
3cb355d06a [ci skip] js-precompiled 20161103-160437 2016-11-03 16:05:42 +00:00
GitLab Build Bot
03bb226947 [ci skip] js-precompiled 20161103-155801 2016-11-03 15:59:10 +00:00
GitLab Build Bot
98af662056 [ci skip] js-precompiled 20161103-154219 2016-11-03 15:43:26 +00:00
Arkadiy Paronyan
8f4bd3590a Fix windows build (#3125) 2016-11-03 16:11:08 +01:00
GitLab Build Bot
5bd9814470 [ci skip] js-precompiled 20161103-142158 2016-11-03 14:23:04 +00:00
GitLab Build Bot
0affd61ebc [ci skip] js-precompiled 20161103-130130 2016-11-03 13:02:39 +00:00
GitLab Build Bot
b2b8d78bcc [ci skip] js-precompiled 20161103-121148 2016-11-03 12:13:11 +00:00
GitLab Build Bot
c2adce4a5c [ci skip] js-precompiled 20161103-120015 2016-11-03 12:01:36 +00:00
Tomasz Drwięga
e9cd2f4d56 Returning cache headers for network content (#3123) 2016-11-03 12:40:53 +01:00
Arkadiy Paronyan
0f9451efe8 Bump mio (#3117) 2016-11-03 11:52:44 +01:00
GitLab Build Bot
d7eeda3341 [ci skip] js-precompiled 20161103-073434 2016-11-03 07:35:41 +00:00
GitLab Build Bot
0dd9b2a2f1 [ci skip] js-precompiled 20161102-223654 2016-11-02 22:37:59 +00:00
GitLab Build Bot
6098f008ce [ci skip] js-precompiled 20161102-220144 2016-11-02 22:03:03 +00:00
GitLab Build Bot
0e8e2d7245 [ci skip] js-precompiled 20161102-125818 2016-11-02 12:59:29 +00:00
GitLab Build Bot
79ab756e96 [ci skip] js-precompiled 20161102-122506 2016-11-02 12:26:17 +00:00
GitLab Build Bot
feffe59fd4 [ci skip] js-precompiled 20161102-115346 2016-11-02 11:54:58 +00:00
GitLab Build Bot
f4863c12b7 [ci skip] js-precompiled 20161102-110620 2016-11-02 11:07:27 +00:00
GitLab Build Bot
bd1bfd01bc [ci skip] js-precompiled 20161101-231432 2016-11-01 23:15:40 +00:00
GitLab Build Bot
dffa06d18f [ci skip] js-precompiled 20161101-224217 2016-11-01 22:43:26 +00:00
GitLab Build Bot
dc66778097 [ci skip] js-precompiled 20161101-220850 2016-11-01 22:10:05 +00:00
GitLab Build Bot
e6a486b647 [ci skip] js-precompiled 20161101-203737 2016-11-01 20:38:43 +00:00
GitLab Build Bot
5dfd834c12 [ci skip] js-precompiled 20161101-200259 2016-11-01 20:04:05 +00:00
GitLab Build Bot
d0d8cde0a5 [ci skip] js-precompiled 20161101-181028 2016-11-01 18:11:48 +00:00
GitLab Build Bot
57c00066c1 [ci skip] js-precompiled 20161101-171004 2016-11-01 17:11:17 +00:00
GitLab Build Bot
a02a8d3a17 [ci skip] js-precompiled 20161101-160426 2016-11-01 16:05:25 +00:00
GitLab Build Bot
7f92b50f95 [ci skip] js-precompiled 20161101-142007 2016-11-01 14:21:15 +00:00
GitLab Build Bot
3b6c969398 [ci skip] js-precompiled 20161101-140045 2016-11-01 14:01:50 +00:00
GitLab Build Bot
03a2d46e8a [ci skip] js-precompiled 20161101-132539 2016-11-01 13:26:56 +00:00
GitLab Build Bot
65db6c80b7 [ci skip] js-precompiled 20161101-130412 2016-11-01 13:05:11 +00:00
GitLab Build Bot
4d4b124efd [ci skip] js-precompiled 20161101-105638 2016-11-01 10:57:40 +00:00
GitLab Build Bot
c938114580 [ci skip] js-precompiled 20161101-104257 2016-11-01 10:43:57 +00:00
GitLab Build Bot
cb3bb2469d [ci skip] js-precompiled 20161101-062958 2016-11-01 06:31:01 +00:00
GitLab Build Bot
28e4f93d32 [ci skip] js-precompiled 20161101-052312 2016-11-01 05:24:13 +00:00
GitLab Build Bot
c553c3c94b [ci skip] js-precompiled 20161101-042855 2016-11-01 04:29:59 +00:00
GitLab Build Bot
38160c05bb [ci skip] js-precompiled 20161031-224932 2016-10-31 22:50:31 +00:00
GitLab Build Bot
04432b2766 [ci skip] js-precompiled 20161031-194842 2016-10-31 19:49:41 +00:00
GitLab Build Bot
714cb22f89 [ci skip] js-precompiled 20161031-192549 2016-10-31 19:27:04 +00:00
GitLab Build Bot
1255105490 [ci skip] js-precompiled 20161031-124811 2016-10-31 12:49:10 +00:00
GitLab Build Bot
b9f055677f [ci skip] js-precompiled 20161031-123449 2016-10-31 12:36:00 +00:00
GitLab Build Bot
180f16af7c [ci skip] js-precompiled 20161031-122556 2016-10-31 12:27:03 +00:00
GitLab Build Bot
455059f6b1 [ci skip] js-precompiled 20161031-093746 2016-10-31 09:38:45 +00:00
GitLab Build Bot
c2c7585619 [ci skip] js-precompiled 20161031-090648 2016-10-31 09:07:51 +00:00
GitLab Build Bot
921fde43a7 [ci skip] js-precompiled 20161031-084918 2016-10-31 08:50:17 +00:00
GitLab Build Bot
0ff5b18bcb [ci skip] js-precompiled 20161031-071713 2016-10-31 07:18:12 +00:00
GitLab Build Bot
aa4b124005 [ci skip] js-precompiled 20161031-053203 2016-10-31 05:33:10 +00:00
GitLab Build Bot
3e8900db3e [ci skip] js-precompiled 20161030-164930 2016-10-30 16:50:29 +00:00
GitLab Build Bot
6b85d58ae7 [ci skip] js-precompiled 20161030-144119 2016-10-30 14:42:20 +00:00
GitLab Build Bot
d3a2f7dce9 [ci skip] js-precompiled 20161030-120641 2016-10-30 12:07:40 +00:00
GitLab Build Bot
0b835323b9 [ci skip] js-precompiled 20161030-113341 2016-10-30 11:34:48 +00:00
GitLab Build Bot
0189481ee6 [ci skip] js-precompiled 20161030-090922 2016-10-30 09:10:18 +00:00
Arkadiy Paronyan
bccc56b6b0 mio version bump (#2982) 2016-10-30 09:56:34 +01:00
GitLab Build Bot
3002219250 [ci skip] js-precompiled 20161030-083815 2016-10-30 08:39:09 +00:00
GitLab Build Bot
222b2b70ea [ci skip] js-precompiled 20161029-192902 2016-10-29 19:29:59 +00:00
GitLab Build Bot
5a8cee9557 [ci skip] js-precompiled 20161029-185701 2016-10-29 18:57:56 +00:00
GitLab Build Bot
c24ac577fb [ci skip] js-precompiled 20161029-160033 2016-10-29 16:01:29 +00:00
GitLab Build Bot
e2b82e1e37 [ci skip] js-precompiled 20161029-154241 2016-10-29 15:44:04 +00:00
Arkadiy Paronyan
c342fa3035 WS bump (#2973) 2016-10-29 17:38:50 +02:00
GitLab Build Bot
3a6c1c377c [ci skip] js-precompiled 20161029-133354 2016-10-29 13:34:58 +00:00
Tomasz Drwięga
144930f12c Updating ws-rs (#2962) 2016-10-29 15:31:13 +02:00
GitLab Build Bot
fe02f93e4c [ci skip] js-precompiled 20161029-114119 2016-10-29 11:42:16 +00:00
GitLab Build Bot
598679000c [ci skip] js-precompiled 20161029-112814 2016-10-29 11:29:09 +00:00
GitLab Build Bot
1a258fc0a7 [ci skip] js-precompiled 20161029-112006 2016-10-29 11:21:07 +00:00
GitLab Build Bot
290ed3343f [ci skip] js-precompiled 20161029-110604 2016-10-29 11:06:59 +00:00
GitLab Build Bot
e1cf6f7dd0 [ci skip] js-precompiled 20161029-075744 2016-10-29 07:58:45 +00:00
GitLab Build Bot
3e3230aa34 [ci skip] js-precompiled 20161028-184917 2016-10-28 18:50:17 +00:00
GitLab Build Bot
8cd66f14d5 [ci skip] js-precompiled 20161028-160553 2016-10-28 16:06:51 +00:00
GitLab Build Bot
ef0ed5833a [ci skip] js-precompiled 20161028-155009 2016-10-28 15:51:18 +00:00
Robert Habermeier
29ab4ecac1 Shared code cache (#2921)
* add a global code cache

* extract memory-limited lru cache to util

* use memory-limited code cache

* account for code cache size in mem_used
2016-10-28 16:04:44 +02:00
GitLab Build Bot
151ec869a6 [ci skip] js-precompiled 20161027-204107 2016-10-27 22:41:22 +02:00
GitLab Build Bot
22af04e81d [ci skip] js-precompiled 20161027-175225 2016-10-27 17:53:23 +00:00
Tomasz Drwięga
152a551e8b Transaction Queue banning (#2524)
* Blacklisting transaction queue

* Using blacklisting queue in miner

* Restoring todo [ci:skip]

* Blacklisting recipients and code

* Renaming blacklisting->banning

* CLI option for banning.

* Fixing submodule commit [ci:skip]

* Fixing RPC tests

* Additional logging when dropping transactions

* whitespace

[ci:skip]

* Configurable ban duration

* Reverting fix for pruning history from config file
2016-10-27 19:28:34 +02:00
GitLab Build Bot
abb1da5f4b [ci skip] js-precompiled 20161027-164817 2016-10-27 16:49:18 +00:00
GitLab Build Bot
bb14eea66c [ci skip] js-precompiled 20161027-150816 2016-10-27 15:09:11 +00:00
GitLab Build Bot
7c6112e9f0 [ci skip] js-precompiled 20161027-143256 2016-10-27 14:33:50 +00:00
GitLab Build Bot
123b75179c [ci skip] js-precompiled 20161027-133941 2016-10-27 13:40:42 +00:00
GitLab Build Bot
176dc0e945 [ci skip] js-precompiled 20161027-115054 2016-10-27 11:51:52 +00:00
GitLab Build Bot
02b6d3943d [ci skip] js-precompiled 20161027-070811 2016-10-27 07:09:06 +00:00
GitLab Build Bot
005bdd5d07 [ci skip] js-precompiled 20161027-065456 2016-10-27 06:55:53 +00:00
GitLab Build Bot
6c79decdda [ci skip] js-precompiled 20161027-062905 2016-10-27 06:30:05 +00:00
Tomasz Drwięga
88997801d0 Clippy bump (#2877)
* Bumping clippy

* Fixing warnings

* Fix the "fix"
2016-10-27 08:28:12 +02:00
GitLab Build Bot
9bfb8094cc [ci skip] js-precompiled 20161027-025520 2016-10-27 02:56:17 +00:00
GitLab Build Bot
a08b331856 [ci skip] js-precompiled 20161026-203802 2016-10-26 20:39:01 +00:00
GitLab Build Bot
58b963b93d [ci skip] js-precompiled 20161026-194241 2016-10-26 19:44:08 +00:00
GitLab Build Bot
f58ccfb435 [ci skip] js-precompiled 20161026-165632 2016-10-26 16:57:31 +00:00
GitLab Build Bot
215c82d744 [ci skip] js-precompiled 20161026-144207 2016-10-26 14:43:01 +00:00
GitLab Build Bot
6901d087dd [ci skip] js-precompiled 20161026-141507 2016-10-26 14:16:03 +00:00
GitLab Build Bot
c36202fcf5 [ci skip] js-precompiled 20161026-131806 2016-10-26 13:19:04 +00:00
GitLab Build Bot
909fb1d54e [ci skip] js-precompiled 20161026-121420 2016-10-26 12:15:18 +00:00
GitLab Build Bot
cdc348d955 [ci skip] js-precompiled 20161026-120247 2016-10-26 12:03:52 +00:00
Arkadiy Paronyan
5b978be034 Get rid of MemoryDB denote (#2881) 2016-10-26 13:53:47 +02:00
GitLab Build Bot
436b7c213d [ci skip] js-precompiled 20161026-114541 2016-10-26 11:46:34 +00:00
GitLab Build Bot
71e973cb0b [ci skip] js-precompiled 20161026-100446 2016-10-26 10:05:40 +00:00
GitLab Build Bot
3cd724d056 [ci skip] js-precompiled 20161026-095510 2016-10-26 09:56:14 +00:00
GitLab Build Bot
162d1a032b [ci skip] js-precompiled 20161026-044349 2016-10-26 04:44:46 +00:00
GitLab Build Bot
7b7ce4a0b1 [ci skip] js-precompiled 20161026-040753 2016-10-26 04:08:54 +00:00
GitLab Build Bot
20d43b9c26 [ci skip] js-precompiled 20161025-203648 2016-10-25 20:37:47 +00:00
Robert Habermeier
33748c2046 Sweep some more panics (#2848)
* purge unwraps from ethcrypto, ethstore

* sweep panics from util
2016-10-25 22:34:52 +02:00
Nikolay Volf
014e47a50a Merge pull request #2870 from ethcore/ipc-bump-5
IPC version bump
2016-10-25 23:23:42 +03:00
NikVolf
f81787d603 ipc version bump 2016-10-25 21:28:54 +03:00
GitLab Build Bot
03e2aa61e2 [ci skip] js-precompiled 20161025-153329 2016-10-25 17:33:46 +02:00
Tomasz Drwięga
5ae87a64b1 Bumping ws-rs (#2851) 2016-10-25 12:12:09 +02:00
Jaco Greeff
66a8d534ef Bump js-precompiled to 20161022-223915 UTC (#2826) 2016-10-24 12:28:32 +02:00
Tomasz Drwięga
aca82fb84b Removing submodule in favour of rust crate (#2756)
* Removing submodule

* Fixing UI dependency structure.

* Merging RS and JS package

* Updating release script to push also rs files

* fix merge gone wrong

* Fixing compilation
2016-10-22 20:07:12 +02:00
Tomasz Drwięga
3ff1ca81f4 Missing changes required to make new UI work (#2793)
* Getting rid of old dapps

* Updating proxypac and allowing home.parity on signer

* CORS support for API

* Fixing CORS - origin is sent with protocol

* Fixing signer with proxy

* Fixing grumbles

* Fix expect msg [ci:skip]
2016-10-22 14:21:41 +01:00
keorn
479657b23b Automatic compaction selection on Linux (#2785)
* add auto compaction types

* pass db paths

* detect drive type on Linux

* use base db path

* add docstring

* limit the test to be side effect free

* use base db path

* more docs

* fix parsing test

* update error

* detect only on Linux

* make test Linux only

* add second device letter, update cli doc

* use spaces in cli doc

* import only on linux

* default->auto
2016-10-21 23:21:57 +02:00
Tomasz Drwięga
d3ae463a75 Using SipHasher from crates.io 2016-10-21 11:57:30 +02:00
Robert Habermeier
96f4c10453 sweep most unwraps from ethcore crate, dapps crate (#2762)
* sweep most unwraps from ethcore crate

* purge unwrap from dapps server

* whitespace

[ci:none]
2016-10-20 23:41:15 +02:00
Robert Habermeier
146cefdb32 bump parking_lot to 0.3.x series (#2702) 2016-10-19 18:35:56 +02:00
Tomasz Drwięga
fcac518644 Bumping JSON-RPC http server (#2714) 2016-10-19 13:24:48 +02:00
Tomasz Drwięga
5e67c89b4b Remove obsolete dapps and update security headers (#2694)
* Embed allowed only on signer port

* Adding security headers to dapps

* Adding security headers to signer

* Removing old dapps
2016-10-19 11:02:21 +02:00
Tomasz Drwięga
6c7af57529 Initial import of new UI (compiled JS code) (#2220)
* Normalizing dapps format for signer.

* Adding new ui

* Adding New UI to dapps

* Adding parity styles for signer errors

* Adding pre-compiled JS as submodule

* Fixing struct declaration [ci:skip]

* Bumping js

* Adding styles

* build dest

* Correct whitespace

@tomusdrw please note the alterations - no mixing tabs and spaces in the indentation portion and always just one tab per indent.
2016-10-17 11:56:42 +02:00
Tomasz Drwięga
03c1559ead Support for decryption in Signer (#2421)
* Adding some tests

* Implementing decrypt in queue

* Removing code duplication.

* Printing public key in ethstore

* Bump UI

* Normalizing dapps format for signer.

* Fixing tests compilation

* fix whitespace

[ci:skip]
2016-10-15 14:44:08 +02:00
Arkadiy Paronyan
835cd13c0e Database performance tweaks (#2619) 2016-10-14 15:44:11 +03:00
Robert Habermeier
4bcc9e3b49 Merge pull request #2516 from ethcore/canon-cache-size
Mostly configurable canonical cache size
2016-10-12 21:48:29 +02:00
Robert Habermeier
5e22d23994 update bigint crate to 0.1.1 2016-10-11 12:53:50 +02:00
Robert Habermeier
19e5bede7f Merge branch 'master' into canon-cache-size 2016-10-07 13:55:20 +02:00
Nikolay Volf
5354a0905e terminate after 30 seconds (#2513) 2016-10-07 12:10:53 +01:00
Robert Habermeier
8a0e98d4cc configurable jump table cache size 2016-10-07 12:18:42 +02:00
Arkadiy Paronyan
e380955c34 RocksDB version bump (#2492) 2016-10-06 15:24:47 +02:00
Nikolay Volf
e1d3b3fff8 Accounts bloom in master (#2426)
* bloom crate link

* database layout and outdated tests

* state db alterations

* v10 migration run

* using arc

* bloom migration

* migration fixes and mess

* fix tests
2016-10-03 12:02:43 +02:00
NikVolf
b477ca17fe bloom filter crate 2016-09-29 13:19:39 +03:00
Tomasz Drwięga
424b46b428 Prioritizing re-imported transactions (#2372)
* Prioritizing re-imported transactions

* Fixing compilation on beta
2016-09-28 23:32:32 +02:00
Arkadiy Paronyan
ad63780b4d Canonical state cache (master) (#2311)
* State cache

* Reduced copying data between caches

Whitespace and optional symbols

* Reduced copying data between caches

Whitespace and optional symbols

* Set a limit on storage cache

* Style and docs
2016-09-27 18:02:11 +02:00
Tomasz Drwięga
d7bbc5cc3f Hash Content RPC method (#2355)
* Moving file fetching to separate crate.

* ethcore_hashContent

* Tests running on mocked fetch.

* Limiting size of downloadable assets
2016-09-27 16:27:06 +02:00
Marek Kotewicz
56eb97abbf user defaults (#2014)
* user defaults

* finished user defaults

* user defaults are network-dependent

* added tests for newly added functions, logger is initialized first

* dir cleanup in progress

* user_file is placed next to snapshots
2016-09-26 19:21:25 +02:00
Tomasz Drwięga
598e9cea85 Fixing jit feature compilation (#2310) 2016-09-26 18:38:54 +02:00
Gav Wood
07b5e9a5c7 Encryption, decryption and public key RPCs. (#1946)
* Fix up pending receipts details.

* Add support for additional params and registry over RPC.

* Fix tests.

* Add test, additional fix.

Fixes #1932.

* Fix up tests.

* Fix test.

* Fix test.

* Remove unused use.

* Add encryption, decryption and public-key RPCs.

* Remove &
2016-09-22 14:48:22 +02:00
Tomusdrw
110e58607f Bumping jsonrpc-core & jsonrpc-http-server 2016-09-19 01:54:44 +02:00
Tomasz Drwięga
7f7e74869c Bump clippy & Fix warnings (#2109)
* Bump clippy

* Fixing warnings
2016-09-16 23:03:26 +02:00
Robert Habermeier
c16bf7face Merge pull request #2078 from ethcore/bigint_crates
Get bigint on crates.io
2016-09-15 16:54:30 +02:00
Robert Habermeier
42a8ea0002 prepare bigint for crates.io 2016-09-13 15:27:18 +02:00
Tomasz Drwięga
db59d9a4ae Merge branch 'master' into config-files 2016-09-12 00:57:25 +02:00