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

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Thu Jun 11 02:18:50 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.3431, 2015-06-10 22:18:12-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.88
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.510 +0 -0
        Auto merged
        MERGE: 1.500.8.2
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.500.8.2 +0 -0
        Merge rename: ntpq/ntpq-opts.h -> BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.323 +0 -0
        Auto merged
        MERGE: 1.313.8.2
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.313.8.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqmdoc -> BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.512 +0 -0
        Auto merged
        MERGE: 1.502.8.2
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.502.8.2 +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.323 +0 -0
        Auto merged
        MERGE: 1.313.8.2
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.313.8.2 +0 -0
        Merge rename: ntpq/ntpq.man.in -> BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.495 +0 -0
        Auto merged
        MERGE: 1.485.8.2
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.485.8.2 +0 -0
        Merge rename: ntpq/invoke-ntpq.texi -> BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.323 +0 -0
        Auto merged
        MERGE: 1.313.8.2
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.313.8.2 +0 -0
        Merge rename: ntpq/ntpq.mdoc.in -> BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.323 +0 -0
        Auto merged
        MERGE: 1.313.8.2
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.313.8.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqman -> BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec
    
      ChangeLog at 1.1744 +0 -0
        Auto merged
        MERGE: 1.1593.1.71
    
    ChangeSet at 1.3265.1.88, 2015-06-10 10:52:55+00:00, stenn at psp-at1.ntp.org
      [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ChangeLog at 1.1593.1.71 +1 -0
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ntpq/invoke-ntpq.texi at 1.485.8.1 +11 -1
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ntpq/ntpq-opts.c at 1.502.8.1 +1 -1
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ntpq/ntpq-opts.def at 1.26 +8 -0
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ntpq/ntpq-opts.h at 1.500.8.1 +1 -1
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ntpq/ntpq-subs.c at 1.106 +140 -2
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ntpq/ntpq.1ntpqman at 1.313.8.1 +15 -4
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ntpq/ntpq.1ntpqmdoc at 1.313.8.1 +10 -2
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ntpq/ntpq.man.in at 1.313.8.1 +15 -4
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    
      ntpq/ntpq.mdoc.in at 1.313.8.1 +10 -2
        [Bug 2778] Implement "apeers"  ntpq command to include associd
    


More information about the commitlogs mailing list