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

Harlan Stenn stenn at deacon.udel.edu
Fri Sep 23 04:25:36 UTC 2011


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    1313182656          1313182656          
UTC       20110812205736      20110812205736      
VERSION   bk-5.3              bk-5.3              

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.2680, 2011-09-23 00:19:49-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.2082.4.237
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c~d0a1ce0533b25b2 at 1.289 +0 -0
        Auto merged
        MERGE: 1.247.39.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c~d0a1ce0533b25b2 at 1.247.39.2 +0 -0
        Merge rename: util/ntp-keygen-opts.c -> BitKeeper/deleted/.del-ntp-keygen-opts.c~d0a1ce0533b25b2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.h~f0717b94e4446b26 at 1.289 +0 -0
        Auto merged
        MERGE: 1.247.39.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.h~f0717b94e4446b26 at 1.247.39.2 +0 -0
        Merge rename: util/ntp-keygen-opts.h -> BitKeeper/deleted/.del-ntp-keygen-opts.h~f0717b94e4446b26
    
      BitKeeper/deleted/.del-ntp-keygen-opts.texi~8c66011d5d8b8946 at 1.287 +0 -0
        Auto merged
        MERGE: 1.246.38.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.texi~8c66011d5d8b8946 at 1.246.38.2 +0 -0
        Merge rename: util/ntp-keygen-opts.texi -> BitKeeper/deleted/.del-ntp-keygen-opts.texi~8c66011d5d8b8946
    
      BitKeeper/deleted/.del-ntp-keygen.1~5f9bc1fd9c40085a at 1.287 +0 -0
        Auto merged
        MERGE: 1.246.38.2
    
      BitKeeper/deleted/.del-ntp-keygen.1~5f9bc1fd9c40085a at 1.246.38.2 +0 -0
        Merge rename: util/ntp-keygen.1 -> BitKeeper/deleted/.del-ntp-keygen.1~5f9bc1fd9c40085a
    
      BitKeeper/deleted/.del-ntpd-opts.c~144b52caa1ef699c at 1.291 +0 -0
        Auto merged
        MERGE: 1.248.39.2
    
      BitKeeper/deleted/.del-ntpd-opts.c~144b52caa1ef699c at 1.248.39.2 +0 -0
        Merge rename: ntpd/ntpd-opts.c -> BitKeeper/deleted/.del-ntpd-opts.c~144b52caa1ef699c
    
      BitKeeper/deleted/.del-ntpd-opts.h~2b00d71c3cee10a7 at 1.291 +0 -0
        Auto merged
        MERGE: 1.248.39.2
    
      BitKeeper/deleted/.del-ntpd-opts.h~2b00d71c3cee10a7 at 1.248.39.2 +0 -0
        Merge rename: ntpd/ntpd-opts.h -> BitKeeper/deleted/.del-ntpd-opts.h~2b00d71c3cee10a7
    
      BitKeeper/deleted/.del-ntpd-opts.texi~9cb5bac4bf6450c1 at 1.288 +0 -0
        Auto merged
        MERGE: 1.246.38.2
    
      BitKeeper/deleted/.del-ntpd-opts.texi~9cb5bac4bf6450c1 at 1.246.38.2 +0 -0
        Merge rename: ntpd/ntpd-opts.texi -> BitKeeper/deleted/.del-ntpd-opts.texi~9cb5bac4bf6450c1
    
      BitKeeper/deleted/.del-ntpd.1~28d9b05264c45059 at 1.288 +0 -0
        Auto merged
        MERGE: 1.246.38.2
    
      BitKeeper/deleted/.del-ntpd.1~28d9b05264c45059 at 1.246.38.2 +0 -0
        Merge rename: ntpd/ntpd.1 -> BitKeeper/deleted/.del-ntpd.1~28d9b05264c45059
    
      BitKeeper/deleted/.del-ntpdc-opts.c~58e4a492bd134fb8 at 1.286 +0 -0
        Auto merged
        MERGE: 1.244.39.2
    
      BitKeeper/deleted/.del-ntpdc-opts.c~58e4a492bd134fb8 at 1.244.39.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.c -> BitKeeper/deleted/.del-ntpdc-opts.c~58e4a492bd134fb8
    
      BitKeeper/deleted/.del-ntpdc-opts.h~b31c10ed4f5c2052 at 1.286 +0 -0
        Auto merged
        MERGE: 1.244.39.2
    
      BitKeeper/deleted/.del-ntpdc-opts.h~b31c10ed4f5c2052 at 1.244.39.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.h -> BitKeeper/deleted/.del-ntpdc-opts.h~b31c10ed4f5c2052
    
      BitKeeper/deleted/.del-ntpdc-opts.texi~5fe1056039fe6e4f at 1.284 +0 -0
        Auto merged
        MERGE: 1.243.38.2
    
      BitKeeper/deleted/.del-ntpdc-opts.texi~5fe1056039fe6e4f at 1.243.38.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.texi -> BitKeeper/deleted/.del-ntpdc-opts.texi~5fe1056039fe6e4f
    
      BitKeeper/deleted/.del-ntpdc.1~574c84f3f3e91d36 at 1.284 +0 -0
        Auto merged
        MERGE: 1.243.38.2
    
      BitKeeper/deleted/.del-ntpdc.1~574c84f3f3e91d36 at 1.243.38.2 +0 -0
        Merge rename: ntpdc/ntpdc.1 -> BitKeeper/deleted/.del-ntpdc.1~574c84f3f3e91d36
    
      BitKeeper/deleted/.del-ntpq-opts.c~e22ebc44f822119e at 1.287 +0 -0
        Auto merged
        MERGE: 1.245.39.2
    
      BitKeeper/deleted/.del-ntpq-opts.c~e22ebc44f822119e at 1.245.39.2 +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/.del-ntpq-opts.c~e22ebc44f822119e
    
      BitKeeper/deleted/.del-ntpq-opts.h~bebfd8975972779e at 1.287 +0 -0
        Auto merged
        MERGE: 1.245.39.2
    
      BitKeeper/deleted/.del-ntpq-opts.h~bebfd8975972779e at 1.245.39.2 +0 -0
        Merge rename: ntpq/ntpq-opts.h -> BitKeeper/deleted/.del-ntpq-opts.h~bebfd8975972779e
    
      BitKeeper/deleted/.del-ntpq-opts.texi~fd912c16181424e at 1.285 +0 -0
        Auto merged
        MERGE: 1.244.38.2
    
      BitKeeper/deleted/.del-ntpq-opts.texi~fd912c16181424e at 1.244.38.2 +0 -0
        Merge rename: ntpq/ntpq-opts.texi -> BitKeeper/deleted/.del-ntpq-opts.texi~fd912c16181424e
    
      BitKeeper/deleted/.del-ntpq.1~abfc5609a4b9cf4d at 1.285 +0 -0
        Auto merged
        MERGE: 1.244.38.2
    
      BitKeeper/deleted/.del-ntpq.1~abfc5609a4b9cf4d at 1.244.38.2 +0 -0
        Merge rename: ntpq/ntpq.1 -> BitKeeper/deleted/.del-ntpq.1~abfc5609a4b9cf4d
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.c~8c4453f3336dd4b7 at 1.166 +0 -0
        Auto merged
        MERGE: 1.123.40.2
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.c~8c4453f3336dd4b7 at 1.123.40.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.c -> BitKeeper/deleted/.del-ntpsnmpd-opts.c~8c4453f3336dd4b7
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.h~59291b93d938a895 at 1.166 +0 -0
        Auto merged
        MERGE: 1.123.40.2
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.h~59291b93d938a895 at 1.123.40.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.h -> BitKeeper/deleted/.del-ntpsnmpd-opts.h~59291b93d938a895
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.texi~4cc265b9fc7e692d at 1.165 +0 -0
        Auto merged
        MERGE: 1.123.39.2
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.texi~4cc265b9fc7e692d at 1.123.39.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.texi -> BitKeeper/deleted/.del-ntpsnmpd-opts.texi~4cc265b9fc7e692d
    
      BitKeeper/deleted/.del-ntpsnmpd.1~489dddca797b117c at 1.164 +0 -0
        Auto merged
        MERGE: 1.122.39.2
    
      BitKeeper/deleted/.del-ntpsnmpd.1~489dddca797b117c at 1.122.39.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1 -> BitKeeper/deleted/.del-ntpsnmpd.1~489dddca797b117c
    
      BitKeeper/deleted/.del-packageinfo.sh~ff4c82dd98fc4a4 at 1.296 +0 -0
        Auto merged
        MERGE: 1.255.36.3
    
      BitKeeper/deleted/.del-packageinfo.sh~ff4c82dd98fc4a4 at 1.255.36.3 +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/.del-packageinfo.sh~ff4c82dd98fc4a4
    
      BitKeeper/deleted/.del-sntp-opts.c~134d906c1bc0bd88 at 1.158 +0 -0
        Auto merged
        MERGE: 1.117.38.2
    
      BitKeeper/deleted/.del-sntp-opts.c~134d906c1bc0bd88 at 1.117.38.2 +0 -0
        Merge rename: sntp/sntp-opts.c -> BitKeeper/deleted/.del-sntp-opts.c~134d906c1bc0bd88
    
      BitKeeper/deleted/.del-sntp-opts.h~5df6f04e80275ab3 at 1.158 +0 -0
        Auto merged
        MERGE: 1.117.38.2
    
      BitKeeper/deleted/.del-sntp-opts.h~5df6f04e80275ab3 at 1.117.38.2 +0 -0
        Merge rename: sntp/sntp-opts.h -> BitKeeper/deleted/.del-sntp-opts.h~5df6f04e80275ab3
    
      BitKeeper/deleted/.del-sntp-opts.texi~313e154133ec6f3c at 1.157 +0 -0
        Auto merged
        MERGE: 1.117.37.2
    
      BitKeeper/deleted/.del-sntp-opts.texi~313e154133ec6f3c at 1.117.37.2 +0 -0
        Merge rename: sntp/sntp-opts.texi -> BitKeeper/deleted/.del-sntp-opts.texi~313e154133ec6f3c
    
      BitKeeper/deleted/.del-sntp.1~4b2813589f2f7814 at 1.157 +0 -0
        Auto merged
        MERGE: 1.117.37.2
    
      BitKeeper/deleted/.del-sntp.1~4b2813589f2f7814 at 1.117.37.2 +0 -0
        Merge rename: sntp/sntp.1 -> BitKeeper/deleted/.del-sntp.1~4b2813589f2f7814
    
      BitKeeper/deleted/.del-sntp.html~ca24a75c4b6cb914 at 1.48 +0 -0
        Auto merged
        MERGE: 1.7.38.2
    
      BitKeeper/deleted/.del-sntp.html~ca24a75c4b6cb914 at 1.7.38.2 +0 -0
        Merge rename: sntp/sntp.html -> BitKeeper/deleted/.del-sntp.html~ca24a75c4b6cb914
    
      ChangeLog at 1.1038 +1 -2
        Merge cleanup
        MERGE: 1.496.26.170
    
    ChangeSet at 1.2082.4.237, 2011-09-23 03:38:30+00:00, stenn at deacon.udel.edu
      NTP_4_2_6P4
      TAG: NTP_4_2_6P4
    
      ChangeLog at 1.496.26.170 +1 -0
        NTP_4_2_6P4
    
      ntpd/ntpd-opts.c at 1.248.39.1 +5 -5
        NTP_4_2_6P4
    
      ntpd/ntpd-opts.h at 1.248.39.1 +3 -3
        NTP_4_2_6P4
    
      ntpd/ntpd-opts.texi at 1.246.38.1 +2 -2
        NTP_4_2_6P4
    
      ntpd/ntpd.1 at 1.246.38.1 +2 -2
        NTP_4_2_6P4
    
      ntpdc/ntpdc-opts.c at 1.244.39.1 +5 -5
        NTP_4_2_6P4
    
      ntpdc/ntpdc-opts.h at 1.244.39.1 +3 -3
        NTP_4_2_6P4
    
      ntpdc/ntpdc-opts.texi at 1.243.38.1 +2 -2
        NTP_4_2_6P4
    
      ntpdc/ntpdc.1 at 1.243.38.1 +2 -2
        NTP_4_2_6P4
    
      ntpq/ntpq-opts.c at 1.245.39.1 +5 -5
        NTP_4_2_6P4
    
      ntpq/ntpq-opts.h at 1.245.39.1 +3 -3
        NTP_4_2_6P4
    
      ntpq/ntpq-opts.texi at 1.244.38.1 +2 -2
        NTP_4_2_6P4
    
      ntpq/ntpq.1 at 1.244.38.1 +2 -2
        NTP_4_2_6P4
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.123.40.1 +5 -5
        NTP_4_2_6P4
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.123.40.1 +3 -3
        NTP_4_2_6P4
    
      ntpsnmpd/ntpsnmpd-opts.texi at 1.123.39.1 +2 -2
        NTP_4_2_6P4
    
      ntpsnmpd/ntpsnmpd.1 at 1.122.39.1 +2 -2
        NTP_4_2_6P4
    
      packageinfo.sh at 1.255.36.2 +3 -3
        NTP_4_2_6P4
    
      sntp/sntp-opts.c at 1.117.38.1 +7 -7
        NTP_4_2_6P4
    
      sntp/sntp-opts.h at 1.117.38.1 +3 -3
        NTP_4_2_6P4
    
      sntp/sntp-opts.texi at 1.117.37.1 +4 -4
        NTP_4_2_6P4
    
      sntp/sntp.1 at 1.117.37.1 +2 -2
        NTP_4_2_6P4
    
      sntp/sntp.html at 1.7.38.1 +42 -60
        NTP_4_2_6P4
    
      util/ntp-keygen-opts.c at 1.247.39.1 +5 -5
        NTP_4_2_6P4
    
      util/ntp-keygen-opts.h at 1.247.39.1 +3 -3
        NTP_4_2_6P4
    
      util/ntp-keygen-opts.texi at 1.246.38.1 +2 -2
        NTP_4_2_6P4
    
      util/ntp-keygen.1 at 1.246.38.1 +2 -2
        NTP_4_2_6P4
    
    ChangeSet at 1.2082.4.236, 2011-09-22 22:40:12-04:00, stenn at deacon.udel.edu
      ntp-4.2.6p4
    
      ChangeLog at 1.496.26.169 +1 -0
        ntp-4.2.6p4
    
      NEWS at 1.119 +62 -37
        ntp-4.2.6p4
    
      packageinfo.sh at 1.255.36.1 +1 -1
        ntp-4.2.6p4
    


More information about the commitlogs mailing list