Cherry-pick 22809e4 with conflicts

vitessio · Jan 19, 2024 · 28a2694 · 28a2694
1 parent 383b401
commit 28a2694
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/examples/common/scripts/vttablet-up.sh b/examples/common/scripts/vttablet-up.sh
@@ -53,7 +53,10 @@ vttablet \
  --grpc_port $grpc_port \
  --service_map 'grpc-queryservice,grpc-tabletmanager,grpc-updatestream' \
  --pid_file $VTDATAROOT/$tablet_dir/vttablet.pid \
+<<<<<<< HEAD
  --heartbeat_enable --heartbeat_interval=250ms --heartbeat_on_demand_duration=5s \
+=======
+>>>>>>> 22809e497e (examples: rm heartbeat flags (#14980))
  > $VTDATAROOT/$tablet_dir/vttablet.out 2>&1 &
 
 # Block waiting for the tablet to be listening