Merge remote-tracking branch 'upstream/master' into sec-plus-master
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
		
						commit
						5b1f288d6c
					
				
					 37 changed files with 522 additions and 507 deletions
				
			
		| 
						 | 
				
			
			@ -78,7 +78,7 @@ struct record_netload_state *record_netload_new (const char *dev, double bw)
 | 
			
		|||
  st->bw = bw;
 | 
			
		||||
  st->data_valid = false;
 | 
			
		||||
  st->errored = false;
 | 
			
		||||
  record_netload (st, NULL, dds_time ());
 | 
			
		||||
  record_netload (st, "", dds_time ());
 | 
			
		||||
  return st;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue