Branch for fixing gittrac #2858. *02/28/12 V7_7_5* {linebreak} -The official release tag for Condor 7.7.7, made from e5e734c8aeb0fe63e90846bb08680248a89f429b buildid 410790 +The official release tag for HTCondor 7.7.7, made from e5e734c8aeb0fe63e90846bb08680248a89f429b buildid 410790 *01/27/12 V7_7-gittrac_2781-branch* {linebreak} Branch for debugging gittrac #2781. Note that this branch has a bunch @@ -557,7 +557,7 @@ *12/10/07 V6_9-dagman-pre-7_0-{root,branch}* {linebreak} A branch to continue DAGMan development while the cvs trunk is frozen - for Condor 7.0. + for HTCondor 7.0. *11/28/07 V6_9_5* {linebreak} The offical tag for 6.9.5, from the V6_9_5-branch. @@ -619,7 +619,7 @@ *09/27/07 V6_9-privsep_switchboard-{root,branch}* {linebreak} A branch for integrating Jim K's changes to the PrivSep Switchboard - into Condor. + into HTCondor. *09/28/07 V6_8-vc2005-(root,branch)* {linebreak} Test branch for the new VC2005 builds @@ -660,7 +660,7 @@ with NMI build id 56753). *08/09/07 V6_9_4-{root,branch}* {linebreak} - The tags which create the offical 6.9.4 release of Condor. + The tags which create the offical 6.9.4 release of HTCondor. *08/08/07 V6_8-merge-9* {linebreak} The state of the V6_8-branch for another merge back to the trunk @@ -752,7 +752,7 @@ Oh snap! I tried once and didn't get very far, but here it is again: a merge branch for my 1 year old Cron code. This branch was made from BUILD-V6_9-trunk-2007-4-12-pavlo and will be used to - merge my cron code that never made it into the Condor trunk. + merge my cron code that never made it into the HTCondor trunk. *04/11/07 trunk-{pre,post}_merge-V6_9_2-merge-1* {linebreak} the state of the trunk before merging in the V6_9_2-branch as tagged @@ -808,13 +808,13 @@ *02/09/07 V6_9-cron-{root,branch}* {linebreak} Well, well, well... look who's back from the dead! That's right, - when most thought that my Condor hacking days were long gone, I've + when most thought that my HTCondor hacking days were long gone, I've come back out of nowhere with a vengence. You can try to sweat over what I'm going to do with this branch, but I think you should just let it slide like that time I hit your mom with a can of reduced fat coconut milk. Anyway, now that's out of the way. This branch was made from BUILD-V6_9-trunk-2007-2-8 and will be used to merge - my cron code that never made it into the Condor trunk. + my cron code that never made it into the HTCondor trunk. *02/02/07 V6_8_4* {linebreak} The official V6_8_4 release is a copy of BUILD-V6_8-branch-2007-2-1. @@ -861,7 +861,7 @@ *01/04/07 V6_9-GCB_optimization-merge-1* {linebreak} The state of the V6_9-GCB_optimization-branch for an initial merge - back to the trunk. This mostly includes changes to Condor to make + back to the trunk. This mostly includes changes to HTCondor to make better use of the new support in GCB for broker failure recovery. *01/08/07 V6_9_1-{root,branch}* {linebreak} @@ -907,8 +907,8 @@ *11/14/06 V6_8-oracle-3-{root,branch}* {linebreak} The 3nd branch for an oracle version of Quill. Created from - BUILD-V6_8-branch-2006-11-14. Condor-C is broken at that build tag, - but we don't need Condor-C for Quill so I'm ignoring it. + BUILD-V6_8-branch-2006-11-14. HTCondor-C is broken at that build tag, + but we don't need HTCondor-C for Quill so I'm ignoring it. *11/02/06 V69-jyoon-vm-{root,branch}* {linebreak} A branch for Jaeyoung Yoon's Virtual Machine work. Started from @@ -937,7 +937,7 @@ *10/12/06 V6_9-envaware-{root,branch}* {linebreak} A branch to add in virtual memory (and possible proc table) - awareness to Condor daemons. The branch is off of + awareness to HTCondor daemons. The branch is off of BUILD-V6_9-trunk-2006-9-25. *10/10/06 V6_8_2-merge-1* {linebreak} @@ -987,7 +987,7 @@ May or may not ever be merged back to V6_8-branch *08/08/06 V6_9-cream-{root,branch}* {linebreak} - A new branch off V6_9 (the trunk) to add support in Condor-G for + A new branch off V6_9 (the trunk) to add support in HTCondor-G for submitting jobs to EGEE's CREAM service. *08/02/06 V6_8-branch* {linebreak} @@ -1111,7 +1111,7 @@ Created from the BUILD-V6_7-branch-2006-2-16_2 tag of V6_7_CODE. *03/22/06 V6_7-freebsd-{root,branch}* {linebreak} - I'm happy to announce that this branch will be used to port Condor + I'm happy to announce that this branch will be used to port HTCondor to FreeBSD 5.X and 6.X. This branch will update the patches sent in by Yahoo to make real system calls to the OS to get process information instead of scraping /proc, which doesn't exist by default in FreeBSD @@ -1176,7 +1176,7 @@ should specifically note it. *02/17/06 V6_7-amd64_port-branch* {linebreak} - Branch for Opteron amd64 full port of Condor. + Branch for Opteron amd64 full port of HTCondor. Off V6_7-amd64_port-root. *02/17/06 V6_7-amd64_port-root* {linebreak} @@ -1243,7 +1243,7 @@ *01/17/06 V6_7-gridftp-merge-1* {linebreak} The state of the V6_7-gridftp-branch for a merge into V6_8-branch. This - add support in Condor-G for automatically spawning a gridftp server to + add support in HTCondor-G for automatically spawning a gridftp server to handle file transfers for gt4 gram grid jobs. *01/17/06 V6_6-merge-52* {linebreak} @@ -1265,7 +1265,7 @@ Created a branch for Jaeyoung Yoon (jyoon@cs.wisc.edu) for him to develop his code to support virtual machines. Created from the V6_7-branch of V6_7_CODE by Alain Roy. Our hope is - to merge this back in mid-January 2005 for Condor 6.7.15, but + to merge this back in mid-January 2005 for HTCondor 6.7.15, but that's only if the code is good enough. *12/21/05 V6_7-cron-2-{root,branch}* {linebreak} @@ -1275,7 +1275,7 @@ Created from the V6_7-branch of V6_7_CODE. *12/20/05 V6_7-boinc-{root,branch}* {linebreak} - Branch for Derek's efforts to get Condor to run a BOINC client + Branch for Derek's efforts to get HTCondor to run a BOINC client (http://boinc.berkeley.edu) whenever the startd doesn't have any other work to do. Created from the V6_7-branch of V6_7_CODE after the successful build from BUILD-V6_7-branch-2005-12-20. @@ -1298,7 +1298,7 @@ committed fixes to condor_tests from BUILD-V6_7-branch-2005-12-19. *12/19/05 V6_7-gridftp-{root,branch}* {linebreak} - Branch for developing Condor-started gridftp servers for GT4 GRAM jobs. + Branch for developing HTCondor-started gridftp servers for GT4 GRAM jobs. Branched from successful BUILD-V6_7-branch-2005-12-19 nightly build tag, for V6_7_CODE module. @@ -1334,7 +1334,7 @@ *11/23/05 V6_7-uniq_pid* {linebreak} Branched from the successful nightly build (11/21). This branch is - for incorporating uniq process identifier code into Condor, + for incorporating uniq process identifier code into HTCondor, specifically into ProcAPI and KillFamily. Only code branched. *11/23/05 V6_7-Technion_ha5-{root,branch}* {linebreak} @@ -1391,8 +1391,8 @@ *10/14/05 V6_7-cron-branch* {linebreak} A branch off of V6_7 for Andy Pavlo's work to add cron-like - scheduling to various parts of Condor. This is initially motivated - by efforts to use Condor for INCA, but many of the features will be + scheduling to various parts of HTCondor. This is initially motivated + by efforts to use HTCondor for INCA, but many of the features will be useful for other sites, too. Functionality slated for this branch includes: job "deferal" in the starter to spawn a job at a specific time, a Requirements expression for local universe jobs, cron-like @@ -1530,7 +1530,7 @@ *08/12/05 V6_7-globus4-merge-1* {linebreak} The state of the V6_7-globus4-branch for a merge into V6_7-branch. This - branches moves the Globus version we link Condor with from 2.4.3 to + branches moves the Globus version we link HTCondor with from 2.4.3 to 4.0.1. *08/11/05 V6_7-cgahp_win-2-branch* {linebreak} @@ -1623,7 +1623,7 @@ The state of V6_7-cgahp_win-branch before the first merge into V6_7-branch *06/14/05 V6_7-cgahp_win-branch* {linebreak} - The work on making Condor-C (in particular the C-GAHP) portable to + The work on making HTCondor-C (in particular the C-GAHP) portable to Windows. Also fixing some bugs noticed by Francesco/G-Lite people. Author: ckireyev @@ -1663,7 +1663,7 @@ A new branch off V6_7 for the final (hopefully) GCB integration. This is the branch that's just going to rely on the GNU ld's --wrap functionality to re-map socket calls to Generic_*, instead of - changing all the Condor source. we'll still have to make some + changing all the HTCondor source. we'll still have to make some fixes, e.g. in my_ip_addr(), but this will be much easier to maintain, and it'll also work with most of the externals, too. Created from the V6_7-gcb-2-root tag on V6_7_CODE.. @@ -1798,7 +1798,7 @@ *02/18/05 V6_7-spooldir-branch* {linebreak} Work on revamping SPOOL usage for per-job files. Notably will allow schedd - to run as root when sandboxing jobs via Condor-C, SOAP, or condor_submit -r + to run as root when sandboxing jobs via HTCondor-C, SOAP, or condor_submit -r -s. Will be merged back into V6_7-branch when basic functionality is working. @@ -1863,7 +1863,7 @@ Created off V6_7-branch at V6_7-analyze-root. *01/05/05 V6_6-tests-branch* {linebreak} - A new branch for adding a bunch of tests to Condor. + A new branch for adding a bunch of tests to HTCondor. Created off V6_6-branch at V6_6-tests-root. *01/04/05 V6_7-post_merge-V6_6-merge-32* {linebreak} @@ -1872,7 +1872,7 @@ *01/04/05 V6_6-merge-32* {linebreak} The state of the V6_6-branch for yet another merge into the V6_7-branch. This includes more NWO glue improvements and fixes, - more OSX build changes, cleanup in Condor.pm and condor_tests, and + more OSX build changes, cleanup in HTCondor.pm and condor_tests, and a condor_configure fix to give more useful output in some failures. *01/04/05 V6_7-pre_merge-V6_6-merge-32* {linebreak} @@ -1897,7 +1897,7 @@ Jeff Weber or Carey Kireyev will know when to merge it back in. *12/30/04 V6_7-condorg_nordugrid-branch* {linebreak} - A branch that has implementation of Condor-G submitting to NorduGrid + A branch that has implementation of HTCondor-G submitting to NorduGrid batch system. Created off 6_7-branch at V6_7-condorg_nordugrid-root. By ckireyev. Should be merged in when the functionality is deemed useful. @@ -1977,7 +1977,7 @@ V6_7-dedicated-branch as tagged at V6_7-dedicated-merge-1 *12/23/04 V6_7-condorg_gt4-branch* {linebreak} - A branch of getting Condor-G to submit to GT4. Created off V6_7-branch + A branch of getting HTCondor-G to submit to GT4. Created off V6_7-branch at tag "V6_7-condorg_gt4-root" by ckireyev. Should be merged into 6.7 as soon as the damn thing works. As of this writing the latest GT4 release is *3.9.4.* {linebreak} @@ -1990,7 +1990,7 @@ *12/21/04 V6_6-merge-27* {linebreak} The state of the V6_6-branch for yet another merge into V6_7. This - just includes the condor-g fix from jamie, and some updates to the + just includes the HTCondor-g fix from jamie, and some updates to the NMI build/test glue. *12/21/04 V6_7-pre_merge-V6_6-merge-27* {linebreak} @@ -2034,7 +2034,7 @@ *11/19/04 V6_7-unicore-3-branch* {linebreak} A new branch off of V6_7-branch created from the V6_7-unicore-3-root tag. This is the 3rd generation of the V6_7-unicore-branch. The - V6_7-branch has new code (from the condor-c branch) that we now want + V6_7-branch has new code (from the HTCondor-c branch) that we now want on the unicore branch. *11/19/04 V6_7-unicore-3-post_merge-V6_7-unicore-2-merge-1* {linebreak} @@ -2125,7 +2125,7 @@ *10/06/04 V6_6-krb5_1_3-branch + V6_6-krb5_1_3-root* {linebreak} This is a new branch off the end of the V6_6-branch for changes to - get Condor to link with and use Kerberos5 version 1.3.x. The + get HTCondor to link with and use Kerberos5 version 1.3.x. The Kerberos API changed between 1.2.x and 1.3.x, and there are a number of security enhancements and portability fixes that are driving us to want to switch to krb5-1.3.x. So, we've got this @@ -2174,7 +2174,7 @@ *09/17/04 V6_7-db_logs-branch* {linebreak} This branch was created off the V6_7-branch at V6_7-db_logs-root and will be used by Profs. DeWitt and Naughton and their - students. Initially, they will work on putting the Condor logs into + students. Initially, they will work on putting the HTCondor logs into a database. *09/16/04 V6_6-file_lock_test-branch* {linebreak} @@ -2218,7 +2218,7 @@ *08/04/04 V6_7-tdp_2-no_tracing-merge-1* {linebreak} The state of the V6_7-tdp_2-no_tracing-branch for it's first (and only) merge into the V6_7-branch. This is the first time the TDP - functionality will be merged into the main-line Condor source. + functionality will be merged into the main-line HTCondor source. *08/04/04 V6_7-pre_merge-V6_7-tdp_2-no_tracing-merge-1* {linebreak} The beginning of the merge of the V6_7-tdp_2-no_tracing-branch into @@ -2279,7 +2279,7 @@ *07/27/04 V6_6-merge-18* {linebreak} The state of the V6_6-branch for yet another merge into V6_7-branch. This merges the Directory object bug dealing with - removing as PRIV_USER, which the schedd does w/ Condor-G. + removing as PRIV_USER, which the schedd does w/ HTCondor-G. *07/27/04 V6_7-pre_merge-V6_6-merge-18* {linebreak} The beginning of a merge of V6_6-branch into V6_7-branch. @@ -2383,7 +2383,7 @@ V6_7-soap-2-branch and then abandoned. *05/26/04 V6_7-credd-branch* {linebreak} - A new branch for the new Condor daemon - condor_credd. Created from + A new branch for the new HTCondor daemon - condor_credd. Created from V6_7-credd-root. By ckireyev. *05/25/04 V6_7-infn_batch-branch* {linebreak} @@ -2393,7 +2393,7 @@ *05/25/04 V6_7-gcb-branch* {linebreak} A new branch off V6_7 for adding support for GCB (Generic - Connection Broker) which will enable Condor to play nicely with + Connection Broker) which will enable HTCondor to play nicely with firewalls, private nets, etc. Created from V6_7-gcb-root. Does *not* include doc. @@ -2456,7 +2456,7 @@ $CondorVersion: 6.7.0 Mar 1 2004 MIRROR-2-BRANCH CORE_snapshot4 $ *05/12/04 V6_6_5_NMI* {linebreak} - This is the tag for NMI_R5 condor. It is identical to Condor 6.6.5, + This is the tag for NMI_R5 HTCondor. It is identical to HTCondor 6.6.5, except it knows how to build the gahp server properly on AIX 5.1 *5/12/04 V6_7-merge-1* {linebreak} @@ -2620,7 +2620,7 @@ *03/10/04 V6_7-condorc-branch* {linebreak} A new branch off of V6_7-branch created from the V6_7-condorc-root - tag. This will hold work to implement Condor-C. + tag. This will hold work to implement HTCondor-C. *03/09/04 V6_6-post-aix-checkin* {linebreak} This is the state of the V6_6-branch after the checkin of the @@ -2733,7 +2733,7 @@ *02/01/04 V6_7-mirror-2-branch* {linebreak} A new branch off of V6_7-branch for the final product we're sending to CORE. It will contain all of the HighAvailability locking stuff - along with the Condor-C-style schedding mirroring, so that CORE can + along with the HTCondor-C-style schedding mirroring, so that CORE can decide which solution they want to use. The V6_7-mirror-branch will be merged directly into this one and then abandoned. Created from the V6_7-mirror-2-root tag. @@ -2771,7 +2771,7 @@ *01/21/4 V6_7-mirror-branch* {linebreak} A new branch off of V6_7-branch for adding the job mirroring stuff - for CORE. This is the gridmanager/Condor-C method of doing it. + for CORE. This is the gridmanager/HTCondor-C method of doing it. Since it's so complicated it's now living in its own branch. Created from the V6_7-mirror-root tag. @@ -2848,7 +2848,7 @@ *12/10/03 V6_7-unicore-branch* {linebreak} A new branch off of V6_7-branch for adding support for Unicore jobs - to Condor-G. + to HTCondor-G. Created from the V6_7-unicore-root tag. We will merge this branch back into V6_7-branch once we're done and sure it's stable. @@ -2979,7 +2979,7 @@ *10/03/03 V6_7-soap-branch* {linebreak} A new branch off V6_7-branch to hold our initial effort - at incorporating SOAP interfaces into the Condor daemons. + at incorporating SOAP interfaces into the HTCondor daemons. Primary goal of producing snapshots for our SciDac collaborators at LBNL to produce a demo using our soap work at SuperComputing. Created from the V6_7-soap-root tag. We will merge this branch @@ -3156,7 +3156,7 @@ *04/10/03 V6_5_1_a* {linebreak} Very small packaging fixes to 6.5.1. They fix how we make our GPT - package--they are not changes to the Condor code. + package--they are not changes to the HTCondor code. *04/09/03 V6_5-post-merge-V6_5_1* {linebreak} The V6_5-branch just before merging in the changes from V6_5_0-branch @@ -3171,7 +3171,7 @@ except the gahp, which lives on the trunk. *04/01/03 v6_5_1_prerelease_for_edg_vdt_1_apr_2003* {linebreak} - This tag is for the prerelease of Condor 6.5.1 that we gave + This tag is for the prerelease of HTCondor 6.5.1 that we gave to EDG via VDT 1.1.8. *03/18/03 V6_5_0* {linebreak} @@ -3180,7 +3180,7 @@ *03/13/03 V6_5_0-post_merge-V6_5_0-tcp_update-merge-1* {linebreak} The state of the V6_5_0 branch after merging in V6_5_0-tcp_update-branch as tagged at V6_5_0-tcp_update-merge-1. - this enables condor to send TCP updates to the collector (which + this enables HTCondor to send TCP updates to the collector (which now uses a SocketCache) if the right things are defined in the config file. flocking is not yet dealt with. this was required by D0 but might be generally useful to other sites. @@ -3372,7 +3372,7 @@ demand". This will mostly involve changes to the startd to support multiple claims per resource, "checkpointing to swap", and other features. There might be other changes to other - parts of Condor to take advantage of it, too. + parts of HTCondor to take advantage of it, too. *10/17/02 V6_5-post-merge-V6_4_3* {linebreak} The V6_5 branch, after we merged in the V6_4-branch as tagged @@ -3400,7 +3400,7 @@ *08/19/02 V6_5-tdp-2-branch* {linebreak} Branch for all the "TDP" work, which stands for "Tool Daemon - Protocol". This is the work to integrate Condor with + Protocol". This is the work to integrate HTCondor with Paradyn, creating paused processes, etc. Branched off of the main V6_5-branch. @@ -3410,7 +3410,7 @@ *08/02/02 V6_5-tdp-branch* {linebreak} Branch for all the "TDP" work, which stands for "Tool Daemon - Protocol". This is the work to integrate Condor with + Protocol". This is the work to integrate HTCondor with Paradyn, creating paused processes, etc. Branched off of the main V6_5-branch. This branch contains all the changes made on the (now abandoned) V6_3-tdp-branch. @@ -3470,7 +3470,7 @@ The 6.2.3 Release tag, which lives on the V6_2-bracnh *6/17/02 V6_3-dzero-branch* {linebreak} - A new branch to hold the changes to Condor-G for DZero. + A new branch to hold the changes to HTCondor-G for DZero. Specifically, the first pass at Alain's old ClassAd "plugin" support, and Todd's first pass at matchmaking Globus Universe jobs. @@ -3482,7 +3482,7 @@ The state of the V6_3-privnet-branch after sonny had finished checking in all his reliable udp stuff, before he goes on to do all the other private network stuff. this way, we can - merge reliable udp support into the appropriate condor + merge reliable udp support into the appropriate HTCondor mainline development branch without having to get all of the private net stuff, too. @@ -3535,18 +3535,18 @@ branch again. (unlikely, we plan to abandon) *03/19/02 V6_3_2-Condor-G-GT2* {linebreak} - The V6_3-branch, from about the same state as the VDT Condor-G + The V6_3-branch, from about the same state as the VDT HTCondor-G release, plus a DAGMan bugfix. The version string is 6.3.2 CondorG-GT2 *03/19/02 V6_3_2-Condor-G-Globus113* {linebreak} The V6_3-branch, from the tag V6_3-pre-globus2_0-switch, which was the state of the 6_3-branch right before the - switchover to GT2. The Condor-G release of this has a + switchover to GT2. The HTCondor-G release of this has a version string of 6.3.2 CondorG-113 *03/17/02 V6_3-CondorG-VDT-1_0* {linebreak} - The V6_3-branch tagged for the 1.0 VDT Condor-G release. + The V6_3-branch tagged for the 1.0 VDT HTCondor-G release. Built with WANT_GLOBUS=yes *03/13/02 V6_3-post-merge-V6_2-merge-8* {linebreak} @@ -3573,14 +3573,14 @@ *02/06/02 V6_3-tdp-branch* {linebreak} Branch for all the "TDP" work, which stands for "Tool Daemon - Protocol". This is the work to integrate Condor with + Protocol". This is the work to integrate HTCondor with Paradyn, creating paused processes, etc. Branched off of the main V6_3-branch. ABANDONED - use the V6_5-tdp-branch. *02/07/02 V6_3-pre-globus2_0-switch* {linebreak} The V6_3-branch, right before we switched over to use - Globus2.0. There was one release of Condor (6.3.2 - Condor-G-113) that was built against this tag + Globus2.0. There was one release of HTCondor (6.3.2 + HTCondor-G-113) that was built against this tag *01/15/02 V6_3-new-gridmanager-branch* {linebreak} Branch containing Jamie and Todd's rewrite of the @@ -3715,7 +3715,7 @@ *5/22/01 V6_3-pre-authentication* {linebreak} The V6_3-branch before zach's authentication stuff, which - affects pretty much all of condor's ReliSocks. + affects pretty much all of HTCondor's ReliSocks. *5/16/01 V6_3-post-merge-V6_3_0-merge-2* {linebreak} The state of the V6_3-branch after merging in the @@ -3758,7 +3758,7 @@ 1.68.4.11) *4/18/01 V6_3_0-branch* {linebreak} - A branch off of V6_3 for the 6.3.0 release of Condor. This is + A branch off of V6_3 for the 6.3.0 release of HTCondor. This is to insulate the 6.3.0 release from other changes to the repository as we get 6.3.0 ready to ship. Hopefully, this branch will be abandonded once 6.3.0 is out and any changes @@ -3844,9 +3844,9 @@ concerning job suspension and control from the shadow side. *2/28/01 V6_3-condor-g-branch* {linebreak} - A branch for Condor-G development in anticipation of a release + A branch for HTCondor-G development in anticipation of a release in the near future. Branched from the end of the V6_3-branch - at 5:45pm on 2/28/01. Only Condor-G development should go on + at 5:45pm on 2/28/01. Only HTCondor-G development should go on on this branch, and it should be merged back into the regular V6_3-branch at the appropriate time. @@ -3900,15 +3900,15 @@ 6.1.15 release tag, which lives on the V6_2-branch. *7/6/00 V6_3-branch* {linebreak} - The branch for all of Condor version 6.3.X (and, probably, + The branch for all of HTCondor version 6.3.X (and, probably, 6.4.X). Changes made on the V6_2-branch should always be merged into this branch, not the trunk. This branch should be merged into the trunk periodically. 6.3.X should contain new - features, Globus universe stuff, Condor-G, Personal Condor + features, Globus universe stuff, HTCondor-G, Personal HTCondor stuff, etc. It should *NOT* contain new classads, new schedd, etc, etc. -*7/6/00 V6_2-branch The branch for all of Condor version 6.2.X. In* {linebreak} +*7/6/00 V6_2-branch The branch for all of HTCondor version 6.2.X. In* {linebreak} addition, the last few 6.1.X releases (hopefully, just 6.1.15), will live on this branch. config, src, doc, and NTconfig are all branched. Changes from this branch should @@ -3980,11 +3980,11 @@ *10/20/99 V6_1_8-ntpreview* {linebreak} This is the release tag for the first NT public release, - Condor NT Preview v6.1.8 (it lives on the below branch). + HTCondor NT Preview v6.1.8 (it lives on the below branch). *10/20/99 V6_1_8-ntpreview-branch* {linebreak} This is branch used to build the first NT release, - Condor NT Preivew v6.1.8. + HTCondor NT Preivew v6.1.8. *8/26/99 V6_1-pre-merge-V6_1-linux-1-branch-merge-1* {linebreak} The state of the trunk before merging with V6_1-linux-1-branch as @@ -4038,7 +4038,7 @@ Create_Process is used, and the schedd's "Agent" is gone. *4/15/99 V6_1_5* {linebreak} - The 6.1.5 release. Lots of new features, including Condor for + The 6.1.5 release. Lots of new features, including HTCondor for machines w/ multiple network interfaces, the new Daemon object, removed some dead APIs in internet.c, converted some things to CEDAR that weren't using it, and tons of bug fixes.