IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 17, 2014, 12:30:45 PM (12 years ago)
Author:
eugene
Message:

merge changes (from past YEAR) into trunk

Location:
branches/eam_branches/ipp-ops-20130712/ippToPsps
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-ops-20130712/ippToPsps

    • Property svn:mergeinfo deleted

  • branches/eam_branches/ipp-ops-20130712/ippToPsps/config/settings.xml

    r35656 r37066  
    66  <!-- path for storing logs -->
    77  <!-- XXX Need to make this different for tests and real, also for different installations -->
    8   <logPath>SAS15</logPath>
     8  <logPath>ipptopsps_pv2_logs</logPath>
    99  <!-- local scratch Db section (REAL version) -->
    1010  <localdatabase>
    1111    <loader mach="ipp006">
    12       <name>ipptopsps_scratch</name>
     12      <name>ipptopsps2_scratch</name>
    1313      <host>ipp006</host>
    1414      <user>dvo</user>
    … …  
    1616      <memory>16</memory>
    1717    </loader>
    18     <loader mach="ipp007">
    19       <name>ipptopsps_scratch</name>
    20       <host>ipp007</host>
    21       <user>dvo</user>
    22       <password>dvo</password>
    23       <memory>16</memory>
    24     </loader>
    25     <loader mach="ipp008">
    26       <name>ipptopsps_scratch</name>
    27       <host>ipp008</host>
    28       <user>dvo</user>
    29       <password>dvo</password>
    30       <memory>16</memory>
    31     </loader>
    32     <loader mach="ipp009">
    33       <name>ipptopsps_scratch</name>
    34       <host>ipp009</host>
    35       <user>dvo</user>
    36       <password>dvo</password>
    37       <memory>16</memory>
    38     </loader>
    39     <loader mach="ipp010">
    40       <name>ipptopsps_scratch</name>
    41       <host>ipp010</host>
    42       <user>dvo</user>
    43       <password>dvo</password>
    44       <memory>16</memory>
    45     </loader>
    46     <loader mach="ipp045">
    47       <name>ipptopsps_scratch</name>
    48       <host>ipp045</host>
    49       <user>dvo</user>
    50       <password>dvo</password>
    51       <memory>32</memory>
    52     </loader>
    53     <loader mach="ipp046">
    54       <name>ipptopsps_scratch</name>
    55       <host>ipp046</host>
    56       <user>dvo</user>
    57       <password>dvo</password>
    58       <memory>32</memory>
    59     </loader>
    60     <loader mach="ipp047">
    61       <name>ipptopsps_scratch</name>
    62       <host>ipp047</host>
    63       <user>dvo</user>
    64       <password>dvo</password>
    65       <memory>32</memory>
    66     </loader>
    67     <loader mach="ipp048">
    68       <name>ipptopsps_scratch</name>
    69       <host>ipp048</host>
    70       <user>dvo</user>
    71       <password>dvo</password>
    72       <memory>32</memory>
    73     </loader>
    74     <loader mach="ipp049">
    75       <name>ipptopsps_scratch</name>
    76       <host>ipp049</host>
    77       <user>dvo</user>
    78       <password>dvo</password>
    79       <memory>32</memory>
    80     </loader>
    81     <loader mach="ipp050">
    82       <name>ipptopsps_scratch</name>
    83       <host>ipp050</host>
    84       <user>dvo</user>
    85       <password>dvo</password>
    86       <memory>32</memory>
    87     </loader>
    88     <loader mach="ipp051">
    89       <name>ipptopsps_scratch</name>
    90       <host>ipp051</host>
    91       <user>dvo</user>
    92       <password>dvo</password>
    93       <memory>32</memory>
    94     </loader>
    95     <loader mach="ipp052">
    96       <name>ipptopsps_scratch</name>
    97       <host>ipp052</host>
    98       <user>dvo</user>
    99       <password>dvo</password>
    100       <memory>32</memory>
    101     </loader>
    102     <loader mach="ipp053">
    103       <name>ipptopsps_scratch</name>
    104       <host>ipp053</host>
    105       <user>dvo</user>
    106       <password>dvo</password>
    107       <memory>32</memory>
    108     </loader>
    109     <loader mach="ipp054">
    110       <name>ipptopsps_scratch</name>
    111       <host>ipp054</host>
    112       <user>dvo</user>
    113       <password>dvo</password>
    114       <memory>32</memory>
    115     </loader>
    116     <loader mach="ipp055">
    117       <name>ipptopsps_scratch</name>
    118       <host>ipp055</host>
    119       <user>dvo</user>
    120       <password>dvo</password>
    121       <memory>32</memory>
    122     </loader>
    123     <loader mach="ipp056">
    124       <name>ipptopsps_scratch</name>
    125       <host>ipp056</host>
    126       <user>dvo</user>
    127       <password>dvo</password>
    128       <memory>32</memory>
    129     </loader>
    130     <loader mach="ipp057">
    131       <name>ipptopsps_scratch</name>
    132       <host>ipp057</host>
    133       <user>dvo</user>
    134       <password>dvo</password>
    135       <memory>32</memory>
    136     </loader>
    137     <loader mach="ipp058">
    138       <name>ipptopsps_scratch</name>
    139       <host>ipp058</host>
    140       <user>dvo</user>
    141       <password>dvo</password>
    142       <memory>32</memory>
    143     </loader>
    144     <loader mach="ipp059">
    145       <name>ipptopsps_scratch</name>
    146       <host>ipp059</host>
    147       <user>dvo</user>
    148       <password>dvo</password>
    149       <memory>32</memory>
    150     </loader>
    151     <loader mach="ipp060">
    152       <name>ipptopsps_scratch</name>
    153       <host>ipp060</host>
    154       <user>dvo</user>
    155       <password>dvo</password>
    156       <memory>32</memory>
    157     </loader>
    158     <loader mach="ipp061">
    159       <name>ipptopsps_scratch</name>
    160       <host>ipp061</host>
    161       <user>dvo</user>
    162       <password>dvo</password>
    163       <memory>32</memory>
    164     </loader>
    165     <loader mach="ipp062">
    166       <name>ipptopsps_scratch</name>
    167       <host>ipp062</host>
    168       <user>dvo</user>
    169       <password>dvo</password>
    170       <memory>32</memory>
    171     </loader>
    172     <loader mach="ipp063">
    173       <name>ipptopsps_scratch</name>
    174       <host>ipp063</host>
    175       <user>dvo</user>
    176       <password>dvo</password>
    177       <memory>32</memory>
    178     </loader>
    179     <loader mach="ipp064">
    180       <name>ipptopsps_scratch</name>
    181       <host>ipp064</host>
    182       <user>dvo</user>
    183       <password>dvo</password>
    184       <memory>32</memory>
    185     </loader>
    186     <loader mach="ipp065">
    187       <name>ipptopsps_scratch</name>
    188       <host>ipp065</host>
    189       <user>dvo</user>
    190       <password>dvo</password>
    191       <memory>32</memory>
    192     </loader>
    193     <loader mach="ipp066">
    194       <name>ipptopsps_scratch</name>
    195       <host>ipp066</host>
    196       <user>dvo</user>
    197       <password>dvo</password>
    198       <memory>32</memory>
    199     </loader>
    20018    <loader mach="stare00">
    201       <name>ipptopsps_scratch</name>
     19      <name>ipptopsps2_scratch</name>
    20220      <host>stare00</host>
    20321      <user>dvo</user>
    … …  
    20624    </loader>
    20725    <loader mach="stare01">
    208       <name>ipptopsps_scratch</name>
     26      <name>ipptopsps2_scratch</name>
    20927      <host>stare01</host>
    21028      <user>dvo</user>
    … …  
    21331    </loader>
    21432    <loader mach="stare02">
    215       <name>ipptopsps_scratch</name>
     33      <name>ipptopsps2_scratch</name>
    21634      <host>stare02</host>
    21735      <user>dvo</user>
    … …  
    22038    </loader>
    22139    <loader mach="stare03">
    222       <name>ipptopsps_scratch</name>
     40      <name>ipptopsps2_scratch</name>
    22341      <host>stare03</host>
    22442      <user>dvo</user>
    … …  
    22745    </loader>
    22846    <loader mach="stare04">
    229       <name>ipptopsps_scratch</name>
     47      <name>ipptopsps2_scratch</name>
    23048      <host>stare04</host>
    23149      <user>dvo</user>
    … …  
    25977  <!-- ippToPsps Db section (REAL version) -->
    26078  <ipptopspsdatabase>
    261     <name>ipptopsps</name>
     79    <name>ipptopsps2</name>
    26280    <host>ipp006</host>
    26381    <user>dvo</user>
Note: See TracChangeset for help on using the changeset viewer.