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

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Wed Sep 23 10:44:58 UTC 2015


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     psp-deb1.ntp.org    
ROOT      /deacon/backroom/ntp-dev/home/stenn/ntp-dev 
LEVEL     1                   1                   
TIME_T    1396638816          1425999324          
UTC       20140404191336      20150310145524      
VERSION   bk-6.0.3            bk-6.1.3            

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.3591, 2015-09-23 10:32:22+00:00, stenn at psp-deb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1900 +2 -0
        merge cleanup
    
    ChangeSet at 1.3590, 2015-09-23 10:31:14+00:00, stenn at psp-deb1.ntp.org
      Merge bk://bk.ntp.org/ntp-dev
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.3588.1.1
    
      ChangeLog at 1.1899 +0 -0
        Auto merged
        MERGE: 1.1897.1.1
    
    ChangeSet at 1.3588.1.1, 2015-09-23 10:30:56+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.3265.1.309
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.219 +0 -0
        Auto merged
        MERGE: 1.202.15.2
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.15.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.219 +0 -0
        Auto merged
        MERGE: 1.202.15.2
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.15.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.185 +0 -0
        Auto merged
        MERGE: 1.168.15.2
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.15.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.219 +0 -0
        Auto merged
        MERGE: 1.202.15.2
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.15.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.219 +0 -0
        Auto merged
        MERGE: 1.202.15.2
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.15.2 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      ChangeLog at 1.1897.1.1 +0 -0
        Auto merged
        MERGE: 1.1593.1.157
    
    ChangeSet at 1.3265.1.309, 2015-09-23 10:29:51+00:00, stenn at psp-deb1.ntp.org
      More updates for bug 2817.  Harlan Stenn.
    
      ChangeLog at 1.1593.1.157 +1 -0
        More updates for bug 2817.  Harlan Stenn.
    
      html/miscopt.html at 1.83 +2 -2
        More updates for bug 2817.  Harlan Stenn.
    
      include/ntp_config.h at 1.83 +2 -2
        More updates for bug 2817.  Harlan Stenn.
    
      ntpd/invoke-ntp.conf.texi at 1.168.15.1 +8 -5
        More updates for bug 2817.  Harlan Stenn.
    
      ntpd/ntp.conf.5man at 1.202.15.1 +9 -6
        More updates for bug 2817.  Harlan Stenn.
    
      ntpd/ntp.conf.5mdoc at 1.202.15.1 +9 -6
        More updates for bug 2817.  Harlan Stenn.
    
      ntpd/ntp.conf.def at 1.20 +6 -3
        More updates for bug 2817.  Harlan Stenn.
    
      ntpd/ntp.conf.man.in at 1.202.15.1 +9 -6
        More updates for bug 2817.  Harlan Stenn.
    
      ntpd/ntp.conf.mdoc.in at 1.202.15.1 +9 -6
        More updates for bug 2817.  Harlan Stenn.
    
      ntpd/ntp_config.c at 1.334 +26 -4
        More updates for bug 2817.  Harlan Stenn.
    
      ntpd/ntpd.c at 1.162 +1 -1
        More updates for bug 2817.  Harlan Stenn.
    
      sntp/m4/ntp_rlimit.m4 at 1.4 +2 -2
        More updates for bug 2817.  Harlan Stenn.
    


More information about the commitlogs mailing list