[asterisk-commits] dlee: branch dlee/stasis-app r383772 - in /team/dlee/stasis-app: ./ main/

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Mar 25 15:23:35 2013
New Revision: 383772

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383772
Log:
Merged revisions 383753-383754 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/dlee/stasis-app/   (props changed)
    team/dlee/stasis-app/main/manager_channels.c
    team/dlee/stasis-app/main/stasis.c

Propchange: team/dlee/stasis-app/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 25 15:23:35 2013
@@ -1,1 +1,1 @@
-/trunk:1-383750
+/trunk:1-383765

Modified: team/dlee/stasis-app/main/manager_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-app/main/manager_channels.c?view=diff&rev=383772&r1=383771&r2=383772
==============================================================================
--- team/dlee/stasis-app/main/manager_channels.c (original)
+++ team/dlee/stasis-app/main/manager_channels.c Mon Mar 25 15:23:35 2013
@@ -637,7 +637,7 @@
 					 NULL);
 
 	/* If somehow we failed to add any routes, just shut down the whole
-	 * things and fail it.
+	 * thing and fail it.
 	 */
 	if (ret) {
 		manager_channels_shutdown();

Modified: team/dlee/stasis-app/main/stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-app/main/stasis.c?view=diff&rev=383772&r1=383771&r2=383772
==============================================================================
--- team/dlee/stasis-app/main/stasis.c (original)
+++ team/dlee/stasis-app/main/stasis.c Mon Mar 25 15:23:35 2013
@@ -472,7 +472,7 @@
 
 static int topic_pool_entry_hash(const void *obj, const int flags)
 {
-	const char *topic_name= (flags & OBJ_KEY) ? obj : stasis_topic_name(((struct topic_pool_entry*) obj)->topic);
+	const char *topic_name = (flags & OBJ_KEY) ? obj : stasis_topic_name(((struct topic_pool_entry*) obj)->topic);
 	return ast_str_case_hash(topic_name);
 }