defaria.com/blogs/Status/archives/week_2004_01_18.html

   1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   2    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   3 <html xmlns="http://www.w3.org/1999/xhtml" id="sixapart-standard">
   4 <head>
   5    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   6    <meta name="generator" content="Movable Type 5.2.3" />
   7
   8    <link rel="stylesheet" href="http://defaria.com/blogs/Status/styles-site.css" type="text/css" />
   9    <link rel="alternate" type="application/atom+xml" title="Atom" href="http://defaria.com/blogs/Status/atom.xml" />
  10    <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="http://defaria.com/blogs/Status/index.xml"$>" />
  11
  12    <title>Status for Andrew DeFaria: January 18, 2004 - January 24, 2004 Archives</title>
  13
  14    <link rel="start" href="http://defaria.com/blogs/Status/" title="Home" />
  15    <link rel="prev" href="http://defaria.com/blogs/Status/archives/week_2004_01_11.html" title="January 11, 2004 - January 17, 2004" />
  16    <link rel="next" href="http://defaria.com/blogs/Status/archives/week_2004_01_25.html" title="January 25, 2004 - January 31, 2004" />
  17 </head>
  18 <body class="layout-one-column">
  19    <div id="container">
  20       <div id="container-inner" class="pkg">
  21
  22          <div id="banner">
  23             <div id="banner-inner" class="pkg">
  24                <h1 id="banner-header"><a href="http://defaria.com/blogs/Status/" accesskey="1">Status for Andrew DeFaria</a></h1>
  25                <h2 id="banner-description">Searchable status reports and work log</h2>
  26             </div>
  27          </div>
  28
  29          <div id="pagebody">
  30             <div id="pagebody-inner" class="pkg">
  31                <div id="alpha">
  32                   <div id="alpha-inner" class="pkg">
  33
  34                      <p class="content-nav">
  35                         <a href="http://defaria.com/blogs/Status/archives/week_2004_01_11.html">&laquo; January 11, 2004 - January 17, 2004</a> |
  36                         <a href="http://defaria.com/blogs/Status/">Main</a>
  37                         | <a href="http://defaria.com/blogs/Status/archives/week_2004_01_25.html">January 25, 2004 - January 31, 2004 &raquo;</a>
  38                      </p>
  39
  40
  41
  42
  43                      <h2 class="date-header">January 23, 2004</h2>
  44                      <a id="a000108"></a>
  45                      <div class="entry" id="entry-108">
  46                         <h3 class="entry-header">FX merge/build, onu2360</h3>
  47                         <div class="entry-content">
  48                            <div class="entry-body">
  49                               <ul>
  50
  51 <p><li>Continuing on with merge/build of US_FX branch. Seems this is impedding further development. There were 2 files that required manual merging. I was told to simply copy r_ingress.asmi from 2.3. I'm not particularly comfortable with that because there are merge issues for that file from the 2.2 branch.</li></p>
  52
  53 <p><li>Tried to figure out why 2.4 was not building onu2360. Seems that onu2360 was not included in the cards script (in /Tools/adm/etc) so the build process was not building it. Added it to cards</li></p>
  54
  55 </ul>
  56
  57                               <p class="entry-footer">
  58                                  <span class="post-footers">Posted by  at  2:32 PM</span> <span class="separator">|</span> <a class="permalink" href="http://defaria.com/blogs/Status/archives/000108.html">Permalink</a>
  59
  60
  61                               </p>
  62                            </div>
  63                         </div>
  64                      </div>
  65
  66
  67
  68                      <h2 class="date-header">January 21, 2004</h2>
  69                      <a id="a000106"></a>
  70                      <div class="entry" id="entry-106">
  71                         <h3 class="entry-header">Merging 2.3 -> FX</h3>
  72                         <div class="entry-content">
  73                            <div class="entry-body">
  74                               <p>Shirley/Ying approached me today asking to merge the us_fx branch into the rel_2.3 branch. As rel_2.3 has not be stablized yet (2.3.0.1 has not be officially built) I was hesitant and suggested instead ot merge the reL_2.3 branch into the us_fx. This caused a massive amount of merging (561 elements) probably due to the fact that lots of stuff changed in reL_2.3 that the FX engineers did not care about (other areas of the platform code as well as the web pages, SAM, etc). There were a few elements that require manual merging. Shirley is aware of these.</p>
  75
  76                               <p class="entry-footer">
  77                                  <span class="post-footers">Posted by  at 10:31 AM</span> <span class="separator">|</span> <a class="permalink" href="http://defaria.com/blogs/Status/archives/000106.html">Permalink</a>
  78
  79
  80                               </p>
  81                            </div>
  82                         </div>
  83                      </div>
  84
  85
  86
  87                      <h2 class="date-header">January 19, 2004</h2>
  88                      <a id="a000105"></a>
  89                      <div class="entry" id="entry-105">
  90                         <h3 class="entry-header">2.2.1.7</h3>
  91                         <div class="entry-content">
  92                            <div class="entry-body">
  93                               <ul>
  94 <li>Started 2.2.1.7</li>
  95 <li>Fixed a few merging problems in 2.3</li>
  96 </ul>
  97
  98                               <p class="entry-footer">
  99                                  <span class="post-footers">Posted by  at  6:33 PM</span> <span class="separator">|</span> <a class="permalink" href="http://defaria.com/blogs/Status/archives/000105.html">Permalink</a>
 100
 101
 102                               </p>
 103                            </div>
 104                         </div>
 105                      </div>
 106
 107                   </div>
 108                </div>
 109             </div>
 110          </div>
 111       </div>
 112    </div>
 113 </body>
 114 </html>