1
0
Commit Graph

15389 Commits

Author SHA1 Message Date
Andrew Morgan
cfa8e2c554 Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqlite 2020-02-20 15:39:22 +00:00
Andrew Morgan
1fb5b9c09d Update the device list cache when keys/query is called (#5693) 2020-02-20 15:38:32 +00:00
Andrew Morgan
5a4f72ab94 Fix debian packages for sid being called buster. (#5775) 2020-02-20 15:18:36 +00:00
Andrew Morgan
1ab4dac3d7 Merge pull request #5780 from matrix-org/baboliver/loopingcall-args 2020-02-20 15:18:26 +00:00
Andrew Morgan
6aea5db0a2 Merge branch 'master' into develop 2020-02-19 16:07:20 +00:00
Andrew Morgan
bdcb8f47fc yet more changelog attribution fixes 2020-02-19 16:07:13 +00:00
Andrew Morgan
0d163652e9 1.2.1 2020-02-19 16:06:57 +00:00
Andrew Morgan
c89770f0e6 Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1 2020-02-19 16:06:06 +00:00
Andrew Morgan
471a6b1b56 Convert RedactionTestCase to modern test style (#5768) 2020-02-19 16:05:44 +00:00
Andrew Morgan
f945474952 Merge pull request #5767 from matrix-org/rav/redactions/cross_room_id 2020-02-19 16:05:34 +00:00
Andrew Morgan
c544308db4 Fix some error cases in the caching layer. (#5749) 2020-02-19 16:05:16 +00:00
Andrew Morgan
f7bf143f5d Merge branch 'master' into develop 2020-02-19 15:14:59 +00:00
Andrew Morgan
2569fdf82b 1.2.0 2020-02-19 15:14:49 +00:00
Andrew Morgan
01d1c028e0 Merge tag 'v1.2.0rc2' into develop 2020-02-19 15:13:44 +00:00
Andrew Morgan
39c3119c69 1.2.0rc2 2020-02-19 15:13:36 +00:00
Andrew Morgan
915d3d680a Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch 2020-02-19 15:13:27 +00:00
Andrew Morgan
88c330362e Stop trying to fetch events with event_id=None. (#5753) 2020-02-19 15:13:17 +00:00
Andrew Morgan
bc34ac53ec Fix servlet metric names (#5734) 2020-02-19 15:13:08 +00:00
Andrew Morgan
4b9bb9eeeb Add a prometheus metric for active cache lookups. (#5750) 2020-02-19 15:12:58 +00:00
Andrew Morgan
ab051a1555 Make Jaeger fully configurable (#5694) 2020-02-19 15:12:49 +00:00
Andrew Morgan
f590f77a16 Replace returnValue with return (#5736) 2020-02-19 15:11:59 +00:00
Andrew Morgan
2f270e23d3 Opentracing Utils (#5722) 2020-02-19 11:51:40 +00:00
Andrew Morgan
12d48e5ffa Merge pull request #5732 from matrix-org/erikj/sdnotify 2020-02-19 11:51:33 +00:00
Andrew Morgan
b073cb7d7e Merge pull request #5740 from matrix-org/erikj/worker_flakey_tests 2020-02-19 11:51:25 +00:00
Andrew Morgan
812138addd Merge pull request #5738 from matrix-org/erikj/faster_update 2020-02-19 11:51:14 +00:00
Andrew Morgan
eddeb3bb4b Merge pull request #5733 from matrix-org/erikj/exlude_sytest_blacklist 2020-02-19 11:51:05 +00:00
Andrew Morgan
383acba5b6 Fix logging in workers (#5729) 2020-02-19 11:50:54 +00:00
Andrew Morgan
925b74c109 Merge pull request #5730 from matrix-org/erikj/cache_versions 2020-02-19 11:50:45 +00:00
Andrew Morgan
a47d9525c7 Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-type 2020-02-19 11:50:36 +00:00
Andrew Morgan
1e37fbb316 Update changelog.d/5730.misc 2020-02-19 11:50:29 +00:00
Andrew Morgan
bf6300e0a1 Fix stack overflow in Keyring (#5724) 2020-02-19 11:50:18 +00:00
Andrew Morgan
b7dfd5637f Merge tag 'v1.2.0rc1' into develop 2020-02-19 11:49:57 +00:00
Andrew Morgan
79ce67660b Newsfile 2020-02-19 11:49:46 +00:00
Andrew Morgan
b58caf0d0b Make changelog slightly more readable 2020-02-19 11:49:40 +00:00
Andrew Morgan
1459bed82a Cache get_version_string. 2020-02-19 11:49:32 +00:00
Andrew Morgan
6a38d246a8 1.2.0rc1 2020-02-19 11:49:16 +00:00
Andrew Morgan
fb74f1d5ea Demo uses deprecated cli option (#5725) 2020-02-19 11:49:07 +00:00
Andrew Morgan
6a955cea2b Merge branch 'release-v1.2.0' into develop 2020-02-19 11:48:59 +00:00
Andrew Morgan
60d4ad3943 Revert "Remove deprecated 'verbose' cli arg" 2020-02-19 11:48:43 +00:00
Andrew Morgan
a35758cde3 Opentracing Documentation (#5703) 2020-02-19 11:48:29 +00:00
Andrew Morgan
4f5f2a715b Merge pull request #5720 from matrix-org/erikj/transactions_upsert 2020-02-19 11:48:18 +00:00
Andrew Morgan
6c704197df Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_state 2020-02-19 11:48:07 +00:00
Andrew Morgan
04d4c31447 Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_state 2020-02-19 11:47:39 +00:00
Andrew Morgan
11d91ee1bc Don't accept opentracing data from clients. (#5715) 2020-02-19 11:47:29 +00:00
Andrew Morgan
b93f684205 Add 'rel' attribute to default welcome page. (#5695) 2020-02-19 11:47:18 +00:00
Andrew Morgan
4f890463af Update the coding style doc (#5719) 2020-02-19 11:47:08 +00:00
Andrew Morgan
3aafecf3fe Speed up the PostgreSQL unit tests (#5717) 2020-02-19 11:47:00 +00:00
Andrew Morgan
60af6ec568 Remove non-dedicated logging options and command line arguments (#5678) 2020-02-19 11:46:52 +00:00
Andrew Morgan
782bd79170 Clean up opentracing configuration options (#5712) 2020-02-19 11:46:38 +00:00
Andrew Morgan
adb043107f Support Prometheus_client 0.4.0+ (#5636) 2020-02-19 11:46:23 +00:00