diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-16 15:10:52 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-16 15:10:52 +0000 |
| commit | 5934540b5b5765de7d342deaec9e3a4a7ed8fa0e (patch) | |
| tree | b95664cfaaa5919b4b29074338c855baf98fc140 | |
| parent | bbcd491f4d6c8e40f5f3e600570cdb30ee7dfa03 (diff) | |
Update .version file, ChangLog, removed old summary files, and merged in change to app_queue.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.2.17-rc3@308143 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | .version | 2 | ||||
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | apps/app_queue.c | 1 | ||||
| -rw-r--r-- | asterisk-1.6.2.17-rc2-summary.html | 60 | ||||
| -rw-r--r-- | asterisk-1.6.2.17-rc2-summary.txt | 90 |
5 files changed, 23 insertions, 152 deletions
@@ -1 +1 @@ -1.6.2.17-rc2 +1.6.2.17-rc3 @@ -1,3 +1,25 @@ +2011-02-16 Leif Madsen <lmadsen@digium.com> + + * Asterisk 1.6.2.17-rc3 Released. + + ------------------------------------------------------------------------ + r308002 | qwell | 2011-02-15 17:32:21 -0600 (Tue, 15 Feb 2011) | 10 + lines + + Fix regression that changed behavior of queues when ringing a queue + member. + + This reverts r298596, which was to fix a highly bizarre and contrived + issue with a queue member that called into his own queue being + transferred back into his own queue. I couldn't reproduce that issue + in any way. I think one of the other recent transfer fixes actually + fixed this. + + (closes issue 0018747) + Reported by: vrban + + ------------------------------------------------------------------------ + 2011-01-20 Leif Madsen <lmadsen@digium.com> * Asterisk 1.6.2.17-rc2 Released. diff --git a/apps/app_queue.c b/apps/app_queue.c index 987d8da24..56118fd8c 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3050,7 +3050,6 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte break; case AST_CONTROL_RINGING: ast_verb(3, "%s is ringing\n", o->chan->name); - ast_indicate(in, AST_CONTROL_RINGING); break; case AST_CONTROL_OFFHOOK: /* Ignore going off hook */ diff --git a/asterisk-1.6.2.17-rc2-summary.html b/asterisk-1.6.2.17-rc2-summary.html deleted file mode 100644 index 4a02915e4..000000000 --- a/asterisk-1.6.2.17-rc2-summary.html +++ /dev/null @@ -1,60 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-1.6.2.17-rc2</title></head> -<body> -<h1 align="center"><a name="top">Release Summary</a></h1> -<h3 align="center">asterisk-1.6.2.17-rc2</h3> -<h3 align="center">Date: 2011-01-25</h3> -<h3 align="center"><asteriskteam@digium.com></h3> -<hr/> -<h2 align="center">Table of Contents</h2> -<ol> - <li><a href="#summary">Summary</a></li> - <li><a href="#contributors">Contributors</a></li> - <li><a href="#commits">Other Changes</a></li> - <li><a href="#diffstat">Diffstat</a></li> -</ol> -<hr/> -<a name="summary"><h2 align="center">Summary</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes. The changes included were made only to address problems that have been identified in this release series. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p> -<p>The data in this summary reflects changes that have been made since the previous release, asterisk-1.6.2.17-rc1.</p> -<hr/> -<a name="contributors"><h2 align="center">Contributors</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p> -<table width="100%" border="0"> -<tr> -<td width="33%"><h3>Coders</h3></td> -<td width="33%"><h3>Testers</h3></td> -<td width="33%"><h3>Reporters</h3></td> -</tr> -<tr valign="top"> -<td> -2 lmadsen<br/> -</td> -<td> -</td> -<td> -</td> -</tr> -</table> -<hr/> -<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker. The commits may have been marked as being related to an issue. If that is the case, the issue numbers are listed here, as well.</p> -<table width="100%" border="1"> -<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=303101">303101</a></td><td>lmadsen</td><td>Create 1.6.2.17-rc2 from 1.6.2.17-rc1</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=303141">303141</a></td><td>lmadsen</td><td>Update .version, ChangeLog, and merge changes.</td> -<td></td></tr></table> -<hr/> -<a name="diffstat"><h2 align="center">Diffstat Results</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p> -<pre> -.version | 2 -ChangeLog | 133 ++++++ -asterisk-1.6.2.17-rc1-summary.html | 320 -------------- -asterisk-1.6.2.17-rc1-summary.txt | 386 ------------------ -main/features.c | 792 +++++++++++++++++++++++++------------ -5 files changed, 674 insertions(+), 959 deletions(-) -</pre><br/> -<hr/> -</body> -</html> diff --git a/asterisk-1.6.2.17-rc2-summary.txt b/asterisk-1.6.2.17-rc2-summary.txt deleted file mode 100644 index 74fef3da4..000000000 --- a/asterisk-1.6.2.17-rc2-summary.txt +++ /dev/null @@ -1,90 +0,0 @@ - Release Summary - - asterisk-1.6.2.17-rc2 - - Date: 2011-01-25 - - <asteriskteam@digium.com> - - ---------------------------------------------------------------------- - - Table of Contents - - 1. Summary - 2. Contributors - 3. Other Changes - 4. Diffstat - - ---------------------------------------------------------------------- - - Summary - - [Back to Top] - - This release includes only bug fixes. The changes included were made only - to address problems that have been identified in this release series. - Users should be able to safely upgrade to this version if this release - series is already in use. Users considering upgrading from a previous - release series are strongly encouraged to review the UPGRADE.txt document - as well as the CHANGES document for information about upgrading to this - release series. - - The data in this summary reflects changes that have been made since the - previous release, asterisk-1.6.2.17-rc1. - - ---------------------------------------------------------------------- - - Contributors - - [Back to Top] - - This table lists the people who have submitted code, those that have - tested patches, as well as those that reported issues on the issue tracker - that were resolved in this release. For coders, the number is how many of - their patches (of any size) were committed into this release. For testers, - the number is the number of times their name was listed as assisting with - testing a patch. Finally, for reporters, the number is the number of - issues that they reported that were closed by commits that went into this - release. - - Coders Testers Reporters - 2 lmadsen - - ---------------------------------------------------------------------- - - Commits Not Associated with an Issue - - [Back to Top] - - This is a list of all changes that went into this release that did not - directly close an issue from the issue tracker. The commits may have been - marked as being related to an issue. If that is the case, the issue - numbers are listed here, as well. - - +------------------------------------------------------------------------+ - | Revision | Author | Summary | Issues Referenced | - |----------+---------+-------------------------------+-------------------| - | 303101 | lmadsen | Create 1.6.2.17-rc2 from | | - | | | 1.6.2.17-rc1 | | - |----------+---------+-------------------------------+-------------------| - | 303141 | lmadsen | Update .version, ChangeLog, | | - | | | and merge changes. | | - +------------------------------------------------------------------------+ - - ---------------------------------------------------------------------- - - Diffstat Results - - [Back to Top] - - This is a summary of the changes to the source code that went into this - release that was generated using the diffstat utility. - - .version | 2 - ChangeLog | 133 ++++++ - asterisk-1.6.2.17-rc1-summary.html | 320 -------------- - asterisk-1.6.2.17-rc1-summary.txt | 386 ------------------ - main/features.c | 792 +++++++++++++++++++++++++------------ - 5 files changed, 674 insertions(+), 959 deletions(-) - - ---------------------------------------------------------------------- |