proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-08-15 13:32:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove commited conflict

Browse Source 
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1110 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Fabien Thomas 2006-07-07 16:35:21 +00:00
parent 663fb22d20
commit ee17f851cb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exec/clm.c
View File

@ -306,11 +306,7 @@ static int clm_exec_init_fn (struct objdb_iface_ver0 *objdb)
if ( sysctl(mib, 2, &boot_time, &size, NULL, 0) == -1 )
boot_time.tv_sec = time (NULL);
/* (currenttime (s) - uptime (s)) * 1 billion (ns) / 1 (s) */
<<<<<<< .mine
my_cluster_node.boot_timestamp = ((SaTimeT)boot_time.tv_sec) * 1000000000;
=======
my_cluster_node.boot_timestmap = ((SaTimeT)boot_time.tv_sec) * 1000000000;
>>>>>>> .r1070
#else /* defined(CTL_KERN) && defined(KERN_BOOTTIME) */
#warning "no bootime support"
#endif