Skip to content

Commit 2ad1ce7

Browse files
author
fbranciard
authored
Merge pull request #43 from iExecBlockchainComputing/v1.0.14
release of v1.0.14
2 parents cc0fe20 + 39f71f8 commit 2ad1ce7

38 files changed

+10701
-2044
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
**/__pycache__
22
node_modules
33
makefile
4+
build

ChangeLog.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ Features:
1010
Bugfixes:
1111

1212

13+
### v1.0.14 (not released)
14+
15+
Features:
16+
* [#42](https://github.com/iExecBlockchainComputing/PoCo/issues/42) ajust timeout categories
17+
* [#40](https://github.com/iExecBlockchainComputing/PoCo/issues/40) Removing the build/ folder from git and create a specific one for contracts addresses deployed
18+
19+
Bugfixes:
20+
* [#41](https://github.com/iExecBlockchainComputing/PoCo/issues/41) : truffle compile doesn't work
21+
22+
1323
### [v1.0.13](https://github.com/iExecBlockchainComputing/PoCo/releases/tag/v1.0.13)
1424

1525
Features:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ or
492492

493493

494494
```
495-
coverage : 20/05/2018
495+
coverage : 11/06/2018
496496
497497
184 passing (10m)
498498
1 pending

audits/ChainSecurity_iExec-V2.pdf

1.08 MB
Binary file not shown.

config/categories.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
"description": {
55
"io": "10mo"
66
},
7-
"workClockTimeRef": 30
7+
"workClockTimeRef": 300
88
},
99
{
1010
"name": "2",
1111
"description": {
1212
"io": "100mo"
1313
},
14-
"workClockTimeRef": 120
14+
"workClockTimeRef": 900
1515
},
1616
{
1717
"name": "3",
1818
"description": {
1919
"io": "250mo"
2020
},
21-
"workClockTimeRef": 900
21+
"workClockTimeRef": 1800
2222
},
2323
{
2424
"name": "4",
2525
"description": {
2626
"io": "500mo"
2727
},
28-
"workClockTimeRef": 1800
28+
"workClockTimeRef": 3600
2929
},
3030
{
3131
"name": "5",
3232
"description": {
3333
"io": "1go"
3434
},
35-
"workClockTimeRef": 3600
35+
"workClockTimeRef": 7200
3636
}
3737
]
3838
}

0 commit comments

Comments
 (0)