Merged revisions 55006 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 16 Feb 2007 22:50:22 +0000 (22:50 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 16 Feb 2007 22:50:22 +0000 (22:50 +0000)
commitf11d0b3d549f0e727aa2b8e2c91cc0cd1f1aff09
tree6cbd9fdf02119c6ea7fd0831d9db1dfc35af47ab
parent12dadb330ed632ac4040448f40ab095f40d9f5cd
Merged revisions 55006 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r55006 | russell | 2007-02-16 16:49:42 -0600 (Fri, 16 Feb 2007) | 17 lines

Merged revisions 55005 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r55005 | russell | 2007-02-16 16:48:22 -0600 (Fri, 16 Feb 2007) | 9 lines

Revert the change I did in revisions 54955, 54969, and 54970, in 1.2, 1.4,
and trunk.  I decided that once a conference is created from meetme.conf,
it is acceptable behavior that the pin can not be changed until the
conference goes away.  I also added a note in meetme.conf to describe this
behavior.

We still have another issue in 1.4 and trunk where some conferences with no
users don't go away.  That is the real bug that needs to be addressed here.

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_meetme.c
configs/meetme.conf.sample