]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 374317 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Wed, 3 Oct 2012 19:22:34 +0000 (19:22 +0000)
committerAutomerge script <automerge@asterisk.org>
Wed, 3 Oct 2012 19:22:34 +0000 (19:22 +0000)
file:///srv/subversion/repos/asterisk/branches/10

................
  r374317 | mjordan | 2012-10-03 13:59:06 -0500 (Wed, 03 Oct 2012) | 13 lines

  Blocked revisions 374316

  ........
  Destroy the generic_monitors container after the core_instances in ccss

  For each item in core_instances disposed of in the shutdown of ccss, any
  generic monitor instances referenced by the objects will be removed from
  generic_monitors during their destruction.  Hilarity ensues if
  generic_monitors no longer exists.

  Thanks to the Asterisk Test Suite's generic_ccss test for complaining loudly
  when it ran into this.
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@374334 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found