Fay.Liang
|
142fa67a23
|
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: a9dd5fcc63 [formerly f94af6d720] [formerly 429e0abfd6] [formerly 429e0abfd6 [formerly ff74566cda]] [formerly a9dd5fcc63 [formerly f94af6d720] [formerly 429e0abfd6] [formerly 429e0abfd6 [formerly ff74566cda]] [formerly 66dd6987a1 [formerly 429e0abfd6 [formerly ff74566cda] [formerly 66dd6987a1 [formerly c1bcd2a0db42c30d447a54ed185fc33d875628b3]]]]]
Former-commit-id: 66dd6987a1
Former-commit-id: b9f5bb42ed [formerly bf0312855a] [formerly 255948188a] [formerly 115aaf10606e32d9ef8cb4735645ae19a615e019 [formerly b851b8b2a24de3c839b4cc769ceca23215f76591] [formerly 255948188a [formerly bd5c416c7c]]]
Former-commit-id: c502b2e199ecc33a6dc2a4bf5ef6fb95bdc87dbd [formerly 09d64471d4d5a7394c410a319f432b1c6219af19] [formerly 1a618a383b [formerly 29fa1f12d1]]
Former-commit-id: 1a618a383b
Former-commit-id: 6460c0fed5
|
2015-02-24 14:58:28 -05:00 |
|
Jingtao Deng
|
d899ac355f
|
VLab Issue #6488 - DR17123 Hydro HPE bias_source field in HPERadarResult table needs NO BIAS for some products; fixes #6488
Change-Id: I8c33b5e39222c13d2d3c1143d17ba77a06f6f877
Former-commit-id: 8747a01686 [formerly 683b558d25] [formerly 812fc2dc49] [formerly 812fc2dc49 [formerly bc8875c276]] [formerly 8747a01686 [formerly 683b558d25] [formerly 812fc2dc49] [formerly 812fc2dc49 [formerly bc8875c276]] [formerly 5756c660b4 [formerly 812fc2dc49 [formerly bc8875c276] [formerly 5756c660b4 [formerly d8f55d811a11bdb76f69dc7a5ee7cd656c8e63fe]]]]]
Former-commit-id: 5756c660b4
Former-commit-id: 4b5a9f6feb [formerly f131c4e662] [formerly 452cf666c9] [formerly def302743b97be40f491a96c0196cbd04b267913 [formerly 5839f437bc175a5dc6f34b7f4a12d2513703747c] [formerly 452cf666c9 [formerly a5954a12a0]]]
Former-commit-id: e49da781085aefda2d972954e86cf33444cc7f87 [formerly bd31b53e75136cbd39a123ff512cf1d120f26b8b] [formerly 73dbc66946 [formerly 7c41fd4916]]
Former-commit-id: 538f9e6956e1300efdb7e208d34183ebda498bb9 [formerly 73dbc66946]
Former-commit-id: aa84b95b2f
|
2015-02-18 13:53:36 -05:00 |
|
Shawn.Hooper
|
56ca9ebd84
|
ASM #14246 - Check-in updated transmit_rfc_qpe script
Change-Id: I26751d39d2b31a345276da722c7a25a9ff8f9508
Former-commit-id: f42c137579 [formerly 77ae8677e4] [formerly a6a840f3c8] [formerly a6a840f3c8 [formerly 0ba143cc43]] [formerly f42c137579 [formerly 77ae8677e4] [formerly a6a840f3c8] [formerly a6a840f3c8 [formerly 0ba143cc43]] [formerly 3c3b69809d [formerly a6a840f3c8 [formerly 0ba143cc43] [formerly 3c3b69809d [formerly 72dd2f411e10e1eb6a934adf05d7df179b570ded]]]]]
Former-commit-id: 3c3b69809d
Former-commit-id: 779426f9aa [formerly ad9630134e] [formerly 91cbf5e2da] [formerly db670d6fcd6098d0a5ac1aa03e2f0ac982ef2e60 [formerly e85c832fb1634edb90d5121038f2ab2a50a31b76] [formerly 91cbf5e2da [formerly 41ebbc98d4]]]
Former-commit-id: 19dd51afa94e9abaa25f3a498772b9fcd47d4090 [formerly 0794da6025723d3e5c15568bfbd663cac45eba12] [formerly 89ab24bc32 [formerly 97de46bbb8]]
Former-commit-id: 89ab24bc32
Former-commit-id: b2ac91adb7
|
2015-02-11 13:55:20 -05:00 |
|
Shawn.Hooper
|
cbd2a1ca8a
|
ASM #16804 - Check in the required library files
Change-Id: Ib84d554ef4723072f8272327b7d00a737ba1405a
Former-commit-id: 4fb2cc4a75 [formerly 9f7f129edb] [formerly 8351eb7bdf] [formerly 8351eb7bdf [formerly 6573bd2672]] [formerly 4fb2cc4a75 [formerly 9f7f129edb] [formerly 8351eb7bdf] [formerly 8351eb7bdf [formerly 6573bd2672]] [formerly ca8b043aed [formerly 8351eb7bdf [formerly 6573bd2672] [formerly ca8b043aed [formerly 22fc7ef208aaef87d2ef366f9ae8c0840379139c]]]]]
Former-commit-id: ca8b043aed
Former-commit-id: f69c1366e2 [formerly b500ce7bbd] [formerly 065df6c8d6] [formerly c20178711569724b9d46bb86c6fc4f96e0147eaf [formerly 2fc00ddf720a78f6c9fe0ad4d1939fd5ca12ef78] [formerly 065df6c8d6 [formerly 1dc0ff9b6d]]]
Former-commit-id: cb39329555165b7d681dc86198cd24ba9817af57 [formerly e238f488512663b89cc375ed2ce3307025a03e2d] [formerly 0b748e6638 [formerly 0b183167df]]
Former-commit-id: 0b748e6638
Former-commit-id: 2ebde7e2d3
|
2015-02-11 12:40:33 -05:00 |
|
Shawn.Hooper
|
5cdd0524c0
|
ASM #16969 - Update jdk tarball with correct version
Change-Id: I1a6a445159f39168dc070783548d443a82225bd3
Former-commit-id: 9d7d435c8d [formerly bf7cc8ec75] [formerly 9114790e29] [formerly 9114790e29 [formerly fa40885eb7]] [formerly 9d7d435c8d [formerly bf7cc8ec75] [formerly 9114790e29] [formerly 9114790e29 [formerly fa40885eb7]] [formerly 00d89c9b8d [formerly 9114790e29 [formerly fa40885eb7] [formerly 00d89c9b8d [formerly 623724f2920280470ef0f60ff4c263754917591e]]]]]
Former-commit-id: 00d89c9b8d
Former-commit-id: 25ad6a6afe [formerly 6103776310] [formerly 556fe8009c] [formerly 46b187d3cbecb5d814b39846c16d94a260872385 [formerly c21d9a5956d63a785ddba8b60f3c6972243bc0d7] [formerly 556fe8009c [formerly 916e5b294f]]]
Former-commit-id: b9a6d452071e6a7cb1962b29cd297154ff900619 [formerly 9b7bf264674cde48bf39d34eb38e14e31be4426b] [formerly b764aec9a2 [formerly 7fbd6c2c6e]]
Former-commit-id: b764aec9a2
Former-commit-id: 3a3282ef6a
|
2015-01-29 14:23:23 -05:00 |
|
Shawn.Hooper
|
0c2a18ace5
|
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 58afdb2cc2 [formerly eefaa49d44] [formerly 7839dab5e6] [formerly 7839dab5e6 [formerly 0bc501bd4c]] [formerly 58afdb2cc2 [formerly eefaa49d44] [formerly 7839dab5e6] [formerly 7839dab5e6 [formerly 0bc501bd4c]] [formerly a757b55446 [formerly 7839dab5e6 [formerly 0bc501bd4c] [formerly a757b55446 [formerly d53c809149da23fcae51138cc45c57aecd641794]]]]]
Former-commit-id: a757b55446
Former-commit-id: 901c5da06b [formerly ef1b152502] [formerly e110ee143a] [formerly 3e05f3b81aa9e6464656b3cacad81a4000cad559 [formerly 846a085e02ef123cf22a20cfcdcee3365bcca4dd] [formerly e110ee143a [formerly 6cf71bae0e]]]
Former-commit-id: 86beeedc1adb004f25ca4851b547847456c1c3d2 [formerly 58d82a3f83ab66bcc80a9c33364bdb69623a3f39] [formerly c1555d3133 [formerly 953b71a3f8]]
Former-commit-id: 393a4ad2e205a263525b8c58ff6207458cdbca14 [formerly c1555d3133]
Former-commit-id: 9f0698b631
|
2015-01-22 16:05:41 -05:00 |
|
Fay.Liang
|
660e749630
|
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1e3dff2da2 [formerly 19a29da5de] [formerly 6b77894bd0] [formerly 6b77894bd0 [formerly c6bd5d7675]] [formerly 1e3dff2da2 [formerly 19a29da5de] [formerly 6b77894bd0] [formerly 6b77894bd0 [formerly c6bd5d7675]] [formerly eed6737801 [formerly 6b77894bd0 [formerly c6bd5d7675] [formerly eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]]]
Former-commit-id: eed6737801
Former-commit-id: ce29afab3c [formerly 23ba9f4154] [formerly f3ecae8573] [formerly 3e0b1b79e56696bcec54e0a049ea397445611958 [formerly 69382d354f0cba941ad1b60d73cca2d121eb949e] [formerly f3ecae8573 [formerly 5cc8e5b4af]]]
Former-commit-id: 3408395492fc2cd332f0231e3972dedb14c881df [formerly cd3c370873d18a2ca3801fd2f83aa4f8b35fe06e] [formerly 1e9024ede9 [formerly 06ac6b396e]]
Former-commit-id: 1e9024ede9
Former-commit-id: bccf70f0bd
|
2015-01-12 13:03:31 -05:00 |
|
steve.naples
|
855120453c
|
ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions.
Change-Id: I23a4dae2aef9bdf71848c1e9a3338e1bddc39205
Former-commit-id: dabeae2b21 [formerly 4021a11f2c] [formerly 7f8716267f] [formerly 7f8716267f [formerly f53fb9c404]] [formerly dabeae2b21 [formerly 4021a11f2c] [formerly 7f8716267f] [formerly 7f8716267f [formerly f53fb9c404]] [formerly bdbdc68b2a [formerly 7f8716267f [formerly f53fb9c404] [formerly bdbdc68b2a [formerly 28f92f6b49d286f7c470bda6184d12b7882bb768]]]]]
Former-commit-id: bdbdc68b2a
Former-commit-id: 612cc9cb07 [formerly fcccb78e21] [formerly 4630ed499f] [formerly 76352916af72f77c9b7b09a4cc0f69e76eb867d7 [formerly 70562ffdaf8a720546e517d2a7a02697c3cffa02] [formerly 4630ed499f [formerly b89b70f22d]]]
Former-commit-id: 6015b7374713b7b99c2a0426b67466ff47818852 [formerly a9f8dc909b61156c6084a66ef347cfd8c5d98a65] [formerly bd1539e397 [formerly 61c4126aaf]]
Former-commit-id: 0c2c1268829142bd6c3e47e354fbf111f8da739f [formerly bd1539e397]
Former-commit-id: 1d0b327b72
|
2015-01-06 19:49:03 +00:00 |
|
Chip Gobs
|
9685bac83a
|
VLab Issue #5615 MPE:Null DAA Radar Product Handling; fixes #5615
Former-commit-id: 6e8e7369f7 [formerly 0ce3a04b6b] [formerly 34006d87ca] [formerly 34006d87ca [formerly 5c76a59cc1]] [formerly 6e8e7369f7 [formerly 0ce3a04b6b] [formerly 34006d87ca] [formerly 34006d87ca [formerly 5c76a59cc1]] [formerly d6619ab0e0 [formerly 34006d87ca [formerly 5c76a59cc1] [formerly d6619ab0e0 [formerly ef877ed41166503b844c81ac7e3108421ff872ec]]]]]
Former-commit-id: d6619ab0e0
Former-commit-id: 903bda3f04 [formerly 65ebbd66b6] [formerly 2f24c94bc1] [formerly bce6cd5f748dd88ee90557157750935215022b37 [formerly c9fdea8b3568581e2fed37e7e83cfaef5d6feb60] [formerly 2f24c94bc1 [formerly e94adef7b0]]]
Former-commit-id: d62dd9b53e95d86ecbd0320512adc15be5d4cb87 [formerly f431afdfcdad9bc5c25c5b34f0262a68eb207cd1] [formerly 258b6f2ed6 [formerly 66ae7f3819]]
Former-commit-id: 258b6f2ed6
Former-commit-id: 274d2f1ce1
|
2014-12-12 13:12:48 -05:00 |
|
David Lovely
|
d97047e8c8
|
Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470
Former-commit-id: c8d020fa6f [formerly dca2a23b04] [formerly b32d54c7f9] [formerly b32d54c7f9 [formerly 625e83c445]] [formerly c8d020fa6f [formerly dca2a23b04] [formerly b32d54c7f9] [formerly b32d54c7f9 [formerly 625e83c445]] [formerly 1a191cac55 [formerly b32d54c7f9 [formerly 625e83c445] [formerly 1a191cac55 [formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]]]]]
Former-commit-id: 1a191cac55
Former-commit-id: c26079c8fa [formerly 7c2eea2dd1] [formerly 3b7d20e623] [formerly 5b62e51921a3004da1cb5000c8ea978983219f84 [formerly cedbebb180b50bca15b89397222ee077a0fe89d0] [formerly 3b7d20e623 [formerly b9451471ac]]]
Former-commit-id: 79841ab3ba0627cf198a21e3f962a6dc3e580328 [formerly 01568b110423cde499e076cbfd07238836c16bc0] [formerly 0b76e0a9b6 [formerly 1b3334a183]]
Former-commit-id: 531aca9751af4e961663fc28b95e2b8c453af862 [formerly 0b76e0a9b6]
Former-commit-id: 1401310851
|
2014-11-10 08:27:28 -06:00 |
|
Nate Jensen
|
81ea8bced2
|
Omaha #3676 harden numpy array to java array conversions to work with
newer versions of python/numpy and not crash when heap cannot be
allocated
Change-Id: I2a83f6e2720de331188ae5b42dd8c86b14900288
Former-commit-id: ba6bfb5d44 [formerly 08b6622cec] [formerly 852fe79de3] [formerly 852fe79de3 [formerly 433e8b6fc1]] [formerly ba6bfb5d44 [formerly 08b6622cec] [formerly 852fe79de3] [formerly 852fe79de3 [formerly 433e8b6fc1]] [formerly b23d42f561 [formerly 852fe79de3 [formerly 433e8b6fc1] [formerly b23d42f561 [formerly 67630fce01ecbd64a760211820af5b5eaff4cade]]]]]
Former-commit-id: b23d42f561
Former-commit-id: 994318b8c3 [formerly 66a1fd1d05] [formerly d2156230f3] [formerly 59e91f51416a0967c11e0f558b9e4b9eb6f02f88 [formerly fa936e390fcdb29318649dd9a0ff0d548d0a3b1d] [formerly d2156230f3 [formerly 0a42a053af]]]
Former-commit-id: 2dcb93c213899ac19bb6b52bead9963144fdd21e [formerly 130afdad1004a03879b993036570260a88d94700] [formerly f82d929130 [formerly 60b037dd49]]
Former-commit-id: f82d929130
Former-commit-id: af26acde6f
|
2014-10-15 09:02:07 -05:00 |
|
Steve Harris
|
aa501d6e1b
|
Omaha #3300 - Added another compiled nativeLib binary to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Former-commit-id: 29906ebeeb [formerly 4443c18763] [formerly 9891be174d] [formerly 9891be174d [formerly e09f3ab040]] [formerly 29906ebeeb [formerly 4443c18763] [formerly 9891be174d] [formerly 9891be174d [formerly e09f3ab040]] [formerly 6cf62253a8 [formerly 9891be174d [formerly e09f3ab040] [formerly 6cf62253a8 [formerly 230f4413d69d25ca4e8cafc23ec80b3bb79fea63]]]]]
Former-commit-id: 6cf62253a8
Former-commit-id: 0bd3cca4ea [formerly 8b600d9f2a] [formerly d1c57e9e29] [formerly 717bb8c57cad347bed4bc576fa475129f5bf077a [formerly 30007aab674ac35d523aaa25b526b51811127bd1] [formerly d1c57e9e29 [formerly 653369048a]]]
Former-commit-id: 0bc2e3fa135c3731a9c44b7af7b7b1a01f059a5d [formerly 3db1c34b13477244926bf45b3295ef4c73889877] [formerly 47b52b025a [formerly 2c07c98fc7]]
Former-commit-id: 47b52b025a
Former-commit-id: 7ed1664eb9
|
2014-09-23 15:30:55 -05:00 |
|
Steve Harris
|
b36fa71282
|
Omaha #3300 - Added compiled nativeLib binaries to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Former-commit-id: 32d1795dd8 [formerly 0a839bd50a] [formerly f29bef4f34] [formerly f29bef4f34 [formerly 26155d4251]] [formerly 32d1795dd8 [formerly 0a839bd50a] [formerly f29bef4f34] [formerly f29bef4f34 [formerly 26155d4251]] [formerly c8bee38fc7 [formerly f29bef4f34 [formerly 26155d4251] [formerly c8bee38fc7 [formerly 785a6cb7ef5856e0bc0beb3fcf5657f74934111b]]]]]
Former-commit-id: c8bee38fc7
Former-commit-id: bd5aac22ef [formerly 80da0b9dbb] [formerly a2e1cdf346] [formerly 531f2c97d4b1c131db4f56dfdba2e813186a3ff0 [formerly 4c693c55731d9714b20a8b7df612208d26ec22b0] [formerly a2e1cdf346 [formerly 3cca5caf09]]]
Former-commit-id: 3703a5ff9864e0cfb01e18c1aef116c614684ebb [formerly ef785e780f9a7ca439f15dbd5fac467b861b5d84] [formerly bc71a024da [formerly 363467f328]]
Former-commit-id: bc71a024da
Former-commit-id: 60c4b1abbd
|
2014-09-23 12:02:08 -05:00 |
|
Steve Harris
|
9d807b91e9
|
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: a175b8e7a1 [formerly db4aa1cebe] [formerly 2e2072a963] [formerly 2e2072a963 [formerly 7692e3f21d]] [formerly a175b8e7a1 [formerly db4aa1cebe] [formerly 2e2072a963] [formerly 2e2072a963 [formerly 7692e3f21d]] [formerly b979960b7b [formerly 2e2072a963 [formerly 7692e3f21d] [formerly b979960b7b [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]]]
Former-commit-id: b979960b7b
Former-commit-id: 4bb5dd7860 [formerly 4c7af33eee] [formerly e5f8a8f74f] [formerly 3408726c5d0bfbb6631b9a46bde4c6666f9c2873 [formerly bb2bf4306deda494aadd9b7efdffeebf393b4e15] [formerly e5f8a8f74f [formerly 50d6dccd09]]]
Former-commit-id: 352b97064bf0e8d4761f026b38ffe5ad4f3045aa [formerly 0542ccaca6c476485c13ff1fd290c8c34213e7a0] [formerly d3169a96b0 [formerly f831536854]]
Former-commit-id: d744b591fe05832992fb027c39b747a65467fca5 [formerly d3169a96b0]
Former-commit-id: 07c7b38a12
|
2014-09-23 11:41:10 -05:00 |
|
Brian.Dyke
|
4f4140b9ba
|
VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so
Former-commit-id: 48ff776f0e [formerly 5b36acf3d5] [formerly 9d2eaef5e7] [formerly 9d2eaef5e7 [formerly 546b43dff6]] [formerly 48ff776f0e [formerly 5b36acf3d5] [formerly 9d2eaef5e7] [formerly 9d2eaef5e7 [formerly 546b43dff6]] [formerly 05145d2f0d [formerly 9d2eaef5e7 [formerly 546b43dff6] [formerly 05145d2f0d [formerly 0448deecda7c53ac65bc66bc9751ec0e7f83eee1]]]]]
Former-commit-id: 05145d2f0d
Former-commit-id: 9b3e044569 [formerly 6aa73f47d1] [formerly 75284bdd1b] [formerly c81a7e1f2dc0384c5970be46f988e26f9d50ee67 [formerly d9b47d26d3cd9aa014c6fb2c48603d7bf314e245] [formerly 75284bdd1b [formerly 60a61086d5]]]
Former-commit-id: 532be689c06b32e6c8521fbee2b0ffaa0d49f8c4 [formerly 33bb336064744904936fe8d28c6d356b02890596] [formerly 6f708b2b87 [formerly 5516c71d4e]]
Former-commit-id: 22c95107bc72a4b54136f994aae87bedae4aba40 [formerly 6f708b2b87]
Former-commit-id: a84a4182d1
|
2014-09-17 15:39:57 -04:00 |
|
Chip Gobs
|
c401665913
|
Merge remote-tracking branch 'origin/master_14.3.1' into ohd_14.3.1_v6
Former-commit-id: 4be31cc0ad [formerly fd21e46eb5] [formerly bc743b7bd7] [formerly bc743b7bd7 [formerly 0278dfb45f]] [formerly 4be31cc0ad [formerly fd21e46eb5] [formerly bc743b7bd7] [formerly bc743b7bd7 [formerly 0278dfb45f]] [formerly 51f2d9df8e [formerly bc743b7bd7 [formerly 0278dfb45f] [formerly 51f2d9df8e [formerly 2131a59fecbb9bc01dd395360f7f8dafe6d76b0b]]]]]
Former-commit-id: 51f2d9df8e
Former-commit-id: 4ddcfc24d4 [formerly 09a6d218ec] [formerly ab57f9a631] [formerly fa5c4f1fe9e99e0d432641d114f076282117ae62 [formerly 155218f05082dd882c81b85920d434ac6457113c] [formerly ab57f9a631 [formerly 4ca70c7f7e]]]
Former-commit-id: 132be6de9b3b50013f87204e51a124390581f291 [formerly b665f74facb031ff4a4c84ab562fe45163cfa842] [formerly 589a94588d [formerly fba687dab4]]
Former-commit-id: 589a94588d
Former-commit-id: 31e44a344d
|
2014-09-03 14:48:29 -04:00 |
|
Steve Harris
|
aeef8875da
|
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: e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly 5d58625abc [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]]
Former-commit-id: 5d58625abc
Former-commit-id: bdf54d6c9b [formerly 10070d2762] [formerly 66b485c000] [formerly ae5df07fa69c767a230e2a3c9b71b0100d0048c1 [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54] [formerly 66b485c000 [formerly d984dd538f]]]
Former-commit-id: 529333408e5e144c649cd66c50031cc56795aa1e [formerly ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4] [formerly ecf26b3ac5 [formerly e681e0a457]]
Former-commit-id: e61b05086c2c01b59d4b8382331f85c7ecd4efa2 [formerly ecf26b3ac5]
Former-commit-id: 3c8bfc8160
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
d238fe909f
|
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: f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly aa83bf804f [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]]
Former-commit-id: aa83bf804f
Former-commit-id: a19455a35a [formerly 4a56b6f6e1] [formerly f90649d7e7] [formerly 68463cb724c8468f8978b5fb07a99445cf027313 [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3] [formerly f90649d7e7 [formerly f7f16ff9eb]]]
Former-commit-id: 44ca35c910c7065b51dd3a76485e002ac8fcb63b [formerly 2b5f667a78842762d60c8ab0ba442f22b9229095] [formerly 7e4ab705cc [formerly c0dc594eda]]
Former-commit-id: 1cde9cd7bdfb3330564a42c1fce83730b50bbe4c [formerly 7e4ab705cc]
Former-commit-id: 2da6c7b93b
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
6a99c2269e
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: e6e748f80c [formerly 6402cb7d89] [formerly 2ddc920a4a] [formerly 2ddc920a4a [formerly 325887e605]] [formerly e6e748f80c [formerly 6402cb7d89] [formerly 2ddc920a4a] [formerly 2ddc920a4a [formerly 325887e605]] [formerly dd9d7133d9 [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: b1125b7ead [formerly e348a6abc7] [formerly c8e9153884] [formerly aeb4c05a55d78fcd7c75024d8266f07f6153e495 [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b] [formerly c8e9153884 [formerly 1839b614df]]]
Former-commit-id: 4ebaf1487954a27857fde0b53c4ede7217a27c50 [formerly 85ccff40908964b07fef1c572de049c609434728] [formerly 27372f098c [formerly cd1b914f50]]
Former-commit-id: 27372f098c
Former-commit-id: 272905b186
|
2014-08-22 14:16:22 -04:00 |
|
Slav Korolev
|
e75e96158d
|
Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761
This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly cf682f2787 [formerly f4eec5a328] [formerly 55a1120bdb] [formerly 55a1120bdb [formerly dd9d117f90]] [formerly cf682f2787 [formerly f4eec5a328] [formerly 55a1120bdb] [formerly 55a1120bdb [formerly dd9d117f90]] [formerly e5af41fa86 [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]]]].
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: a9b64e0531 [formerly 7c336276f4] [formerly 1c896cedab] [formerly 1c896cedab [formerly a9bed4c6fd]] [formerly a9b64e0531 [formerly 7c336276f4] [formerly 1c896cedab] [formerly 1c896cedab [formerly a9bed4c6fd]] [formerly a779c786f1 [formerly 1c896cedab [formerly a9bed4c6fd] [formerly a779c786f1 [formerly aee044437492438381db98cc6fd3a917f6c05659]]]]]
Former-commit-id: a779c786f1
Former-commit-id: bcf0550d90 [formerly 14193d9f0d] [formerly d080af879e] [formerly d4b94ac51bd268016bf9d4cca48c43d9d55f4b07 [formerly 03e43cde864d9e501745b3af41e7db422c82dcbe] [formerly d080af879e [formerly 407be3d26f]]]
Former-commit-id: e04085e48440fe8779e5a601710717859a5d2138 [formerly 78f747829f22eb099862b93f26e70021a2f10294] [formerly 9d0e31155f [formerly 99a8258e86]]
Former-commit-id: 9d0e31155f
Former-commit-id: 255c2b2b9e
|
2014-08-19 10:12:36 -05:00 |
|
Loubna.Bousaidi
|
9590617601
|
ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: 26f28304ad [formerly 281f16d700] [formerly afae4700a6] [formerly afae4700a6 [formerly 8c15d1f124]] [formerly 26f28304ad [formerly 281f16d700] [formerly afae4700a6] [formerly afae4700a6 [formerly 8c15d1f124]] [formerly d41e489ced [formerly afae4700a6 [formerly 8c15d1f124] [formerly d41e489ced [formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]]]]]
Former-commit-id: d41e489ced
Former-commit-id: 289439cc25 [formerly ea83b54df2] [formerly d9be7127bc] [formerly 6828187e17fd235e049cd17fba6e8aeb561e9f11 [formerly e79b024b72366d3a4c5251b13e7896757aff0e52] [formerly d9be7127bc [formerly 5cc9b08890]]]
Former-commit-id: 7668bfb275ad7a2ed7399341f20e6319e16b6f65 [formerly b4514916beb24de3adb110ccdeb429cb22202a70] [formerly af004872fd [formerly 65cfa4e033]]
Former-commit-id: af004872fd
Former-commit-id: 54c46422a5
|
2014-08-15 10:54:10 -05:00 |
|
Steve Harris
|
93e4e3d88f
|
Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity."
This reverts commit 5a3f760b6f51d0561dd605388e6b025ebe70e330 [formerly 7ae3ca0bfc] [formerly 2491b176df [formerly 3f61ab53b2] [formerly 50e93daab7] [formerly 50e93daab7 [formerly 978349e517]] [formerly 2491b176df [formerly 3f61ab53b2] [formerly 50e93daab7] [formerly 50e93daab7 [formerly 978349e517]] [formerly 7ae3ca0bfc [formerly 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]]]].
Former-commit-id: cf682f2787 [formerly f4eec5a328] [formerly 55a1120bdb] [formerly 55a1120bdb [formerly dd9d117f90]] [formerly cf682f2787 [formerly f4eec5a328] [formerly 55a1120bdb] [formerly 55a1120bdb [formerly dd9d117f90]] [formerly e5af41fa86 [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]]]
Former-commit-id: e5af41fa86
Former-commit-id: 211dfe14bc [formerly b046c4b4ad] [formerly 8c5cbf7224] [formerly 0cc2270ed6f1739bea30edfea876b307ed6b2223 [formerly 2806a41b23fef93f82278dec46a34078c1150cdb] [formerly 8c5cbf7224 [formerly 0739666ae9]]]
Former-commit-id: 37709e0c6b976a29562e1e3efd72a293b7b9421c [formerly 9d881e40fd73155c6378ecba1ce432d31d7fc5ad] [formerly 106e45a937 [formerly 9ce3fc1803]]
Former-commit-id: 106e45a937
Former-commit-id: aa1af753b1
|
2014-08-12 10:19:12 -05:00 |
|
Slav Korolev
|
3b1f9b3276
|
Issue #2875 - Implemented HFR Surface Current Velocity.
Former-commit-id: 2491b176df [formerly 3f61ab53b2] [formerly 50e93daab7] [formerly 50e93daab7 [formerly 978349e517]] [formerly 2491b176df [formerly 3f61ab53b2] [formerly 50e93daab7] [formerly 50e93daab7 [formerly 978349e517]] [formerly 7ae3ca0bfc [formerly 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]]]
Former-commit-id: 7ae3ca0bfc
Former-commit-id: cc7e5767f8 [formerly 9d4c30c06d] [formerly 4ef0572c2d] [formerly d2c3e8774ce2b6a8913ff5cb7e1d359e2c22751b [formerly 7808ba4d1fc4778ef22c004cae26526a254433ee] [formerly 4ef0572c2d [formerly 14cf56ec46]]]
Former-commit-id: 27136682e51fbc009dfbdda1cafb0473c8227580 [formerly a7d7e80cc38a3703e1840fbb233c45cedd89942a] [formerly 3687b20fe7 [formerly a3e480a756]]
Former-commit-id: 3687b20fe7
Former-commit-id: 8cde8da9e2
|
2014-08-12 09:19:22 -04:00 |
|
Richard Peter
|
329b8139b9
|
Issue #3458 Increase ldm to edexBridge shared memory queue.
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468
Former-commit-id: 4bf6607508 [formerly 1e6502af95] [formerly 01692edc6b] [formerly 01692edc6b [formerly bd2d97dc46]] [formerly 4bf6607508 [formerly 1e6502af95] [formerly 01692edc6b] [formerly 01692edc6b [formerly bd2d97dc46]] [formerly 8374869379 [formerly 01692edc6b [formerly bd2d97dc46] [formerly 8374869379 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]]]]]
Former-commit-id: 8374869379
Former-commit-id: d4fd67e102 [formerly eb60541db3] [formerly fbb7094b60] [formerly 06867ab4c1525fed608f72fe46a076a288e435af [formerly 9a73fc5f58eae211e98112c3ab36c3b2a06bb1de] [formerly fbb7094b60 [formerly e155de7bbc]]]
Former-commit-id: 3d778163b99087072d3f58a17dcca880d3c9d76f [formerly e05c7dad4a8b16c419ffc3befd4bc04d56250181] [formerly 24f06e6666 [formerly 4e7687d442]]
Former-commit-id: 24f06e6666
Former-commit-id: edd8eab06d
|
2014-08-06 10:57:31 -05:00 |
|
Steve Harris
|
949774772e
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.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/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
Former-commit-id: 50461a5ba1 [formerly d606269c5b] [formerly a92dc418c6] [formerly a92dc418c6 [formerly 0fb743ec44]] [formerly 50461a5ba1 [formerly d606269c5b] [formerly a92dc418c6] [formerly a92dc418c6 [formerly 0fb743ec44]] [formerly bf9a0fa5de [formerly a92dc418c6 [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: 92b45da5de [formerly 386dfebe65] [formerly b848e05aa1] [formerly dc33a08694848cdc72e0b1d1b867cfe2d678d9a2 [formerly af44a55101128b715bc6595cfc378e8fcdc2eb3d] [formerly b848e05aa1 [formerly 46fe792d83]]]
Former-commit-id: 06427b5bc2aff39ad0e5efed766e86540571b66b [formerly 5636830e013729a270565af661d066aa2f000390] [formerly a0fdc76880 [formerly 5e2f7a9f74]]
Former-commit-id: a0fdc76880
Former-commit-id: 8bce1903ec
|
2014-08-04 22:20:29 -05:00 |
|
Brian.Dyke
|
472b828903
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
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
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 2053a5f543 [formerly 590e37a8f2] [formerly 301f3094be] [formerly 301f3094be [formerly 9abb02ea8a]] [formerly 2053a5f543 [formerly 590e37a8f2] [formerly 301f3094be] [formerly 301f3094be [formerly 9abb02ea8a]] [formerly 270d2b0ddb [formerly 301f3094be [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: ad18dde2f9 [formerly b9da27608c] [formerly bbe6ec4d50] [formerly 7b87b98fa2a94957c6954d915511a0a608e21564 [formerly 4f6e23e0fe3a5044b75abe6a89c965ab32b19947] [formerly bbe6ec4d50 [formerly 37aacfcb96]]]
Former-commit-id: 5c75db7ea2bea2f6949f1011ac48c5e22863bce5 [formerly ea25ca2fdedff8bbe1c901d0538886147f633e65] [formerly 803ceadaec [formerly b9daa26f7d]]
Former-commit-id: 803ceadaec
Former-commit-id: 1d9494a502
|
2014-08-04 13:10:13 -04:00 |
|
Ying-Lian.Shi
|
c70e59f0c6
|
ASM #15649 - these 5 files are rolled back to 14.1.3
Change-Id: Ifc52168f1faf3984f2a2d72947273686c5a00fd9
Former-commit-id: 6e2a91ecbc [formerly a258d2fe22] [formerly 9dbfbbe0c3] [formerly 9dbfbbe0c3 [formerly 22d46f2658]] [formerly 6e2a91ecbc [formerly a258d2fe22] [formerly 9dbfbbe0c3] [formerly 9dbfbbe0c3 [formerly 22d46f2658]] [formerly 1f6d24a076 [formerly 9dbfbbe0c3 [formerly 22d46f2658] [formerly 1f6d24a076 [formerly ab5a6807a591605e230d4180f1dcf3c2eaa8657f]]]]]
Former-commit-id: 1f6d24a076
Former-commit-id: 387cc946de [formerly 6f4a17363f] [formerly ef8ec0cff0] [formerly 4bdf5f486b046f047e282690f2069ee51766c319 [formerly e7f2c77f7910b963761f0209e7ac972fc6adfa8d] [formerly ef8ec0cff0 [formerly c571da3e89]]]
Former-commit-id: 90d16b1475ab57790f6bf34d4287bd783dc5efdc [formerly c155f99f8b6ea5c68344fe29b4fd38a506591fb6] [formerly a1c024e575 [formerly a0b7830856]]
Former-commit-id: bc1c0557a447ecdce107866c8d454c6d397e4fcc [formerly a1c024e575]
Former-commit-id: 752e386363
|
2014-07-23 12:24:22 +00:00 |
|
Benjamin Phillippe
|
ab45dcf101
|
Omaha #3379 Removing DWR
Former-commit-id: 5c606a44b6 [formerly e613cb932e] [formerly cc9e9b427a] [formerly cc9e9b427a [formerly d110e8428b]] [formerly 5c606a44b6 [formerly e613cb932e] [formerly cc9e9b427a] [formerly cc9e9b427a [formerly d110e8428b]] [formerly 4e1d93abf8 [formerly cc9e9b427a [formerly d110e8428b] [formerly 4e1d93abf8 [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: cc04a23b0a [formerly 63354789de] [formerly 5eea012728] [formerly 33501d62e4cecf73fb4dd9383720c0a85bf8fec5 [formerly c20f089fcf16ae33c66408335723c47e9c63b082] [formerly 5eea012728 [formerly 06e73cd55f]]]
Former-commit-id: cc96e3bd4e3797b6ea402a4e3e55c54091328c71 [formerly 9c31f8986bfae1d5ec15dea29bd1f66a4ab15fd7] [formerly 0c80abcc15 [formerly 11a8186cbc]]
Former-commit-id: a7f64aabfa5c1bfb017d83f3c20796064b42284c [formerly 0c80abcc15]
Former-commit-id: 7b98ae2e01
|
2014-07-11 11:56:44 -05:00 |
|
Greg Armendariz
|
ade88ae021
|
Omaha #3299 - Remove project file and change build reference
Former-commit-id: 99cb27cee0 [formerly c8dcf22c40] [formerly 20f5ccf9f0] [formerly 20f5ccf9f0 [formerly f4063c8162]] [formerly 99cb27cee0 [formerly c8dcf22c40] [formerly 20f5ccf9f0] [formerly 20f5ccf9f0 [formerly f4063c8162]] [formerly 40ad6795df [formerly 20f5ccf9f0 [formerly f4063c8162] [formerly 40ad6795df [formerly c233ad285b9addca8a8be6074b1e2440896d2276]]]]]
Former-commit-id: 40ad6795df
Former-commit-id: beec810f7a [formerly 4829515d8b] [formerly 68846930ee] [formerly f97fd18cb4bfa46d33f249b5d06c6e3a5c55e16c [formerly 59a419b15250da8d89339fae8df0b0dcea68d9f8] [formerly 68846930ee [formerly 44b448738c]]]
Former-commit-id: 62f4e9c76f7bb088628e47d1ca924a7d96bf01fb [formerly f78f6ac73b275f66e33dc7bd717128b06fa613d6] [formerly 941bc791a9 [formerly d26bb8e2c2]]
Former-commit-id: 941bc791a9
Former-commit-id: c3bc9d54a0
|
2014-06-30 14:49:24 -05:00 |
|
Chip Gobs
|
d0e4e90e75
|
VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix.
Change-Id: I950192bc25dd1be78cf77e58f18946c86ac38623
Former-commit-id: 84d9b13418 [formerly 30d80c844b] [formerly 382c7c4edd] [formerly 382c7c4edd [formerly 0e64ccc33a]] [formerly 84d9b13418 [formerly 30d80c844b] [formerly 382c7c4edd] [formerly 382c7c4edd [formerly 0e64ccc33a]] [formerly 83a5ed0e92 [formerly 382c7c4edd [formerly 0e64ccc33a] [formerly 83a5ed0e92 [formerly a948c8cc9ffdd19c26cee8c547984aec114e4221]]]]]
Former-commit-id: 83a5ed0e92
Former-commit-id: f46b969706 [formerly cc219d4b8d] [formerly eca77a2512] [formerly cb5e0c6cdd8eaed0d75980455c58d81dc3750ef1 [formerly 7615e9787ae0bdf4f72c8426b657e8516cecabb9] [formerly eca77a2512 [formerly 1ac4dce21d]]]
Former-commit-id: 79c7fc84f544493a88f6e6ae3f9dd362cb50902c [formerly fcdf2b862d91fc103720b20e002715f5f1d9251d] [formerly af54449116 [formerly 001d7a7796]]
Former-commit-id: af54449116
Former-commit-id: 2e830c25ff
|
2014-06-26 06:47:45 -04:00 |
|
Steve Harris
|
91c48437cf
|
Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Former-commit-id: eece76ad05 [formerly 4d724b6474] [formerly 97843cf58e] [formerly 97843cf58e [formerly 9213369739]] [formerly eece76ad05 [formerly 4d724b6474] [formerly 97843cf58e] [formerly 97843cf58e [formerly 9213369739]] [formerly e1c8ad2611 [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]]]
Former-commit-id: e1c8ad2611
Former-commit-id: 6450c3d6ee [formerly 6cc0c35e76] [formerly d7cd0ac02c] [formerly 1503533d05a69d55df5729868ed86e74147fcedd [formerly 9dc77519d1d40439f9609aa1b8bb1f64c8a1ab8a] [formerly d7cd0ac02c [formerly 362988b9d7]]]
Former-commit-id: c8a2475f45349c68f72a6762c674110a72c5f92a [formerly 54590884305d436b0bff6e041169417a3fab2fbb] [formerly a0d17947a9 [formerly 8270fd8a9f]]
Former-commit-id: 7fa45b27701395fd238cf8765786122a21b0f209 [formerly a0d17947a9]
Former-commit-id: 563cf7b455
|
2014-06-16 08:19:12 -05:00 |
|
Bryan Kowal
|
37e4e76191
|
Omaha #3189 - ensure the PostgreSQL libpq libraries are included in the hydroapps native directory
Former-commit-id: 987d6cb4a1 [formerly f716c82bce] [formerly 1920bf461d] [formerly 1920bf461d [formerly 03d2a8ab7e]] [formerly 987d6cb4a1 [formerly f716c82bce] [formerly 1920bf461d] [formerly 1920bf461d [formerly 03d2a8ab7e]] [formerly 8896dc8a75 [formerly 1920bf461d [formerly 03d2a8ab7e] [formerly 8896dc8a75 [formerly 1da5e7cb5f6d8a6b8e915a8ecb238a0825991afe]]]]]
Former-commit-id: 8896dc8a75
Former-commit-id: 9d6822fd8e [formerly 4a8bafd06f] [formerly 692673ade3] [formerly 1a078bb3e20adafcf82c6b7180562b7c445988e9 [formerly 72d1abfe8fc565c093665727697687b862180af2] [formerly 692673ade3 [formerly 22d4631b55]]]
Former-commit-id: 337279e880352070d74e60f8df0cba3bfbdfb48e [formerly 096ee29408ebba0fda45833935bf9bcf3daf63ed] [formerly ccd09ebb95 [formerly e237c659d0]]
Former-commit-id: ccd09ebb95
Former-commit-id: 0d21df684d
|
2014-06-09 16:20:01 -05:00 |
|
Chip Gobs
|
4335580b8a
|
VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse.
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d
Former-commit-id: fa1969e9c3 [formerly 12f78bef75] [formerly a5c4402f34] [formerly a5c4402f34 [formerly 83ac596f9e]] [formerly fa1969e9c3 [formerly 12f78bef75] [formerly a5c4402f34] [formerly a5c4402f34 [formerly 83ac596f9e]] [formerly 036d1c4d31 [formerly a5c4402f34 [formerly 83ac596f9e] [formerly 036d1c4d31 [formerly 6944361d04e7462f768bb74f00780dc8b8a51225]]]]]
Former-commit-id: 036d1c4d31
Former-commit-id: 38a507cd68 [formerly 1371c8a87c] [formerly 8edb6c28d8] [formerly e9a870ef0793c1d9566b62a90669acd5bb301689 [formerly bb1f30981bdeb43668927256d57f49f733780101] [formerly 8edb6c28d8 [formerly 6fd88e5422]]]
Former-commit-id: 016efcdf2d769f701b57ee9cadd0ebae7dc81195 [formerly 2d45cc91f5762572b6eb6cac1728efefec011528] [formerly 5fa38e2acd [formerly e9c140b3fc]]
Former-commit-id: 761a01f5fb74f94470d0000276eafeaaa462f26d [formerly 5fa38e2acd]
Former-commit-id: c200d537cb
|
2014-06-05 13:37:02 -04:00 |
|
Steve Harris
|
4e67cd63c9
|
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 30490c4931 [formerly 2b95865dec] [formerly 647cd97e29] [formerly 647cd97e29 [formerly 7fec0d039c]] [formerly 30490c4931 [formerly 2b95865dec] [formerly 647cd97e29] [formerly 647cd97e29 [formerly 7fec0d039c]] [formerly 455eb8b39d [formerly 647cd97e29 [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]]]
Former-commit-id: 455eb8b39d
Former-commit-id: 378c7aad5b [formerly b1f34a5dd0] [formerly 373c816e6a] [formerly c14508cb96f99376aae661f1047496fadb075aea [formerly c52c0623361b5124ad656838a838096ff392d903] [formerly 373c816e6a [formerly ec743199f1]]]
Former-commit-id: 1b7bd99d75a738fb173e194f8abe0b4c2f2079e1 [formerly 7d167287b3c5d094c77e241af01ad8945f4a9c0b] [formerly 7eabeb7ad6 [formerly cbceb4ea62]]
Former-commit-id: 7eabeb7ad6
Former-commit-id: cbd6f7c310
|
2014-06-02 11:21:46 -05:00 |
|
Brian.Dyke
|
c169691614
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 8e9f97eb85 [formerly 5524d6b38d] [formerly a0a879be7d] [formerly a0a879be7d [formerly a8737e18f0]] [formerly 8e9f97eb85 [formerly 5524d6b38d] [formerly a0a879be7d] [formerly a0a879be7d [formerly a8737e18f0]] [formerly 3f1e12effc [formerly a0a879be7d [formerly a8737e18f0] [formerly 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 4387b8e58d [formerly c76d6df69d] [formerly 3961c75ecd] [formerly 2d95f4d21d25820ef5408663c881d1e81c05afd5 [formerly 8ed2dc55683cd373c693766e728d2dbc5c2f9e63] [formerly 3961c75ecd [formerly 66aacd6578]]]
Former-commit-id: 4c2828f1bfa95e39c558864483570197a42903fb [formerly 48941da01de7ecd361d967e7d76a018c85a27337] [formerly 9351315fd6 [formerly a23d371522]]
Former-commit-id: 9351315fd6
Former-commit-id: 408ecfa5c0
|
2014-05-30 10:46:25 -04:00 |
|
Steve Harris
|
384d2fa312
|
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 65846eafbf [formerly 4469d87a8f] [formerly 718c78d984] [formerly 718c78d984 [formerly be80bd01f3]] [formerly 65846eafbf [formerly 4469d87a8f] [formerly 718c78d984] [formerly 718c78d984 [formerly be80bd01f3]] [formerly dc74953978 [formerly 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]]
Former-commit-id: dc74953978
Former-commit-id: 2ede564cdb [formerly aa133cc8a3] [formerly 0e9d0b2ef5] [formerly 0d288d370383d89f0fd9b620c1af2bfa831fc49c [formerly b7d992179f759d29da9804b9ffcafec8048bcefa] [formerly 0e9d0b2ef5 [formerly 713cfeffc7]]]
Former-commit-id: cc2e29627bf192e53143f9beb0749c892244949a [formerly 4b80090552f8712feaf5137c27c2f010cda148e2] [formerly 5fda99b1fe [formerly 6412cc1427]]
Former-commit-id: 5fda99b1fe
Former-commit-id: 86d6a0cd4d
|
2014-05-28 09:01:00 -05:00 |
|
Steve Harris
|
e93d032f05
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 8666f9a6fe [formerly 08308cd279] [formerly 3de24b7b07] [formerly 3de24b7b07 [formerly 99bc6f990c]] [formerly 8666f9a6fe [formerly 08308cd279] [formerly 3de24b7b07] [formerly 3de24b7b07 [formerly 99bc6f990c]] [formerly 3b16bbafb1 [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 7bb35319b2 [formerly 9458ea3648] [formerly bfa4255eea] [formerly 71416a84ea07f551a8d4b12b7a5193d78a44f0d8 [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc] [formerly bfa4255eea [formerly 9b98b41cd4]]]
Former-commit-id: 5123ae7b27223de3c9b15a6ffa2edecab6105980 [formerly a54e34e905540883ccd6d6eb5c78370ac905f651] [formerly 172cca39d9 [formerly 144354c369]]
Former-commit-id: 172cca39d9
Former-commit-id: cf2950abdb
|
2014-05-27 14:48:24 -04:00 |
|
Bryan Kowal
|
bb338dd956
|
Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version.
Rebased on re-compiled on the latest version of the nativeLib code.
Former-commit-id: a8234d0898 [formerly d17ee734da] [formerly 7341d90341] [formerly 7341d90341 [formerly f1258ef865]] [formerly a8234d0898 [formerly d17ee734da] [formerly 7341d90341] [formerly 7341d90341 [formerly f1258ef865]] [formerly c711ab9195 [formerly 7341d90341 [formerly f1258ef865] [formerly c711ab9195 [formerly b96b174d5b4b082dc692e3a14ef1cc7b58f06b5a]]]]]
Former-commit-id: c711ab9195
Former-commit-id: 1fd100652b [formerly 8db253ebde] [formerly 1e983fbf3f] [formerly f65deb882c7f2a51b17998f72654641bc23cda83 [formerly d986cd8d506fff4caae3ec802642e727d2ac83a2] [formerly 1e983fbf3f [formerly e387f50206]]]
Former-commit-id: 4f0f65d307bb3e0f2968c86cf4c3629cb9d8fc4e [formerly b917360ba99bb51f1513e722e0c039d5198e4b26] [formerly cf8a8e4c6c [formerly 3fd9da7e49]]
Former-commit-id: 3b5f866feb40b12f490be75af6b423df51df7b3c [formerly cf8a8e4c6c]
Former-commit-id: 9c40719094
|
2014-05-27 13:16:37 -05:00 |
|
Steve Harris
|
d6f8c1faf2
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: 9e9933135d [formerly f79a449b6b] [formerly 376482d3b1] [formerly 376482d3b1 [formerly 518822ed83]] [formerly 9e9933135d [formerly f79a449b6b] [formerly 376482d3b1] [formerly 376482d3b1 [formerly 518822ed83]] [formerly b6af2db9f5 [formerly 376482d3b1 [formerly 518822ed83] [formerly b6af2db9f5 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]]]]
Former-commit-id: b6af2db9f5
Former-commit-id: bcf92dc1a7 [formerly 0fbeb1a165] [formerly 1dfc15a77e] [formerly 9a6440fb7679582a14fa54fa61cd8ca905bec7cd [formerly 7d53b80294c5865df861c5b6db7d9a9380d06252] [formerly 1dfc15a77e [formerly 14b1ea307f]]]
Former-commit-id: 71c3f33826d7cc0e3092e7db11dd41e456148ab3 [formerly 88f5f48abba58273dd5fee5505a2fe8efb91f86c] [formerly e30dfd21ee [formerly d226dfb021]]
Former-commit-id: 053d185d5abf33c4c48c0af12f0b4366ed538fab [formerly e30dfd21ee]
Former-commit-id: 3c9f653212
|
2014-05-22 14:31:06 -05:00 |
|
Bryan Kowal
|
68c2f23b36
|
Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version.
amend: remove debug code
Change-Id: I16d16576af71ad02821c8e65c10081bda5d061e3
Former-commit-id: 7a1cd6e717 [formerly 2ed7be0b50] [formerly 5ca6dfbf90] [formerly 5ca6dfbf90 [formerly c6518e7378]] [formerly 7a1cd6e717 [formerly 2ed7be0b50] [formerly 5ca6dfbf90] [formerly 5ca6dfbf90 [formerly c6518e7378]] [formerly 76cd1c2ac8 [formerly 5ca6dfbf90 [formerly c6518e7378] [formerly 76cd1c2ac8 [formerly 9ad4422eb9911f8fbf0c5db40103ee8a1d925570]]]]]
Former-commit-id: 76cd1c2ac8
Former-commit-id: 31ca6b3b68 [formerly 3da0250e22] [formerly 5f438c4a08] [formerly 9524ec08514c5461eb27a7ad0c118ba1a7f90366 [formerly 9cf4ec67daf3fedeef46142cce66d82caad1e57e] [formerly 5f438c4a08 [formerly b6baecf271]]]
Former-commit-id: 794c625dc1fce85b0a53ca336e32432ed3122454 [formerly 73a756fd6e694288ee421a6adbbfc1c8c33563a4] [formerly 72c92e6571 [formerly 112cca8b8a]]
Former-commit-id: e2538e136beb57a4c370aec16fcff1a0200eb888 [formerly 72c92e6571]
Former-commit-id: f60d0ff125
|
2014-05-20 11:02:31 -05:00 |
|
brian.dyke
|
5e35d72091
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 8fc637d27d [formerly 4d161aaf90] [formerly 9626317825] [formerly 9626317825 [formerly 011d121e4b]] [formerly 8fc637d27d [formerly 4d161aaf90] [formerly 9626317825] [formerly 9626317825 [formerly 011d121e4b]] [formerly 58683ad040 [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]]
Former-commit-id: 58683ad040
Former-commit-id: ff29ac1dd9 [formerly a2add51880] [formerly 2e105c1d5d] [formerly dd84aabda68bf0ba92959f80f4ff4af042362e53 [formerly cba44a8343721392c8a010e859fb1efaca4b604b] [formerly 2e105c1d5d [formerly bc4649765a]]]
Former-commit-id: 88785597564d5189fdec2d4d2cb7af8f51f44e24 [formerly 161c7365002f1434a02f072bc8ba71aba3cbf346] [formerly b2e3c50ec0 [formerly b42011fc76]]
Former-commit-id: b2e3c50ec0
Former-commit-id: 5c9495ee04
|
2014-05-19 09:45:37 -04:00 |
|
Mike Duff
|
80397df8dc
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: ed00e1012d [formerly f4062cd277] [formerly 0456fd0597] [formerly 0456fd0597 [formerly 8498235fd8]] [formerly ed00e1012d [formerly f4062cd277] [formerly 0456fd0597] [formerly 0456fd0597 [formerly 8498235fd8]] [formerly 6a67638a94 [formerly 0456fd0597 [formerly 8498235fd8] [formerly 6a67638a94 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]]]
Former-commit-id: 6a67638a94
Former-commit-id: c2d2af733d [formerly 3966697849] [formerly f49192936a] [formerly 56a6c16ea4f1a3f74d2d52a263379061fd77a4d6 [formerly 2876e8ca8c3ac5b87e9cb00735e694e84a5f8df9] [formerly f49192936a [formerly 70c8135fde]]]
Former-commit-id: d91f1f7b692155a2393eef571952efd1878f2133 [formerly 79e94a80e7729225dba251b67e17c3517adc7fc5] [formerly 4adf657556 [formerly 916d90ee64]]
Former-commit-id: 4adf657556
Former-commit-id: 8904d8a501
|
2014-05-08 14:36:54 -05:00 |
|
Richard Peter
|
e947de59f4
|
Issue #3102: Fix edexBridge connection leak
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: 31bc35657a [formerly 1a2d875bd0] [formerly 2668f09447] [formerly 2668f09447 [formerly 501980904d]] [formerly 31bc35657a [formerly 1a2d875bd0] [formerly 2668f09447] [formerly 2668f09447 [formerly 501980904d]] [formerly b091a8827a [formerly 2668f09447 [formerly 501980904d] [formerly b091a8827a [formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]]]]]
Former-commit-id: b091a8827a
Former-commit-id: 5f0a07798a [formerly 6eb5a21ec6] [formerly 8f1b5b647d] [formerly d97708ff4c4471f6866cb4028a8c549f3338771f [formerly bc0584123479bf5fdaccff51f63a759a58593715] [formerly 8f1b5b647d [formerly d03c47719f]]]
Former-commit-id: b2fafa615f6a34709ccc1f967bbc3989a2f13d4c [formerly 4585aeb1c1c934aa634aa78cc7373e3e0048cbf4] [formerly e555144511 [formerly 87c6348e61]]
Former-commit-id: e555144511
Former-commit-id: cbae8323b0
|
2014-05-06 10:32:31 -05:00 |
|
Chip Gobs
|
518868eb76
|
VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada
Former-commit-id: 7a53cec49f [formerly a95de2211a] [formerly 4e4d00792d] [formerly 4e4d00792d [formerly 65d2135ac2]] [formerly 7a53cec49f [formerly a95de2211a] [formerly 4e4d00792d] [formerly 4e4d00792d [formerly 65d2135ac2]] [formerly e42bef2a33 [formerly 4e4d00792d [formerly 65d2135ac2] [formerly e42bef2a33 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]]]]
Former-commit-id: e42bef2a33
Former-commit-id: 3a84210db1 [formerly 5045e9fa66] [formerly c075175e8e] [formerly 998720810481fa22d9d2ee156259909992600791 [formerly 3dc38f5850d9a6af32e30312873669ceb1e3ea3b] [formerly c075175e8e [formerly 593b36d722]]]
Former-commit-id: b1c6983fc06c34c8b1aae189a6185cbb1ba76297 [formerly 77c9177d0a8eb55155050f750d97f90b20791bb0] [formerly 47068a7939 [formerly 1b7f762617]]
Former-commit-id: 47068a7939
Former-commit-id: 172481a6aa
|
2014-05-06 10:48:35 -04:00 |
|
Loubna.Bousaidi
|
03eba31756
|
ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: 550e92aec4 [formerly c064fb3ae4] [formerly 1b5bccc451] [formerly 1b5bccc451 [formerly 760ee964d6]] [formerly 550e92aec4 [formerly c064fb3ae4] [formerly 1b5bccc451] [formerly 1b5bccc451 [formerly 760ee964d6]] [formerly 6d526cb1ff [formerly 1b5bccc451 [formerly 760ee964d6] [formerly 6d526cb1ff [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]]]]]
Former-commit-id: 6d526cb1ff
Former-commit-id: 3ae1497605 [formerly 967156413e] [formerly 93a6523f46] [formerly 24ecb43d031ac8caf6cfc745bc539f683d1329f9 [formerly 51be7984ec7ff512df21cbd1bc4ce90ccce8b1b9] [formerly 93a6523f46 [formerly e28ec3469d]]]
Former-commit-id: 95b6c5a4154d74e9e05c0f73b860b759da8084d8 [formerly 88fa747f996318dc9368525454f7865cc4cee512] [formerly ecbad2efac [formerly 84640a8936]]
Former-commit-id: ecbad2efac
Former-commit-id: a141c9fa13
|
2014-04-29 21:09:34 +00:00 |
|
Steve Harris
|
59974fb4e1
|
Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
Former-commit-id: 109a7fd70c [formerly 883244fa2e] [formerly 29f4f53d27] [formerly 29f4f53d27 [formerly a70710b467]] [formerly 109a7fd70c [formerly 883244fa2e] [formerly 29f4f53d27] [formerly 29f4f53d27 [formerly a70710b467]] [formerly 656ae897c1 [formerly 29f4f53d27 [formerly a70710b467] [formerly 656ae897c1 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]]]
Former-commit-id: 656ae897c1
Former-commit-id: cb863a8d69 [formerly 4cc478e83b] [formerly b99ed0cce6] [formerly 4fdfdae1b12d550221655dfcc40aab2e434a6790 [formerly c89d11e09dd409255cf1e5daff026439aa00fab2] [formerly b99ed0cce6 [formerly b1d31f21bc]]]
Former-commit-id: 6b7d7b443473348102c14cb64ec5ddb220bffa12 [formerly 1efcd8cc307635929ab51dd088d4ae8d0cac33f0] [formerly d9af02b1d2 [formerly 2d6dde4ac6]]
Former-commit-id: 98a0e698c7429c4d415e58fcac6d8471631defc8 [formerly d9af02b1d2]
Former-commit-id: 64b4a6a719
|
2014-03-26 16:19:26 -05:00 |
|
Brian.Dyke
|
d9bdc4cc43
|
Fixed comment merge conflicts added .gitignore
Former-commit-id: 12fb1e7cfb [formerly 642cdfe2e6] [formerly 027cca8673] [formerly 027cca8673 [formerly 7cc471a9c9]] [formerly 12fb1e7cfb [formerly 642cdfe2e6] [formerly 027cca8673] [formerly 027cca8673 [formerly 7cc471a9c9]] [formerly a0e7cb624a [formerly 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 19849840be [formerly 6476c4fb85] [formerly 412a7eb2c2] [formerly 60279a83ad18e6bd031bd551e2fc8639a00876d8 [formerly 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f] [formerly 412a7eb2c2 [formerly d8256c4226]]]
Former-commit-id: d19157684bfad244ba5a116e5442409e93ab71ea [formerly 8a69e5f0509d10278a9c81d31ec5d2e0a9d1f376] [formerly e7aea77979 [formerly c19fc33493]]
Former-commit-id: e7aea77979
Former-commit-id: dc35ed8fe1
|
2014-03-25 15:41:58 -04:00 |
|
Steve Harris
|
5bd1b336ff
|
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 4bff39258e [formerly 1dd9192564] [formerly 5efb16fa8b] [formerly 5efb16fa8b [formerly d0aeb854f5]] [formerly 4bff39258e [formerly 1dd9192564] [formerly 5efb16fa8b] [formerly 5efb16fa8b [formerly d0aeb854f5]] [formerly 0c2c5ad4bd [formerly 5efb16fa8b [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 248459109c [formerly 016a659753] [formerly 5d95d594f8] [formerly 49c36ccdd7c47e709711998ff99d0e08642ad435 [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb] [formerly 5d95d594f8 [formerly b5a2d2237f]]]
Former-commit-id: a2f491855110d16e9bcedaa337d52ccdd680fd42 [formerly fde598cdbbe0d12d61ab87081d43c79970894959] [formerly a936941dff [formerly 3a82fa7ac6]]
Former-commit-id: a936941dff
Former-commit-id: 24c55c616c
|
2014-03-17 15:55:41 -05:00 |
|
Shawn.Hooper
|
b54a97f3c7
|
ASM #377 - Baseline National River Location Database fails
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 4b6e2e4b6a [formerly 94e4e3e649] [formerly 6a8a1c397b] [formerly 6a8a1c397b [formerly 670da1895b]] [formerly 4b6e2e4b6a [formerly 94e4e3e649] [formerly 6a8a1c397b] [formerly 6a8a1c397b [formerly 670da1895b]] [formerly 85db05e819 [formerly 6a8a1c397b [formerly 670da1895b] [formerly 85db05e819 [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]]]]]
Former-commit-id: 85db05e819
Former-commit-id: 3bce709ae0 [formerly d549088e33] [formerly b7cf50dd31] [formerly 09f914692b2655309e0ed1c1f49846eaa23b6dfe [formerly 32e11e96551b8e3081b3d4dde88e4590083e6392] [formerly b7cf50dd31 [formerly 62a0c1dadf]]]
Former-commit-id: 0b72306f1b341b33a2f33224af6cc7d9cc663baa [formerly b7f2c27096f052aab3c364f5bc82543098085d30] [formerly 94a008ff56 [formerly 6401571e92]]
Former-commit-id: 94a008ff56
Former-commit-id: aedaebcd97
|
2014-03-07 13:12:11 -05:00 |
|
Brad Gonzales
|
2b7d49ddb2
|
Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: e317164318 [formerly 885a9567bc] [formerly a24cbcfa77] [formerly a24cbcfa77 [formerly 0e3dc17872]] [formerly e317164318 [formerly 885a9567bc] [formerly a24cbcfa77] [formerly a24cbcfa77 [formerly 0e3dc17872]] [formerly dea17a19da [formerly a24cbcfa77 [formerly 0e3dc17872] [formerly dea17a19da [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]]]
Former-commit-id: dea17a19da
Former-commit-id: 88556ffdc6 [formerly 09c083ce1f] [formerly 4ba60d8a6f] [formerly e670e0feade57e374fb1c735b6e19bb44c2507cb [formerly f2869efb05c763771e03bc02057aa196d29b6d1a] [formerly 4ba60d8a6f [formerly 78d35d4033]]]
Former-commit-id: 43355841aa7d98fe8c5428fbd0be540315ce710d [formerly f70dd002a68a434eb5e81131bb0b82d4784e717e] [formerly 4cbc3b1b05 [formerly c4064160ec]]
Former-commit-id: 4cbc3b1b05
Former-commit-id: e7295b16d2
|
2014-03-06 16:29:37 -06:00 |
|