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

Harlan Stenn stenn at deacon.udel.edu
Mon Jul 12 09:13:26 UTC 2010


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     pogo.udel.edu       
ROOT      /deacon/backroom/ntp-dev/pogo/users/hart/ntp-dev-1395-96
LEVEL     1                   1                   
TIME_T    1272912116          1270215421          
UTC       20100503184156      20100402133701      
VERSION   bk-4.6b             bk-4.6              

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.2170, 2010-07-09 23:35:54+00:00, davehart at shiny.ad.hartbrothers.com +4 -0
      updated output of ntpdbase-opts.def
    
      ntpd/ntpd-opts.c at 1.42, 2010-07-09 23:35:53+00:00, davehart at shiny.ad.hartbrothers.com +2 -2
        updated output of ntpdbase-opts.def
    
      ntpd/ntpd-opts.h at 1.42, 2010-07-09 23:35:53+00:00, davehart at shiny.ad.hartbrothers.com +3 -3
        updated output of ntpdbase-opts.def
    
      ntpd/ntpd-opts.texi at 1.41, 2010-07-09 23:35:53+00:00, davehart at shiny.ad.hartbrothers.com +64 -5
        updated output of ntpdbase-opts.def
    
      ntpd/ntpd.1 at 1.41, 2010-07-09 23:35:53+00:00, davehart at shiny.ad.hartbrothers.com +27 -5
        updated output of ntpdbase-opts.def
    
    ChangeSet at 1.2169, 2010-07-09 23:22:27+00:00, davehart at shiny.ad.hartbrothers.com +8 -0
      Merge bk://bk.ntp.org./ntp-dev
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1395-96
      MERGE: 1.2163.1.3
    
      BitKeeper/deleted/.del-ntpd-opts.c~144b52caa1ef699c at 1.267, 2010-07-09 23:19:59+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.265.1.1
    
      BitKeeper/deleted/.del-ntpd-opts.h~2b00d71c3cee10a7 at 1.267, 2010-07-09 23:19:59+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.265.1.1
    
      BitKeeper/deleted/.del-ntpd-opts.texi~9cb5bac4bf6450c1 at 1.265, 2010-07-09 23:19:59+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.263.1.1
    
      BitKeeper/deleted/.del-ntpd.1~28d9b05264c45059 at 1.265, 2010-07-09 23:19:59+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.263.1.1
    
      ChangeLog at 1.606, 2010-07-09 23:22:26+00:00, davehart at shiny.ad.hartbrothers.com +4 -4
        routine
        MERGE: 1.600.1.1
    
      ntpd/ntp_config.c at 1.262, 2010-07-09 23:20:00+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.260.1.3
    
      ntpd/ntpd-opts.c at 1.41, 2010-07-09 23:21:20+00:00, davehart at shiny.ad.hartbrothers.com +1 -2
        use local to preserve --wait-sync, servers on cmd line
        MERGE: 1.39.1.1
    
      ntpd/ntpd-opts.h at 1.41, 2010-07-09 23:22:01+00:00, davehart at shiny.ad.hartbrothers.com +2 -3
        ditto
        MERGE: 1.39.1.1
    
    ChangeSet at 1.2163.1.3, 2010-07-06 04:18:16+00:00, davehart at shiny.ad.hartbrothers.com +10 -0
      Remove orphan mode startup workaround from ntp_proto.c, it's
        not needed with the addition of sys_orphwait.
      Add "tos orphanwait" to set sys_orphwait.
    
      ntpd/complete.conf at 1.8, 2010-07-06 04:18:15+00:00, davehart at shiny.ad.hartbrothers.com +1 -1
        add "tos orphanwait 300"
    
      ntpd/keyword-gen-utd at 1.7, 2010-07-06 04:18:15+00:00, davehart at shiny.ad.hartbrothers.com +1 -1
        sentinel that ntp_keyword.h is current with keyword-gen.c
    
      ntpd/keyword-gen.c at 1.12, 2010-07-06 04:18:15+00:00, davehart at shiny.ad.hartbrothers.com +1 -0
        add T_Orphanwait "orphanwait" for tos orphanwait
    
      ntpd/ntp_config.c at 1.260.1.3, 2010-07-06 04:18:15+00:00, davehart at shiny.ad.hartbrothers.com +5 -0
        tos orphanwait
    
      ntpd/ntp_keyword.h at 1.9, 2010-07-06 04:18:15+00:00, davehart at shiny.ad.hartbrothers.com +498 -493
        generated by keyword-gen.c
    
      ntpd/ntp_parser.c at 1.58, 2010-07-06 04:18:15+00:00, davehart at shiny.ad.hartbrothers.com +907 -898
        generated from ntp_parser.y
    
      ntpd/ntp_parser.h at 1.37, 2010-07-06 04:18:15+00:00, davehart at shiny.ad.hartbrothers.com +131 -129
        generated from ntp_parser.y
    
      ntpd/ntp_parser.y at 1.53, 2010-07-06 04:18:15+00:00, davehart at shiny.ad.hartbrothers.com +3 -0
        tos orphanwait
    
      ntpd/ntp_proto.c at 1.300, 2010-07-06 04:18:15+00:00, davehart at shiny.ad.hartbrothers.com +1 -6
        remove orphan mode at startup workaround, no longer needed for
          [Bug 1395] --wait-sync with DLM's sys_orphwait change.
    
      ntpd/ntpd.c at 1.113, 2010-07-06 04:18:16+00:00, davehart at shiny.ad.hartbrothers.com +0 -7
        leftover merge cleanup, remove locals leftover from code
          moved from ntpdmain() to close_all_beyond().
    
    ChangeSet at 1.2163.1.2, 2010-07-05 14:58:16+00:00, davehart at shiny.ad.hartbrothers.com +3 -0
      merge cleanup
    
      ntpd/ntp_config.c at 1.260.1.2, 2010-07-05 14:58:15+00:00, davehart at shiny.ad.hartbrothers.com +2 -2
        correct merge for removal of default_ai_family from ntpd.
    
      ntpd/ntpd-opts.c at 1.40, 2010-07-05 14:58:15+00:00, davehart at shiny.ad.hartbrothers.com +97 -20
        Autogen output
    
      ntpd/ntpd-opts.h at 1.40, 2010-07-05 14:58:15+00:00, davehart at shiny.ad.hartbrothers.com +18 -11
        Autogen output
    
    ChangeSet at 1.2163.1.1, 2010-07-05 13:35:05+00:00, davehart at shiny.ad.hartbrothers.com +17 -0
      Merge bk://bk1.ntp.org/ntp-dev
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1395-96
      (7 months of ntp-dev with original 1395/1396 repo dating to 9 Dec 2009.
      MERGE: 1.2060.25.1
    
      BitKeeper/deleted/.del-ntpd-opts.c~144b52caa1ef699c at 1.266, 2010-07-04 14:41:29+00:00, davehart at shiny.ad.hartbrothers.com +19 -97
        generated
        MERGE: 1.242.1.2
    
      BitKeeper/deleted/.del-ntpd-opts.c~144b52caa1ef699c at 1.242.1.2, 2010-07-04 14:38:31+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Merge rename: ntpd/ntpd-opts.c -> BitKeeper/deleted/.del-ntpd-opts.c~144b52caa1ef699c
    
      BitKeeper/deleted/.del-ntpd-opts.h~2b00d71c3cee10a7 at 1.266, 2010-07-04 14:41:57+00:00, davehart at shiny.ad.hartbrothers.com +10 -18
        generated
        MERGE: 1.242.1.2
    
      BitKeeper/deleted/.del-ntpd-opts.h~2b00d71c3cee10a7 at 1.242.1.2, 2010-07-04 14:38:32+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Merge rename: ntpd/ntpd-opts.h -> BitKeeper/deleted/.del-ntpd-opts.h~2b00d71c3cee10a7
    
      BitKeeper/deleted/.del-ntpd-opts.texi~9cb5bac4bf6450c1 at 1.264, 2010-07-04 14:42:08+00:00, davehart at shiny.ad.hartbrothers.com +2 -72
        generated
        MERGE: 1.240.1.2
    
      BitKeeper/deleted/.del-ntpd-opts.texi~9cb5bac4bf6450c1 at 1.240.1.2, 2010-07-04 14:38:32+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Merge rename: ntpd/ntpd-opts.texi -> BitKeeper/deleted/.del-ntpd-opts.texi~9cb5bac4bf6450c1
    
      BitKeeper/deleted/.del-ntpd.1~28d9b05264c45059 at 1.264, 2010-07-04 14:42:13+00:00, davehart at shiny.ad.hartbrothers.com +4 -28
        generated
        MERGE: 1.240.1.2
    
      BitKeeper/deleted/.del-ntpd.1~28d9b05264c45059 at 1.240.1.2, 2010-07-04 14:38:32+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Merge rename: ntpd/ntpd.1 -> BitKeeper/deleted/.del-ntpd.1~28d9b05264c45059
    
      ChangeLog at 1.600.1.1, 2010-07-05 13:35:02+00:00, davehart at shiny.ad.hartbrothers.com +2 -2
        routine
        MERGE: 1.496.35.1
    
      include/ntp_config.h at 1.68, 2010-07-05 13:35:03+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        bitkeeper gives me scant clue what change I'm commenting on:
        "include/ntp_config.h:   1.67 1.68 davehart 10/07/04 14:42:16 -i1.66.1.1,1.66.1.2,1.66.1.3,1.66.1.4,1.66.1.5,1.66.1.6 -m1.66.1.6 (has merge pointer, needs delta)"
        is shown where I'd expect to see a diff in citool
        MERGE: 1.66.1.6
    
      include/ntp_machine.h at 1.28, 2010-07-04 14:38:33+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.26.1.1
    
      include/ntp_proto.h at 1.6, 2010-07-05 13:35:03+00:00, davehart at shiny.ad.hartbrothers.com +0 -1
        routine
        MERGE: 1.4.1.1
    
      include/ntpd.h at 1.139, 2010-07-05 13:35:03+00:00, davehart at shiny.ad.hartbrothers.com +0 -2
        merge with reorg/cleanup of ntpd.h
        MERGE: 1.137.1.16
    
      include/ntpsim.h at 1.14, 2010-07-04 14:38:34+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.12.1.1
    
      ntpd/Makefile.am at 1.92, 2010-07-04 14:38:34+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.78.1.1
    
      ntpd/cmd_args.c at 1.58, 2010-07-04 14:38:34+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.56.1.3
    
      ntpd/ntp_config.c at 1.260.1.1, 2010-07-05 13:35:03+00:00, davehart at shiny.ad.hartbrothers.com +71 -51
        merge [Bug 1396] work with intres changes
        MERGE: 1.237.1.1
    
      ntpd/ntp_loopfilter.c at 1.155, 2010-07-04 14:38:34+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.153.1.1
    
      ntpd/ntp_proto.c at 1.299, 2010-07-04 14:38:34+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.297.1.15
    
      ntpd/ntpd.c at 1.112, 2010-07-05 13:35:03+00:00, davehart at shiny.ad.hartbrothers.com +11 -82
        merge [Bug 1395] work with intervening ntpdmain() cleanup.
        MERGE: 1.110.1.7
    
      ntpsnmpd/netsnmp_daemonize.c at 1.3, 2010-07-05 13:35:03+00:00, davehart at shiny.ad.hartbrothers.com +0 -1
        use #ifdef not #if for config.h macros
        MERGE: 1.1.1.1
    
    ChangeSet at 1.2060.25.1, 2009-12-19 03:29:38+00:00, davehart at shiny.ad.hartbrothers.com +19 -0
      [Bug 1395] ease ntpdate elimination with ntpd -w/--wait-sync
      [Bug 1396] allow servers on ntpd command line like ntpdate
    
      ChangeLog at 1.496.35.1, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +2 -0
        [Bug 1395] ease ntpdate elimination with ntpd -w/--wait-sync
        [Bug 1396] allow servers on ntpd command line like ntpdate
    
      include/ntp_config.h at 1.67, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +5 -1
        [Bug 1396] allow servers on ntpd command line like ntpdate
    
      include/ntp_machine.h at 1.27, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +0 -2
        remove NODETACH, nptd uses HAVE_WORKING_FORK instead
    
      include/ntp_proto.h at 1.5, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +3 -3
        stay out of system/compiler underscore namespace
    
      include/ntpd.h at 1.138, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +5 -1
        add waitsync_fd_to_close from ntpd.c
    
      include/ntpsim.h at 1.13, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +0 -1
        remove no-longer-used SLEW which conflicted with autoopts over -x/--slew
    
      ntpd/Makefile.am at 1.78.1.1, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +1 -1
        cmd_args.c no longer differs between SIM and !SIM
    
      ntpd/cmd_args.c at 1.57, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +18 -19
        [Bug 1396] allow servers on ntpd command line like ntpdate
    
      ntpd/ntp_config.c at 1.237.1.1, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +65 -22
        [Bug 1396] allow servers on ntpd command line like ntpdate
    
      ntpd/ntp_loopfilter.c at 1.154, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +7 -7
        comment typo corrections, leading tabs cleanup, msyslog
          "kernel time sync disabledx"
        excess 'x' excised.
    
      ntpd/ntp_proto.c at 1.298, 2009-12-19 03:29:36+00:00, davehart at shiny.ad.hartbrothers.com +21 -3
        [Bug 1396] allow servers on ntpd command line like ntpdate
    
      ntpd/ntpd-opts.c at 1.242.1.1, 2009-12-19 03:29:37+00:00, davehart at shiny.ad.hartbrothers.com +97 -20
        Autogen output
    
      ntpd/ntpd-opts.def at 1.6, 2009-12-19 03:29:37+00:00, davehart at shiny.ad.hartbrothers.com +3 -2
        [Bug 1396] allow servers on ntpd command line like ntpdate
    
      ntpd/ntpd-opts.h at 1.242.1.1, 2009-12-19 03:29:37+00:00, davehart at shiny.ad.hartbrothers.com +18 -11
        Autogen output
    
      ntpd/ntpd-opts.texi at 1.240.1.1, 2009-12-19 03:29:37+00:00, davehart at shiny.ad.hartbrothers.com +72 -8
        Autogen output
    
      ntpd/ntpd.1 at 1.240.1.1, 2009-12-19 03:29:37+00:00, davehart at shiny.ad.hartbrothers.com +28 -6
        Autogen output
    
      ntpd/ntpd.c at 1.111, 2009-12-19 03:29:37+00:00, davehart at shiny.ad.hartbrothers.com +440 -309
        [Bug 1395] ease ntpdate elimination with ntpd -w/--wait-sync
    
      ntpd/ntpdbase-opts.def at 1.21, 2009-12-19 03:29:37+00:00, davehart at shiny.ad.hartbrothers.com +34 -2
        [Bug 1395] ease ntpdate elimination with ntpd -w/--wait-sync
    
      ntpsnmpd/netsnmp_daemonize.c at 1.2, 2009-12-19 03:29:37+00:00, davehart at shiny.ad.hartbrothers.com +7 -3
        HAVE_WORKING_FORK is more appropriate than HAVE_FORK here
    


More information about the commitlogs mailing list