[svn-commits] oej: branch oej/adb-appleraision-1.8-mark-2 r422355 - in /team/oej/adb-appler...

[SVN commits to the Digium repositories]

Author: oej
Date: Fri Aug 29 08:59:31 2014
New Revision: 422355

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=422355
Log:
Resolve conflict

Modified:
    team/oej/adb-appleraision-1.8-mark-2/   (props changed)
    team/oej/adb-appleraision-1.8-mark-2/main/db.c

Propchange: team/oej/adb-appleraision-1.8-mark-2/
------------------------------------------------------------------------------
    automerge = Is-there-life-off-net?

Propchange: team/oej/adb-appleraision-1.8-mark-2/
            ('svnmerge-integrated' removed)

Modified: team/oej/adb-appleraision-1.8-mark-2/main/db.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/adb-appleraision-1.8-mark-2/main/db.c?view=diff&rev=422355&r1=422354&r2=422355
==============================================================================
--- team/oej/adb-appleraision-1.8-mark-2/main/db.c (original)
+++ team/oej/adb-appleraision-1.8-mark-2/main/db.c Fri Aug 29 08:59:31 2014
@@ -1103,7 +1103,7 @@
 	/* If you have multiple systems using the same database, set the systemname in asterisk.conf */
 	db_rt_sysname = S_OR(ast_config_AST_SYSTEM_NAME, "asterisk");
 	
-	pthread_t dont_care;
+	//pthread_t dont_care;
 
 	ast_cond_init(&dbcond, NULL);
 	if (ast_pthread_create_background(&syncthread, NULL, db_sync_thread, NULL)) {