mjames-upc
|
0ca315be49
|
build scripts updates
Former-commit-id: a9e2247af9
|
2014-10-28 19:51:00 -06:00 |
|
mjames-upc
|
919eb8f0d1
|
etc/profile.d script updates
Former-commit-id: aa1b14b338
|
2014-10-28 19:50:07 -06:00 |
|
Steve Harris
|
fe901cfcb1
|
Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
rpms/awips2.core/Installer.gfe.climo/component.spec
Former-commit-id: bf83d93e3f [formerly 40225d128a] [formerly 1b83d045ea] [formerly bf83d93e3f [formerly 40225d128a] [formerly 1b83d045ea] [formerly 19527f50bb [formerly 1b83d045ea [formerly 353674cd0deec2dd86c38dc75c7593d1477a7e78]]]]
Former-commit-id: 19527f50bb
Former-commit-id: 210224a441 [formerly 8db5f15d53] [formerly 74f06c8118b91a36ff764543245780724877dfce [formerly bd4b324ebe]]
Former-commit-id: ccc865fc9b47d08ae4a5a12fb9b56ce09b645ecf [formerly f3e7b20ac7]
Former-commit-id: 74c0a4bc61
|
2014-10-28 13:32:31 -05:00 |
|
David Lovely
|
93303325e9
|
Omaha #2991 Initial add of qpid 0.28. Fixed an issue with the x86_64 directory not being created.
Change-Id: Iacd5c7d8b41ab3100b7ea9c409ec18691ffe7fdc
Former-commit-id: 58c9e93aba [formerly 3d1fa8e1b8] [formerly 2f9c1e8303] [formerly 58c9e93aba [formerly 3d1fa8e1b8] [formerly 2f9c1e8303] [formerly 081ea4a12a [formerly 2f9c1e8303 [formerly b50c56c84968f4765245ec12fa33c3037b0380ff]]]]
Former-commit-id: 081ea4a12a
Former-commit-id: bc6abe72cc [formerly 28639c96c0] [formerly b68ae40acd3573661dd51d2bc668630763f62d58 [formerly 2f02a475a8]]
Former-commit-id: 291b53f372501c49cf6330c7a312e81747e764b0 [formerly ab038bc4c7]
Former-commit-id: 396eb2cda5
|
2014-10-23 15:55:26 -05:00 |
|
Shawn.Hooper
|
08513a31e5
|
ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868
Former-commit-id: 0a737d7605 [formerly 114ff128ed] [formerly 0e372cd13e] [formerly 0a737d7605 [formerly 114ff128ed] [formerly 0e372cd13e] [formerly 3b4b9d262a [formerly 0e372cd13e [formerly e29cf5a57591e5a25b6e73b267c0abb46e9f95c2]]]]
Former-commit-id: 3b4b9d262a
Former-commit-id: 6553dd930b [formerly b1426303fa] [formerly 316973a00d42544ed358ceb26bd0c4fc73613a5c [formerly d62f27cae6]]
Former-commit-id: a4fec6b5cd213bd8e5b65d1b564284ccaae6678c [formerly cc74b6bb2c]
Former-commit-id: ed790d1a7a
|
2014-10-22 14:47:42 -04:00 |
|
Steve Harris
|
a087a820cf
|
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: f5b5d2bca2 [formerly e9c9a17f96] [formerly dc557b2d0c] [formerly f5b5d2bca2 [formerly e9c9a17f96] [formerly dc557b2d0c] [formerly bfade7674d [formerly dc557b2d0c [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]]]
Former-commit-id: bfade7674d
Former-commit-id: 10e766d644 [formerly 879b0608ed] [formerly c910f3c64c7d7ef6791f3502b2d2ed5eb7f82d29 [formerly 9e7ce04543]]
Former-commit-id: ba2773ec94554e459f05101098727f2b8b98e671 [formerly 040e641ec9]
Former-commit-id: 116b83101e
|
2014-10-22 11:45:39 -05:00 |
|
Shawn.Hooper
|
dd78e0b2c9
|
ASM #16805 - Fix rpms/legal/ directory
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3
Former-commit-id: 9be238d949 [formerly 26054621ca] [formerly d0fba5965b] [formerly 9be238d949 [formerly 26054621ca] [formerly d0fba5965b] [formerly a96693cb70 [formerly d0fba5965b [formerly 94872b496bec6c427030ea353856466809d2e6c1]]]]
Former-commit-id: a96693cb70
Former-commit-id: 1bb8b3ea7b [formerly 78cd702d20] [formerly 5aee7a96042ff815ece4420368bedf9e6903ba6e [formerly f98e05c9de]]
Former-commit-id: fe9a6c7c335190ddf8637bb1a75098279d9e09a1 [formerly b99895779f]
Former-commit-id: 490cb64a41
|
2014-10-21 11:17:45 -04:00 |
|
Shawn.Hooper
|
4e478bcbb2
|
ASM #16805 - Update master rights and license files for 14.3.1.
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82
Former-commit-id: 3357578661 [formerly 217f39ee04] [formerly e24cb3c37e] [formerly 3357578661 [formerly 217f39ee04] [formerly e24cb3c37e] [formerly 65065f2380 [formerly e24cb3c37e [formerly f72ec046e98bdb6734dbce10ef472dd5294c59ba]]]]
Former-commit-id: 65065f2380
Former-commit-id: 6d8a43b18b [formerly c491bf611e] [formerly e0e56fce59d72735378c58f1a382174e1a922e1b [formerly e50becc648]]
Former-commit-id: 64c59f9d5eb478aa65cc5785f61b776f44dc9aa9 [formerly 17f88aad75]
Former-commit-id: 82afe46187
|
2014-10-20 14:36:31 -04:00 |
|
mjames-upc
|
534a084919
|
build increment for python and postgres
Former-commit-id: e3d26435d4
|
2014-10-16 17:00:56 -06:00 |
|
Brian.Dyke
|
1e0d10a21c
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 4cfcb51852 [formerly 498abd3716] [formerly 418894a17b] [formerly 4cfcb51852 [formerly 498abd3716] [formerly 418894a17b] [formerly 93df82ac92 [formerly 418894a17b [formerly f0f79fb324665245ef759947d24514a6c8bc4470]]]]
Former-commit-id: 93df82ac92
Former-commit-id: 471e3f6a7b [formerly bde528063d] [formerly c21ff59cdf15c4c916761f275e34b868583f6dfa [formerly 8af5c9870e]]
Former-commit-id: 9d615abd9636830c9512e42d79d255eeba72db41 [formerly a71dcd88c4]
Former-commit-id: 70568c04be
|
2014-10-16 12:04:27 -04:00 |
|
Sean.Webb
|
fd0dc9410e
|
ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd
Former-commit-id: eed9457e01 [formerly b256e04c45] [formerly 36d39be5fd] [formerly eed9457e01 [formerly b256e04c45] [formerly 36d39be5fd] [formerly 5f6c9bc837 [formerly 36d39be5fd [formerly c11e78b57bca7d242d4d8c29dc51669d7aebb37d]]]]
Former-commit-id: 5f6c9bc837
Former-commit-id: 52e6f68a3c [formerly cbdb5b8911] [formerly 1a7be974d3087ff2cfeb0d973807e8aaa63d6774 [formerly 1cbbc5bd59]]
Former-commit-id: c1dd27327aab245b131b8dce18d9889072684a10 [formerly 8755e96919]
Former-commit-id: e42e731341
|
2014-10-16 10:38:14 -05:00 |
|
Ana Rivera
|
88c0382d8a
|
VLab Issue #5014; Workaround pqact pattern for ESTOFS (RM 295); fixes #5014
Change-Id: I77529f91b0d6b59640bda21be909f84fdc049614
Former-commit-id: 3b5fd4499b [formerly ee4cdc015f] [formerly f516cc441d] [formerly 3b5fd4499b [formerly ee4cdc015f] [formerly f516cc441d] [formerly 927b2dea69 [formerly f516cc441d [formerly 721938a9fd9a270a2b886eb19de6df70fd62555d]]]]
Former-commit-id: 927b2dea69
Former-commit-id: 7fc3016143 [formerly 99974b81bc] [formerly d07596f046cf735ce306ef4b687390b676f3c29a [formerly ad412ebf94]]
Former-commit-id: f90fd76c0460ad6b8214c502e3081b369ebb0e81 [formerly 9d73c2b3ea]
Former-commit-id: bda3a5fb4e
|
2014-10-15 18:41:58 +00:00 |
|
mjames-upc
|
7eeb299578
|
pull and merge for HRRR re-edits
Former-commit-id: 0116938d64
|
2014-10-09 16:14:37 -06:00 |
|
mjames-upc
|
a6186ba2eb
|
alertviz autostart removed
Former-commit-id: d2548859c0
|
2014-10-09 16:12:10 -06:00 |
|
mjames-upc
|
455a0dfe52
|
removed awips2-alertviz.desktop from autostart. manual starting via CAVE client only.
Former-commit-id: d91a058038
|
2014-10-07 11:33:42 -06:00 |
|
Steve Harris
|
e40f190f9a
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 1c1e618183 [formerly 306826aed9] [formerly 97756f4cc415dba80b72fef671c8609b2b0ef779 [formerly 523cedbb56]]
Former-commit-id: 85a2c5f56cad1fa8121856b8cb5312cdf481051b [formerly 57f5294f08]
Former-commit-id: e05d31ae36
|
2014-10-03 10:18:34 -05:00 |
|
Ron Anderson
|
92071a03c6
|
Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8
Former-commit-id: f97651285a [formerly 35657166ea] [formerly ec1530c5e8] [formerly f97651285a [formerly 35657166ea] [formerly ec1530c5e8] [formerly f44ac32b1e [formerly ec1530c5e8 [formerly 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59]]]]
Former-commit-id: f44ac32b1e
Former-commit-id: 88aae9d195 [formerly 841e270b6f] [formerly 8544b7d76afb53dadb3f5d65587b33d13b6e8ede [formerly b59e41705c]]
Former-commit-id: a736762ec6fda2c02a849ad08fec20a2cb13b150 [formerly 50acd7dc68]
Former-commit-id: 2d64e79be9
|
2014-09-30 14:09:31 -05:00 |
|
dmsys
|
6b2eccce36
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 0cb584f44e [formerly 07f84c6b26] [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4 [formerly b884e5e32d]]
Former-commit-id: 8f7a656cd223aa4bbbad7217939da98d6e8672ab [formerly e00ea2d8cd]
Former-commit-id: 71d6e48473
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
10752cbc42
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: e9774e46ea [formerly 842abaad49] [formerly 1f609e71c1d55fbd64663d85caf8d8fbf61ab92c [formerly 6330a62e85]]
Former-commit-id: df06a15df0e12cfd77916f5f59e1b95c241b34d2 [formerly 30f0d27dfb]
Former-commit-id: 4c4380580f
|
2014-09-29 12:58:56 -05:00 |
|
Brian.Dyke
|
ade65cb1ab
|
Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: b89a2459ee [formerly 9661a1d7b1] [formerly 0c1b83b644] [formerly b89a2459ee [formerly 9661a1d7b1] [formerly 0c1b83b644] [formerly 0e0255ce5b [formerly 0c1b83b644 [formerly 6e79993fbf34ebd832ca07356cbac003efaf6405]]]]
Former-commit-id: 0e0255ce5b
Former-commit-id: 1cc416b17b [formerly 3b3e81d4a2] [formerly e1d7c0bc2a75cdb11de7602ec3d70def4a84dc95 [formerly 77e8985bdd]]
Former-commit-id: b95dc8cf8203e0355bb74fbd1477f87572b22689 [formerly 7bcee86aa2]
Former-commit-id: 5a3c7d3510
|
2014-09-29 11:55:16 -04:00 |
|
Ben Steffensmeier
|
f91216c747
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: a0d9cbede4 [formerly 6090625040] [formerly f92d021e96] [formerly a0d9cbede4 [formerly 6090625040] [formerly f92d021e96] [formerly 5b10ac2f36 [formerly f92d021e96 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]]]
Former-commit-id: 5b10ac2f36
Former-commit-id: 7af0ea9a67 [formerly 0724aa4e71] [formerly c2fe7f41a12299fdb484361788b79338e9ad2fb8 [formerly 107ccbf332]]
Former-commit-id: dc765b86dda41ab7f5eb30a55c9560bd57a0313f [formerly fc49d0bd55]
Former-commit-id: a69ec7c7af
|
2014-09-29 10:49:14 -05:00 |
|
Brian.Dyke
|
ab1f21c096
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: fac7a6aaa1 [formerly fce029653d] [formerly 0a497fc015] [formerly fac7a6aaa1 [formerly fce029653d] [formerly 0a497fc015] [formerly 46af1d0857 [formerly 0a497fc015 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]]]
Former-commit-id: 46af1d0857
Former-commit-id: ad3338e07f [formerly 886c1b7e3d] [formerly 9fc151f40941f9cab99d6eb050662408c5746324 [formerly 85676ff532]]
Former-commit-id: 0acefdbae8bda17deeb120ade9ca40a2e782cfaa [formerly 4d5f7db303]
Former-commit-id: 23450210b1
|
2014-09-29 11:20:57 -04:00 |
|
Sean.Webb
|
9d0e79bb1d
|
ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225
Former-commit-id: d3df1699db [formerly 224cddfe9b] [formerly 02e187a609] [formerly d3df1699db [formerly 224cddfe9b] [formerly 02e187a609] [formerly 600b75bd9f [formerly 02e187a609 [formerly c2af0284e9146dff8431ecd4f6ce88437ea83d9f]]]]
Former-commit-id: 600b75bd9f
Former-commit-id: 9c5957ef9f [formerly 1538817a38] [formerly f41e6444ab2ff3f5348a13f52e0f8be3af16c39c [formerly 293f860e93]]
Former-commit-id: e39674a87d4139148f14864f620545df8022ec71 [formerly f80a90d69f]
Former-commit-id: e45ec5cac9
|
2014-09-29 10:24:04 -04:00 |
|
Sean.Webb
|
89aa38db4a
|
ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683
Former-commit-id: 86382f5396 [formerly 6840d55343] [formerly 0738a41cbf] [formerly 86382f5396 [formerly 6840d55343] [formerly 0738a41cbf] [formerly 78f83fa594 [formerly 0738a41cbf [formerly 4faea9724adf17d0bec7f013bafc7f8dd2f7499e]]]]
Former-commit-id: 78f83fa594
Former-commit-id: 88580b8666 [formerly d70bc9fd9f] [formerly 7d13704772f862b4d8ca1264bf50de7ba0cbcd2d [formerly 197908686e]]
Former-commit-id: 079aaf5290e12bd890cc6e5d9fb1b9599c781840 [formerly c69f833921]
Former-commit-id: b7bae10212
|
2014-09-29 08:21:00 -04:00 |
|
mjames-upc
|
f8d3334985
|
build updates
Former-commit-id: a38a3b112e
|
2014-09-26 17:32:27 -06:00 |
|
Sean.Webb
|
6f25dd644f
|
ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5
Former-commit-id: b186a8e714 [formerly eb959d100a] [formerly 628ab54d68] [formerly b186a8e714 [formerly eb959d100a] [formerly 628ab54d68] [formerly 7d75d994c1 [formerly 628ab54d68 [formerly d59054c870fee17076aec22cd683ef1586a153da]]]]
Former-commit-id: 7d75d994c1
Former-commit-id: b8d4676a9d [formerly 9b63e571a7] [formerly d1d9f82966b42c43a0e84a2a3cb4b7703be092c9 [formerly 039619264f]]
Former-commit-id: fe4b07e604c1f035cc4a768f1adcaba533724766 [formerly 16b034a9e1]
Former-commit-id: dfdd922054
|
2014-09-26 10:49:37 -04:00 |
|
Brian.Dyke
|
b8b9d3105b
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: 6dafb062e9 [formerly b49b13f77e] [formerly 4b418918d4] [formerly 6dafb062e9 [formerly b49b13f77e] [formerly 4b418918d4] [formerly 87fa32d2d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: e16e6e5a2a [formerly cf8f88a5b3] [formerly cd9613c4078591bf28ad1064690bfbbbf551cbaa [formerly 1f09dad9e9]]
Former-commit-id: c0bfed574e2fa14299c865bac77af847704ef3c7 [formerly 8997f79ae4]
Former-commit-id: c22973f909
|
2014-09-24 11:05:37 -04:00 |
|
Sean.Webb
|
8fafbd5864
|
ASM #16761 - Fixed typo on variable character
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37
Former-commit-id: 8c41cb256d [formerly be3bb99abe] [formerly 00479a436d] [formerly 8c41cb256d [formerly be3bb99abe] [formerly 00479a436d] [formerly a9dddb44ce [formerly 00479a436d [formerly 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36]]]]
Former-commit-id: a9dddb44ce
Former-commit-id: dd5d61e33d [formerly 8c2044b91e] [formerly 1283a5fbd8fbcf7377715f639509217bd8db178f [formerly df7e6a9ad2]]
Former-commit-id: 511a2d6a81fe2234c359be57d267eadde6fbc04b [formerly 9f22c26d38]
Former-commit-id: 2f0e866285
|
2014-09-22 14:10:28 -04:00 |
|
Sean.Webb
|
4590cd4f4b
|
ASM #16761 - Fixed typo on variable character
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2
Former-commit-id: c32fde89f9 [formerly 07589bbdda] [formerly 47aef24f6f] [formerly c32fde89f9 [formerly 07589bbdda] [formerly 47aef24f6f] [formerly 4c936b9bc8 [formerly 47aef24f6f [formerly 721bead655f9a384ea12444617774b7ef404feb0]]]]
Former-commit-id: 4c936b9bc8
Former-commit-id: d2b3641bc8 [formerly 79431d7f1d] [formerly 83b31eab4d2587b3082902561edec8cec766b707 [formerly 56b09560ff]]
Former-commit-id: 5bf69c0782b13d23d3c5261a5a8aea4cf2b7f58a [formerly 7da8b68a22]
Former-commit-id: dcbb4f82f9
|
2014-09-22 07:18:21 -04:00 |
|
mjames-upc
|
6eccee8c6f
|
datadelivery plugin putback for 14.2.1-16n13
Former-commit-id: 79c1e489f9
|
2014-09-19 14:51:51 -06:00 |
|
mjames-upc
|
05c257b910
|
fix for /awips2/cave root perms added to Installer.cave-feature/component.spec
Former-commit-id: 12b9bbe24d
|
2014-09-19 14:29:02 -06:00 |
|
Sean.Webb
|
050af275c7
|
ASM #16761 - Fixed typo on variable character
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275
Former-commit-id: e3ad9053d7 [formerly 502f7520a7] [formerly 4368f4650b] [formerly e3ad9053d7 [formerly 502f7520a7] [formerly 4368f4650b] [formerly e0abd14986 [formerly 4368f4650b [formerly 5c541f50dcc68a856e8c81bff8577334abf1ff75]]]]
Former-commit-id: e0abd14986
Former-commit-id: 6734ed0a24 [formerly ddcc0fa20a] [formerly 3c6f69f29e4f9f9da55dc92943f38d19a2561e69 [formerly 23ec020b8d]]
Former-commit-id: 433e63ebca5e54341033773da1f756c4a02e0d17 [formerly eb5a76cfe8]
Former-commit-id: d49f49f805
|
2014-09-19 13:43:45 -04:00 |
|
Steve Harris
|
b316e73f24
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: e3a7796362 [formerly da530db540] [formerly 091555cf10] [formerly e3a7796362 [formerly da530db540] [formerly 091555cf10] [formerly 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]]
Former-commit-id: 4c56844e29
Former-commit-id: a1bf8ecdb1 [formerly 84a98ec4ca] [formerly 275a024694cc566f868a949d844ab91490e424f6 [formerly 214b48dcb8]]
Former-commit-id: 9adb015794435a13e656ce09cd891bfd9e4d53db [formerly fdc523a026]
Former-commit-id: f4ea796cea
|
2014-09-19 10:28:57 -05:00 |
|
Sean.Webb
|
1c74767e93
|
ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b
Former-commit-id: c061f7b1a0 [formerly c90c45f303] [formerly b0b01694f7] [formerly c061f7b1a0 [formerly c90c45f303] [formerly b0b01694f7] [formerly 6ffb17540e [formerly b0b01694f7 [formerly 031c41d4f7801c8a5127cf007358856bf771593a]]]]
Former-commit-id: 6ffb17540e
Former-commit-id: 28d64b103e [formerly f2e207e86e] [formerly cd684d9da149567c3e25ae1ec02c6dba3ad9ab95 [formerly f808f0840d]]
Former-commit-id: 4e828548865f894bac34d45562f6859074140db6 [formerly a023244a62]
Former-commit-id: 1b848836ce
|
2014-09-19 09:29:31 -04:00 |
|
Sean.Webb
|
788834162c
|
ASM #16761 - Added retrans code updates from ISG
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c
Former-commit-id: 90fbb6bf28 [formerly 7f898635f9] [formerly 5c84cadaf6] [formerly 90fbb6bf28 [formerly 7f898635f9] [formerly 5c84cadaf6] [formerly 51380a2363 [formerly 5c84cadaf6 [formerly 165b9a9b3481b3fa1d31b771eead03180430be59]]]]
Former-commit-id: 51380a2363
Former-commit-id: 620380c79d [formerly a651c7ea69] [formerly 4e6bbc221847b4a3a5b6046d9f84f9c01130927a [formerly 10f14f8032]]
Former-commit-id: 252796d7bbfccbfce225e3fbb59de5cc643dd6b8 [formerly ded5ad2e48]
Former-commit-id: 4fdd58193c
|
2014-09-19 07:25:18 -04:00 |
|
Sean.Webb
|
75bc66ecfb
|
ASM #16761 - Updated ldm spec to add retrans
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229
Former-commit-id: 57553e3c5a [formerly b959842361] [formerly 35bfd8269c] [formerly 57553e3c5a [formerly b959842361] [formerly 35bfd8269c] [formerly 4c36280560 [formerly 35bfd8269c [formerly bb9d431a842511b0081660224f3ddefd947f76fd]]]]
Former-commit-id: 4c36280560
Former-commit-id: 622231e99f [formerly b625f2067a] [formerly bfb3fdfda5d267aca3d541fa86f2aee946e40185 [formerly 827386e60d]]
Former-commit-id: c06ddd91eb8b18b1557f00bc050d561a2e5db5c8 [formerly 9058ab3282]
Former-commit-id: 7268c9b042
|
2014-09-18 09:33:47 -04:00 |
|
mjames-upc
|
336cc2bcd5
|
edex manager updated to check setup.env for localhost *every* time
Former-commit-id: 02c12d47bd
|
2014-09-17 15:38:31 -06:00 |
|
Stephen Gilbert
|
9d6570b9f5
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: aa11ac6e09 [formerly e7d21b0293] [formerly 5bf2ed644a] [formerly aa11ac6e09 [formerly e7d21b0293] [formerly 5bf2ed644a] [formerly 440bddda4b [formerly 5bf2ed644a [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]]]]
Former-commit-id: 440bddda4b
Former-commit-id: d9a222f1ef [formerly 1ceed41334] [formerly 0680c0d2a7310de845600fb7564e790bfd925534 [formerly eee81971cc]]
Former-commit-id: 468aa5036ea727433d05f2dfe4b23fee88875480 [formerly 3106a4006c]
Former-commit-id: 99796454d2
|
2014-09-15 13:20:34 -04:00 |
|
Sean.Webb
|
dc158de44d
|
ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib005b9e9af0979d4aa1463e5555fd7b42c7fcc89
Former-commit-id: 4b10cf2f9f [formerly 268db31231] [formerly c805e132bd] [formerly 4b10cf2f9f [formerly 268db31231] [formerly c805e132bd] [formerly 5918cb05c1 [formerly c805e132bd [formerly f07bb36b5f5e01000345a37719e43cb2df4ea7d8]]]]
Former-commit-id: 5918cb05c1
Former-commit-id: 519ea8fcc7 [formerly 55190a347f] [formerly a053c76757b4171b24e63c33b3571659f5309b58 [formerly 213208cbf2]]
Former-commit-id: 599092cbdfc728368ca6d2520284aa5bd41b7a3a [formerly b36a1fdde0]
Former-commit-id: ff50aaf81d
|
2014-09-11 15:13:58 -04:00 |
|
Sean.Webb
|
95cc346e3f
|
ASM #16720 - Updated to ldm 6.12.6
Change-Id: I39f4a529c18995e2b400afbaf0b36fbe7d30d001
Former-commit-id: a59dce026a [formerly dec97cd06f] [formerly 928c334c03] [formerly a59dce026a [formerly dec97cd06f] [formerly 928c334c03] [formerly a6c15ca070 [formerly 928c334c03 [formerly fb95ea372530d699c4681cf8ec9e3abce23716c1]]]]
Former-commit-id: a6c15ca070
Former-commit-id: 760661ee73 [formerly d1614ae327] [formerly cf7da60d3066e6b91203dcc0dc39c56cff325666 [formerly 6fa9e92a8c]]
Former-commit-id: 8a7c2071b5f15c57de7f1dc6c604ebc213b7c50d [formerly 6299e7382e]
Former-commit-id: 0d1375ba3d
|
2014-09-11 14:18:50 -04:00 |
|
Sean.Webb
|
72ca384247
|
ASM #16720 - Updated to ldm 6.12.6
Change-Id: Icf050791541832b370f7d8ceb7a423b500a62d51
Former-commit-id: c2e613e9f1 [formerly eb5418a3bb] [formerly dfc004e1f0] [formerly c2e613e9f1 [formerly eb5418a3bb] [formerly dfc004e1f0] [formerly 0e72b63663 [formerly dfc004e1f0 [formerly 8b1b91c79fa7e59610e21f11af3babaf120859e4]]]]
Former-commit-id: 0e72b63663
Former-commit-id: 7a31d0ea28 [formerly e186b2723d] [formerly 1e51b8d6e3ce391ff3127b0380a070f8ea54d789 [formerly 991ea6c13b]]
Former-commit-id: 9d48fc8d039297aa30f20737d9adebe622f7224f [formerly f98fbd8e99]
Former-commit-id: 5fe337b6bf
|
2014-09-11 13:39:17 -04:00 |
|
Stephen Gilbert
|
630efbf2f9
|
Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
cave/build/cave/customTargets.xml
edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties
Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6
Former-commit-id: d98c1adc91 [formerly 2406f0786f] [formerly 561b751e58] [formerly d98c1adc91 [formerly 2406f0786f] [formerly 561b751e58] [formerly 662436c2d5 [formerly 561b751e58 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]]]
Former-commit-id: 662436c2d5
Former-commit-id: c3e1eebd6d [formerly 3251e256c6] [formerly 4940723817b19e437897ef6ec6d862340b0a86f7 [formerly a631e61fe5]]
Former-commit-id: 3248a201641e504c0b9e17abd8322cce5f5a0486 [formerly bbabe5d087]
Former-commit-id: 2679b9ef8d
|
2014-09-11 11:14:33 -04:00 |
|
mjames-upc
|
badf695f7d
|
UPC build updates
Former-commit-id: 3c934c7e2d
|
2014-09-10 15:10:37 -06:00 |
|
mjames-upc
|
86c0cd38e4
|
awips2-edex-upc 14.2.1-16n2 update add EDEX services to startup with chkconfig
Former-commit-id: 215ffb0840
|
2014-09-10 15:09:10 -06:00 |
|
mjames-upc
|
25eb7e0b69
|
LDM updates: data_store file/path names changed to avoid unintended subdirs in grib2 tree.
Former-commit-id: 8d2853c57c
|
2014-09-10 15:07:18 -06:00 |
|
mjames-upc
|
3b8057dd93
|
default EDEX localization changed to BOU
Former-commit-id: ee08b6fdcd
|
2014-09-10 14:53:47 -06:00 |
|
Sean.Webb
|
854c00cab3
|
ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib4c4689eb32f298b8be8782d878c243689608f6a
Former-commit-id: 4850be3f96 [formerly bc6f7cfa3f] [formerly db156a51de] [formerly 4850be3f96 [formerly bc6f7cfa3f] [formerly db156a51de] [formerly 71d128a180 [formerly db156a51de [formerly ded6663441d8b916ad5b45f2668feac431e84bce]]]]
Former-commit-id: 71d128a180
Former-commit-id: 314694f6fb [formerly ce7bae10ea] [formerly b7acedd41364c684cc15e350507c87281fc5b316 [formerly 2683f36e09]]
Former-commit-id: aad85b79c2b5ba889033b2d1b2d83fd6cf630f19 [formerly d03c5a03fc]
Former-commit-id: b5b7f5622b
|
2014-09-10 14:48:19 -04:00 |
|
Brian.Dyke
|
0c715b7439
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: a344be95c8 [formerly 5415a4939a] [formerly 858b91d677] [formerly a344be95c8 [formerly 5415a4939a] [formerly 858b91d677] [formerly af477df90e [formerly 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]]]
Former-commit-id: af477df90e
Former-commit-id: 4582533601 [formerly dde3efc567] [formerly f892d9608dc1fb65163dac3714b16398a7d89022 [formerly 6c4b121752]]
Former-commit-id: 2c8a415a8d01954bd8f0e11fa551974a70c7759e [formerly 66c4758f2d]
Former-commit-id: b42aba7839
|
2014-09-08 14:54:16 -04:00 |
|
Steve Harris
|
3c8bfc8160
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]
Former-commit-id: 5d58625abc
Former-commit-id: 10070d2762 [formerly 66b485c000] [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54 [formerly d984dd538f]]
Former-commit-id: ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4 [formerly e681e0a457]
Former-commit-id: ecf26b3ac5
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
2da6c7b93b
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1 [formerly f90649d7e7] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda]
Former-commit-id: 7e4ab705cc
|
2014-08-27 11:19:19 -04:00 |
|