diff options
| author | teor <teor@torproject.org> | 2020-02-13 13:55:55 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-02-13 13:55:55 +1000 |
| commit | c96cf1494357af5a2fd0309ef3d26aba52105edb (patch) | |
| tree | 451b88e9bf861ab54e0ca6a25fcd90b6fed7cace /changes | |
| parent | 5298113da98f13cfaad4a9ab7b5ac8baa6c37279 (diff) | |
| parent | add387c5071a1ee7889e3789e7b4143bb8856d0a (diff) | |
| download | tor-c96cf1494357af5a2fd0309ef3d26aba52105edb.tar.gz tor-c96cf1494357af5a2fd0309ef3d26aba52105edb.zip | |
Merge branch 'bug33195_035' into bug33195_041
Conflicts:
* Keep TOR_TEST_RNG_SEED from maint-0.4.1
* Keep the ordering from bug33195_035
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/ticket33194 | 4 | ||||
| -rw-r--r-- | changes/ticket33195 | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/ticket33194 b/changes/ticket33194 new file mode 100644 index 0000000000..b87e55348e --- /dev/null +++ b/changes/ticket33194 @@ -0,0 +1,4 @@ + o Testing: + - Remove a redundant distcheck job. Closes ticket 33194. + - Sort the Travis jobs in order of speed. Putting the slowest jobs first + takes full advantage of Travis job concurrency. Closes ticket 33194. diff --git a/changes/ticket33195 b/changes/ticket33195 new file mode 100644 index 0000000000..11abd4816e --- /dev/null +++ b/changes/ticket33195 @@ -0,0 +1,4 @@ + o Testing: + - Stop allowing the Chutney IPv6 Travis job to fail. This job was + previously configured to fast_finish (which requires allow_failure), to + speed up the build. Closes ticket 33195. |