rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-06 21:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts with main branch

Browse Source
This commit is contained in:
Konstantin Knizhnik
2021-05-20 14:39:27 +03:00
parent 20b6279beb
commit 3645133700
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration_tests/tests/test_wal_acceptor.rs
View File

@@ -3,7 +3,7 @@ use std::sync::Arc;
use std::time::SystemTime;
use std::{thread, time};
use control_plane::compute::{PostgresNode, ComputeControlPlane};
use control_plane::compute::{ComputeControlPlane, PostgresNode};
use integration_tests;
use integration_tests::PostgresNodeExt;