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

Harlan Stenn stenn at deacon.udel.edu
Mon May 3 08:17:15 UTC 2010


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    1265996127          1265996127          
UTC       20100212173527      20100212173527      
VERSION   bk-4.5              bk-4.5              

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.2127, 2010-05-03 04:16:52-04:00, stenn at deacon.udel.edu +7 -0
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.2082.4.83
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.c~8c4453f3336dd4b7 at 1.136, 2010-05-03 04:10:56-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.123.10.2
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.c~8c4453f3336dd4b7 at 1.123.10.2, 2010-05-03 04:10:56-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.c -> BitKeeper/deleted/.del-ntpsnmpd-opts.c~8c4453f3336dd4b7
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.h~59291b93d938a895 at 1.136, 2010-05-03 04:10:56-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.123.10.2
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.h~59291b93d938a895 at 1.123.10.2, 2010-05-03 04:10:56-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.h -> BitKeeper/deleted/.del-ntpsnmpd-opts.h~59291b93d938a895
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.texi~4cc265b9fc7e692d at 1.136, 2010-05-03 04:10:56-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.123.10.2
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.texi~4cc265b9fc7e692d at 1.123.10.2, 2010-05-03 04:10:56-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.texi -> BitKeeper/deleted/.del-ntpsnmpd-opts.texi~4cc265b9fc7e692d
    
      BitKeeper/deleted/.del-ntpsnmpd.1~489dddca797b117c at 1.135, 2010-05-03 04:10:56-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.122.10.2
    
      BitKeeper/deleted/.del-ntpsnmpd.1~489dddca797b117c at 1.122.10.2, 2010-05-03 04:10:56-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1 -> BitKeeper/deleted/.del-ntpsnmpd.1~489dddca797b117c
    
      ChangeLog at 1.567, 2010-05-03 04:16:50-04:00, stenn at deacon.udel.edu +6 -8
        Merge cleanup
        MERGE: 1.496.26.58
    
      ntpd/refclock_nmea.c at 1.49, 2010-05-03 04:10:56-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.46.1.1
    
      ntpsnmpd/ntpsnmpd.c at 1.5, 2010-05-03 04:10:56-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.3.1.1
    
    ChangeSet at 1.2082.4.83, 2010-04-30 09:03:12+00:00, stenn at psp-fb1.ntp.org +7 -0
      [Bug 1512] ntpsnmpd should connect to net-snmpd via a unix-domain socket by default.  Provide a command-line 'socket name' option.
    
      ChangeLog at 1.496.26.58, 2010-04-30 08:59:54+00:00, stenn at psp-fb1.ntp.org +2 -0
        [Bug 1512] ntpsnmpd should connect to net-snmpd via a unix-domain socket by default.  Provide a command-line 'socket name' option.
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.123.10.1, 2010-04-30 09:01:30+00:00, stenn at psp-fb1.ntp.org +29 -6
        [Bug 1512] ntpsnmpd should connect to net-snmpd via a unix-domain socket by default.  Provide a command-line 'socket name' option.
    
      ntpsnmpd/ntpsnmpd-opts.def at 1.2, 2010-04-30 09:01:30+00:00, stenn at psp-fb1.ntp.org +12 -0
        [Bug 1512] ntpsnmpd should connect to net-snmpd via a unix-domain socket by default.  Provide a command-line 'socket name' option.
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.123.10.1, 2010-04-30 09:01:30+00:00, stenn at psp-fb1.ntp.org +17 -10
        [Bug 1512] ntpsnmpd should connect to net-snmpd via a unix-domain socket by default.  Provide a command-line 'socket name' option.
    
      ntpsnmpd/ntpsnmpd-opts.texi at 1.123.10.1, 2010-04-30 09:01:30+00:00, stenn at psp-fb1.ntp.org +33 -2
        [Bug 1512] ntpsnmpd should connect to net-snmpd via a unix-domain socket by default.  Provide a command-line 'socket name' option.
    
      ntpsnmpd/ntpsnmpd.1 at 1.122.10.1, 2010-04-30 09:01:30+00:00, stenn at psp-fb1.ntp.org +11 -2
        [Bug 1512] ntpsnmpd should connect to net-snmpd via a unix-domain socket by default.  Provide a command-line 'socket name' option.
    
      ntpsnmpd/ntpsnmpd.c at 1.3.1.1, 2010-04-30 09:01:30+00:00, stenn at psp-fb1.ntp.org +1 -1
        [Bug 1512] ntpsnmpd should connect to net-snmpd via a unix-domain socket by default.  Provide a command-line 'socket name' option.
    
    ChangeSet at 1.2082.4.82, 2010-04-30 08:54:29+00:00, stenn at psp-fb1.ntp.org +2 -0
      [Bug 1538] update refclock_nmea.c's call to getprotobyname()
    
      ChangeLog at 1.496.26.57, 2010-04-30 08:53:42+00:00, stenn at psp-fb1.ntp.org +6 -0
        [Bug 1538] update refclock_nmea.c's call to getprotobyname()
    
      ntpd/refclock_nmea.c at 1.46.1.1, 2010-04-30 08:53:58+00:00, stenn at psp-fb1.ntp.org +1 -1
        [Bug 1538] update refclock_nmea.c's call to getprotobyname()
    


More information about the commitlogs mailing list