Skip to content

Commit 793fb62

Browse files
Resolve conflicts
2 parents aca30b4 + 2c19e36 commit 793fb62

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ pub struct DftArgs {
9494
#[clap(short = 'n', help = "Set the number of benchmark iterations to run")]
9595
pub benchmark_iterations: Option<usize>,
9696

97-
#[clap(long, help = "Host address to connect to")]
97+
#[clap(long, help = "Host address to query. Only used for FlightSQL")]
9898
pub host: Option<String>,
9999

100100
#[clap(

src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
2020
use std::path::PathBuf;
2121

22-
#[cfg(any(feature = "http", feature = "flightsql"))]
22+
#[cfg(any(feature = "flightsql", feature = "http"))]
2323
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
2424

2525
use datafusion_app::config::ExecutionConfig;

0 commit comments

Comments
 (0)