diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-16 22:50:22 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-16 22:50:22 +0000 |
commit | 6b81b7e250b21d256783ec5b593715e160619279 (patch) | |
tree | 6cbd9fdf02119c6ea7fd0831d9db1dfc35af47ab /configs/meetme.conf.sample | |
parent | 20a9560f866278dea7c56786837b2dc70aa4041e (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@55007 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs/meetme.conf.sample')
-rw-r--r-- | configs/meetme.conf.sample | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configs/meetme.conf.sample b/configs/meetme.conf.sample index bcd47e0bc..62e52dca4 100644 --- a/configs/meetme.conf.sample +++ b/configs/meetme.conf.sample @@ -17,5 +17,10 @@ ; ; Usage is conf => confno[,pin][,adminpin] ; +; Note that once a participant has called the conference, a change to the pin +; number done in this file will not take effect until there are no more users +; in the conference and it goes away. When it is created again, it will have +; the new pin number. +; ;conf => 1234 ;conf => 2345,9938 |