Re: [Condor-devel] [condor-fw] 20110718 Flightworthy Summary

[Nathan Panike <nwp@xxxxxxxxxxx>]

On Wed, Jul 20, 2011 at 10:59:07AM -0500, Nathan Panike wrote:
> On Wed, Jul 20, 2011 at 10:23:43AM -0500, Karen Miller wrote:
> > On 07/18/2011 03:53 PM, Timothy St. Clair wrote:
> 
> <snipped>
> 
> > >- [nate] - merge docs once trunk builds green again (maybe tomorrow
> > >night)
> > 
> > Hoping that this 'Other' is a typo as listed.  Merge docs only
> > after 7.7.0 is released. Otherwise, you'll potentially delay the
> > release of 7.7.0, since pretty much none of the 7.7.0 documentation
> > has been started. . .
> 
> That is correct; I have no intention of doing this until after 7.7.0 is
> released.
> 

Dear colleagues:

OK, 7.7.0 is out.  I went ahead with this merge, and pushed it into
CONDOR_SRC. For the record, the branch heads are the following (This can be
used to back out of the merge if necessary)

43110ae2b1126c1426fe9a222b4c7c8f6d00bcfb HEAD
f27ad9a7bbdcb2618379cfa70c20c98feed18330 V7_5-SandboxManagement-branch
31d2f3c33eb5cc8aa6a87b1d1d859d6dfdff4285 V7_5-StudentFileTransferManagement-branch
9050bec313f0c00b9bc0407b8c2a73734e643488 V7_6-aviary-publicbranch
b2cc3b5f8b88b95c5ab5419b3ccefc34188e6da5 V7_6-aviary-sec-branch
37cba8475e6338c45c9442fc9ea5040cbf30e8c8 V7_6-branch
5d37f0cdb3d2674f609b060b29bc5e2cf89cb076 V7_6-cached-externals-publicbranch
f22aa377a5a1730a3e42cc1c2388406b3ba61fc1 V7_6-etl-contrib-branch
c9eab439929d6ae72a798abefd7d1e6700f568d4 V7_6-vs2010-publicbranch
ae77ad12a9871e367acfc4dce03949d0180aa46b V7_6-winslotuser-publicbranch
1df9a0a528216e1dc970309292524e033d64bd6d V7_6_1-branch
57981cf9b8e30bc92d5139adaac3b0901a34fbc2 V7_6_2-branch
551785beaa1c0d8689d44368030b9f561b5ddfee V7_7-add_dagman_fd_throttle-branch
c1ffed04faeb85447d5c9f2329228582ee183e2c V7_7-allow_cleanup_final_dag_node-branch
69fceba06015c2a40c122fc829bb0ad58de176b4 V7_7-always_run_post_script_even_if_pre_script_fails-branch
cf34e67f795e30a145c8c816ae53bf5a4aafe72a V7_7-blahp_over_ssh-branch
cf34e67f795e30a145c8c816ae53bf5a4aafe72a V7_7-blahp_over_ssh-publicbranch
05950c04c809c8e469613799c7f26351bdc01dad V7_7-credd_cleanup-publicbranch
e2543f888226159dbb1f781c8e3cfe90c8e52141 V7_7-dataflow-branch
23fe2d66053dcd6daa21c8d07b50423791b02c9a V7_7-debian-publicbranch
9c67403267bc491ace358a9933737dc214655a3f V7_7-dynalibs-publicbranch
4ed51824e345561c530de505e3f0fa94063cbb70 V7_7-ec2_x509-branch
cc40ffaf1279c78fedc9e6b4f611f29d298db95b V7_7-fix_dprintf-branch
85d2f8719fe47117a6c85019cc3eb3db73108d7b V7_7-implement_our_own_condor_base64_encoding_decoding-branch
02dc7549bd3f57238ff6caa87be2805d170569ff V7_7-ipv6-soap-fix-branch
0ce0078f63e92e1cc84d966deed4977f895ca8d0 V7_7-multishadow-branch
bfe98727bc775bd11c148c7207946a9f53444804 V7_7-new_rescue_dag-branch
a1d200ae5dd869d405c05a8d6edfa657b547356f V7_7-perf_counters-branch
bbb5f92392492f30fea9045fff6d308750eb20cc V7_7_0-branch
43110ae2b1126c1426fe9a222b4c7c8f6d00bcfb master
4f33150841cbbf38593dfd3c9a6bead7fdad2410 master-ipv6-phase3-branch

master and V7_6-branch in CONDOR_SRC are the only branches that will be merged
with CONDOR_DOC---all other branches in SRC will be left as-is.

> > 
> > Further, while I am now in the notify list of the ticket, whoever
> > implements the merging of the repositories MUST give me some
> > notice, as you might realize that there must be no outstanding
> > commits that are not yet pushed when this happens.

Karen, I will be at work on Monday, and help you if merging your outstanding
commits does not move forward automatically.
> 
> I will let you know when I intend to do it.
> 
> Nathan Panike
> _______________________________________________
> condor-fw mailing list
> condor-fw@xxxxxxxxxxx
> https://lists.cs.wisc.edu/mailman/listinfo/condor-fw