[asterisk-bugs] [Asterisk 0019084]: [patch] Please think when fixing merge errors

[Asterisk Bug Tracker]

A NOTE has been added to this issue. 
====================================================================== 
https://issues.asterisk.org/view.php?id=19084 
====================================================================== 
Reported By:                smurfix
Assigned To:                
====================================================================== 
Project:                    Asterisk
Issue ID:                   19084
Category:                   Applications/app_dial
Reproducibility:            always
Severity:                   minor
Priority:                   normal
Status:                     feedback
Asterisk Version:           SVN 
JIRA:                        
Regression:                 No 
Reviewboard Link:            
SVN Branch (only for SVN checkouts, not tarball releases): N/A 
SVN Revision (number only!):  
Request Review:              
====================================================================== 
Date Submitted:             2011-04-08 01:57 CDT
Last Modified:              2011-04-17 03:49 CDT
====================================================================== 
Summary:                    [patch] Please think when fixing merge errors
Description: 
While an integer might conceivably store milliseconds, a timeval struct
definitely doesn't.
====================================================================== 

---------------------------------------------------------------------- 
 (0133847) smurfix (reporter) - 2011-04-17 03:49
 https://issues.asterisk.org/view.php?id=19084#c133847 
---------------------------------------------------------------------- 
It also applies to 1.8. I didn't check 1.6.

Sorry about the title; "over-enthusiastic merge: seconds vs. milliseconds"
might have been somewhat nicer. :-P 

Issue History 
Date Modified    Username       Field                    Change               
====================================================================== 
2011-04-17 03:49 smurfix        Note Added: 0133847                          
======================================================================