[ntp:commitlogs] incoming pull in deacon.udel.edu:/deacon/backroom/ntp-dev

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Mon Jun 29 18:07:25 UTC 2015


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     deacon.udel.edu     
ROOT      /deacon/backroom/ntp-dev/deacon/backroom/ntp-stable
LEVEL     1                   1                   
TIME_T    1396638816          1396638816          
UTC       20140404191336      20140404191336      
VERSION   bk-6.0.3            bk-6.0.3            

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.3481, 2015-06-29 14:07:15-04:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.1.248
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.216 +0 -0
        Auto merged
        MERGE: 1.202.12.2
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.12.2 +0 -0
        Merge rename: ntpd/ntp.conf.5man -> BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.216 +0 -0
        Auto merged
        MERGE: 1.202.12.2
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.12.2 +0 -0
        Merge rename: ntpd/ntp.conf.mdoc.in -> BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.182 +0 -0
        Auto merged
        MERGE: 1.168.12.2
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.12.2 +0 -0
        Merge rename: ntpd/invoke-ntp.conf.texi -> BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.216 +0 -0
        Auto merged
        MERGE: 1.202.12.2
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.12.2 +0 -0
        Merge rename: ntpd/ntp.conf.man.in -> BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.216 +0 -0
        Auto merged
        MERGE: 1.202.12.2
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.12.2 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      ChangeLog at 1.1794 +0 -0
        Auto merged
        MERGE: 1.1593.1.92
    
    ChangeSet at 1.3265.1.248, 2015-06-29 06:00:52+00:00, stenn at psp-at1.ntp.org
      html/miscopt.html: Document leapsmearinterval, other cleanup.  Harlan Stenn.
    
      ChangeLog at 1.1593.1.92 +1 -0
        html/miscopt.html: Document leapsmearinterval, other cleanup.  Harlan Stenn.
    
      html/miscopt.html at 1.82 +18 -15
        html/miscopt.html: Document leapsmearinterval, other cleanup.  Harlan Stenn.
    
    ChangeSet at 1.3265.1.247, 2015-06-29 05:28:47+00:00, stenn at psp-at1.ntp.org
      ntpd/ntp.conf.def: Document DSCP and leapsmearinterval.  Harlan Stenn.
    
      ChangeLog at 1.1593.1.91 +1 -0
        ntpd/ntp.conf.def: Document DSCP and leapsmearinterval.  Harlan Stenn.
    
      ntpd/invoke-ntp.conf.texi at 1.168.12.1 +17 -1
        ntpd/ntp.conf.def: Document DSCP and leapsmearinterval.  Harlan Stenn.
    
      ntpd/ntp.conf.5man at 1.202.12.1 +21 -3
        ntpd/ntp.conf.def: Document DSCP and leapsmearinterval.  Harlan Stenn.
    
      ntpd/ntp.conf.5mdoc at 1.202.12.1 +18 -2
        ntpd/ntp.conf.def: Document DSCP and leapsmearinterval.  Harlan Stenn.
    
      ntpd/ntp.conf.def at 1.17 +16 -0
        ntpd/ntp.conf.def: Document DSCP and leapsmearinterval.  Harlan Stenn.
    
      ntpd/ntp.conf.man.in at 1.202.12.1 +21 -3
        ntpd/ntp.conf.def: Document DSCP and leapsmearinterval.  Harlan Stenn.
    
      ntpd/ntp.conf.mdoc.in at 1.202.12.1 +18 -2
        ntpd/ntp.conf.def: Document DSCP and leapsmearinterval.  Harlan Stenn.
    


More information about the commitlogs mailing list