Steve Harris
|
24c55c616c
|
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753 [formerly 5d95d594f8] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6]
Former-commit-id: a936941dff
|
2014-03-17 15:55:41 -05:00 |
|
Brian.Dyke
|
f95e1ed18b
|
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly e85e3c2e70 [formerly 9f332e938c] [formerly d23acbdd48] [formerly 9c412e444e [formerly d23acbdd48 [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]]
Former-commit-id: 9c412e444e
Former-commit-id: 39ef07d49f [formerly 57f7e4b084] [formerly 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f [formerly 88efccf309]]
Former-commit-id: b74e99a753d5ddafa0c2b9e7a7ee76f3251376c4 [formerly 35427557c4]
Former-commit-id: 5fb2fe9266
|
2014-03-14 11:13:30 -04:00 |
|
Brian.Dyke
|
f417ded1bb
|
OB_14.1.1-23 baseline
Former-commit-id: b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly b24e7a66d8 [formerly 55918ee421] [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly dcc2e4fd61 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]]
Former-commit-id: bc6a7bf946
Former-commit-id: 6c021d0eec [formerly e78e030b7c] [formerly ea51c2c24eabbc975758d2dfad3f260a10c7718d [formerly 8f72db144b]]
Former-commit-id: 15a710f2de86297f2fae98fe2c109c5d01b1953d [formerly c7fbd5dfe4]
Former-commit-id: be8f052cff
|
2014-03-14 08:18:16 -04:00 |
|
Brad Gonzales
|
faa52421fa
|
Issue #2702 Updated openfire version in component spec.
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498
Former-commit-id: 57b81b8031 [formerly c7d06ff946] [formerly ccb312d46f] [formerly 57b81b8031 [formerly c7d06ff946] [formerly ccb312d46f] [formerly bf0d052043 [formerly ccb312d46f [formerly 276c38754b7f917c229750ce06d387a8b63245d4]]]]
Former-commit-id: bf0d052043
Former-commit-id: 9dc545e82c [formerly ec34591f08] [formerly 703b3cf04e5992070f4a2edcfcaf0eac8a3d91d3 [formerly dae0963531]]
Former-commit-id: fa205ba6df82ecb0182903405eefcac8d24974fd [formerly 1049855e4d]
Former-commit-id: 0a973030c4
|
2014-03-12 08:48:36 -05:00 |
|
Brad Gonzales
|
fe798a797c
|
Issue #2702 Removed openfire 3.7.1 tar. Fixed openfire patch to work
with openfire 3.9.1. Updated package.sh to use openfire tar from awips2-static directory.
Added a -buildRPM target to build.sh to build a specific RPM.
Change-Id: I3502e42d92d519968aeb8b5fbc1f38b277f48c6a
Former-commit-id: f70d572802 [formerly cbac19d219] [formerly 09d27e99b5] [formerly f70d572802 [formerly cbac19d219] [formerly 09d27e99b5] [formerly 48b6c75bb3 [formerly 09d27e99b5 [formerly 606b269f39ed58e855d9fcba2487fccbaac3c28c]]]]
Former-commit-id: 48b6c75bb3
Former-commit-id: 4e44cdcfd4 [formerly f53845738c] [formerly 7d3abbb7bdae80a54f033641942cda32bb82bb2a [formerly 5d5ab33db3]]
Former-commit-id: 1e23556d6631c497f1ee4d7c61886ca51a27a2b2 [formerly b7df208cd7]
Former-commit-id: 0b558f0c93
|
2014-03-11 11:27:44 -05:00 |
|
Steve Harris
|
9c0f484340
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae [formerly c24108e75b] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433]
Former-commit-id: ed7921643c
|
2014-03-07 15:43:40 -06:00 |
|
Brian.Dyke
|
b8ee763baa
|
Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]]
Former-commit-id: 6414bdab57
Former-commit-id: 50621ec3e5 [formerly 2eec413d72] [formerly 1e0890d0f70a0aeffbbcabd7f8be3e396daae297 [formerly 2f94480121]]
Former-commit-id: d006a47edee1a1939aadf15ef61024f22a80931d [formerly 8f2271403d]
Former-commit-id: da36dde938
|
2014-03-07 08:57:07 -05:00 |
|
Steve Harris
|
2acd9aac73
|
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: 08dbf1f7ea [formerly dc7d6ceced] [formerly 8b6263bfbd] [formerly 08dbf1f7ea [formerly dc7d6ceced] [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 8b6263bfbd [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]]
Former-commit-id: 1c64a5c025
Former-commit-id: 3f778f9f9f [formerly 972fa3bee6] [formerly ce9b772480f62374b4f578a3aa3691569ae98b58 [formerly 7fbbc1e118]]
Former-commit-id: 4dd289fbedb14cff7837a7f1aeed66c5959e4ee1 [formerly 7f932399b9]
Former-commit-id: d65c768373
|
2014-03-06 18:31:10 -06:00 |
|
Brian.Dyke
|
b1435c612e
|
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
Former-commit-id: 8c54df9e0c [formerly 26fe429c4b] [formerly 1778d20745] [formerly 8c54df9e0c [formerly 26fe429c4b] [formerly 1778d20745] [formerly 010b7a1df5 [formerly 1778d20745 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]]]
Former-commit-id: 010b7a1df5
Former-commit-id: df3291e0b4 [formerly 14844a10b6] [formerly 0ef04c99b170216a3f24341f708895d2df66d675 [formerly c6dae5a81f]]
Former-commit-id: 2a8a80f5ec679fb777138b8501782bf43dc7de32 [formerly 863de85b6b]
Former-commit-id: 0c6ba63abc
|
2014-03-06 11:04:34 -05:00 |
|
Brian.Dyke
|
9762ca9d59
|
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
Former-commit-id: e5972b7159 [formerly 6313b7af0c] [formerly 2dbac1697d] [formerly e5972b7159 [formerly 6313b7af0c] [formerly 2dbac1697d] [formerly cb1b4a7ac5 [formerly 2dbac1697d [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]]]
Former-commit-id: cb1b4a7ac5
Former-commit-id: b2cd2711f9 [formerly 57a28e817d] [formerly 92fbb4b7ccf0b4c7c32f6ac2ac82358fc9c89c38 [formerly 3fdb85c62d]]
Former-commit-id: ed9a44ece7652bc19f6481662d2caead4061477f [formerly 6f5baf3984]
Former-commit-id: 36e0ad0fdd
|
2014-03-06 10:56:44 -05:00 |
|
Steve Harris
|
a19beb1e5d
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
|
2014-03-06 08:39:43 -06:00 |
|
Brad Gonzales
|
1412bf249d
|
Issue #2821 Removed qpid 0.7 from the baseline.
Amend: Removed build.sh script that builds 0.7 and 0.18. changed rpms.sh to call 0.18 build.sh script.
Change-Id: Iaf0cc8c0f9c47877f3e0acc02c60f27b25c0fccf
Former-commit-id: bdadb0266b [formerly f87d4ccf82] [formerly a007ffabf9] [formerly bdadb0266b [formerly f87d4ccf82] [formerly a007ffabf9] [formerly 50209c2084 [formerly a007ffabf9 [formerly 5ea4e87d10d335d85547b147228244892772a98f]]]]
Former-commit-id: 50209c2084
Former-commit-id: 0c02861e4e [formerly b9affa3c02] [formerly aa3ee588d04acaa851780f26f198fcd5053004bf [formerly bf3a9ef7fe]]
Former-commit-id: 44ac3f38c805b8effdacbbd35e22bafc74214f18 [formerly 6f32b5cc59]
Former-commit-id: b428cf44ca
|
2014-02-28 10:15:18 -06:00 |
|
Richard Peter
|
ef2ff1d0f7
|
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
|
2014-02-27 15:18:26 -06:00 |
|
Brian.Dyke
|
7316b34ef5
|
OB_14.1.1-20 baseline
Former-commit-id: 2613e13e08 [formerly b2401d2f0d] [formerly 324696c436] [formerly 2613e13e08 [formerly b2401d2f0d] [formerly 324696c436] [formerly 2bad40cfee [formerly 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]]
Former-commit-id: 2bad40cfee
Former-commit-id: 89b66fcb5b [formerly c873f20d04] [formerly ed8e6914deb29235289414c9240bc93a504f11a5 [formerly 16117255f3]]
Former-commit-id: 9b0f4d8a2c398c18300fab2c3d13cb0bf783a1ef [formerly 5feadbe4d9]
Former-commit-id: f9587d39d1
|
2014-02-26 17:39:15 -05:00 |
|
Brad Gonzales
|
a1a34a3558
|
Issue #2683 for java 1.7.0_51, added jdk-7u51-linux-i586.tar.gz and jdk-7u51-linux-x64.tar.gz
and removed jdk-7u40-linux-i586.tar.gz jdk-7u40-linux-x64.tar.gz. Updated the component.spec to the new version number.
Change-Id: I383d78b6b52a2e196aa01f81e157a4d49fd11ba3
Former-commit-id: e31b98bb85 [formerly 40a653867a] [formerly 4ccfe4f3c0] [formerly e31b98bb85 [formerly 40a653867a] [formerly 4ccfe4f3c0] [formerly cf9c22ac99 [formerly 4ccfe4f3c0 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]]]
Former-commit-id: cf9c22ac99
Former-commit-id: 7c0db7ac7a [formerly 1df77529c3] [formerly ba481e4a842a84fed85e94eea66cb8cabf458c52 [formerly a24cbaf683]]
Former-commit-id: 6b6559f6e56e17a95bf05ea409272e339f0bdebd [formerly 3780b24792]
Former-commit-id: d1ef377ec0
|
2014-02-25 14:42:59 -06:00 |
|
Brian.Dyke
|
9db7ca881a
|
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 6b1b6d38e3 [formerly 73a1c238f4] [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1]]
Former-commit-id: b22adde77eff6179b00b4c7389d58bbde1684f4b [formerly 38829b9014]
Former-commit-id: 0bcf7c89b8
|
2014-02-24 14:51:00 -05:00 |
|
Ron Anderson
|
5eb76e8ed6
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]]
Former-commit-id: 2db5f26840
Former-commit-id: 5831f8d79e [formerly 7d3af157f8] [formerly a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]]
Former-commit-id: 50ec6dfad53c87f1ad4174e64fdb142803fcaf62 [formerly f2b0cc20e8]
Former-commit-id: 3c673caec2
|
2014-02-24 13:46:48 -06:00 |
|
Brian.Dyke
|
de9e6553a9
|
OB_14.1.1-19 baseline
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb [formerly c41dd22ff2] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564]
Former-commit-id: f86f9f8918
|
2014-02-21 06:50:59 -05:00 |
|
Brian.Dyke
|
1882ad8be8
|
ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
Former-commit-id: 45cf129ad7 [formerly 5f3ca0a3f4] [formerly 2f79cc486e] [formerly 45cf129ad7 [formerly 5f3ca0a3f4] [formerly 2f79cc486e] [formerly 916f657e04 [formerly 2f79cc486e [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]]]
Former-commit-id: 916f657e04
Former-commit-id: 1fc3b18abb [formerly 9ce06f52c4] [formerly b55df208e18a858dd848c1f37a3594d57d916867 [formerly e36ae1dd7f]]
Former-commit-id: 2f25bb8be4842d117064095d696ba2c535e07c96 [formerly f89f664f50]
Former-commit-id: 176c56b8ea
|
2014-02-20 15:50:50 -05:00 |
|
Ron Anderson
|
c3b687b9a5
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f]
Former-commit-id: 8a7af092f2
|
2014-02-18 10:45:20 -06:00 |
|
Brian Clements
|
9541ad494a
|
Issue #2755 removed subscription plugin jar from rpms
Former-commit-id: fa44883db0 [formerly 944a874c5b] [formerly d4f3fe7629] [formerly fa44883db0 [formerly 944a874c5b] [formerly d4f3fe7629] [formerly 248db98ddf [formerly d4f3fe7629 [formerly 59921407164c798a0748475d84ca0ad32bf7bfcb]]]]
Former-commit-id: 248db98ddf
Former-commit-id: b4f07d06d8 [formerly 08bffb26ca] [formerly 7166a474368c6d544978e9fc3dc6315a0b97411b [formerly 5faad2ccca]]
Former-commit-id: 7f1ad017ab813f8c9c511fb8b8dc724035f30eb3 [formerly a8dfacc21b]
Former-commit-id: fa98f1c415
|
2014-02-18 09:00:21 -06:00 |
|
Ron Anderson
|
86f067bac9
|
Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40]
Former-commit-id: 7447a71c10
|
2014-02-13 10:10:34 -06:00 |
|
Brian.Dyke
|
fc21d2dee4
|
14.1.1-18 baseline
Former-commit-id: 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 1c7bf39f73 [formerly d61ae6c5f4] [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2]]
Former-commit-id: 48b7eeaa6cb834b10db17643ac629aaa112f6878 [formerly d1db845406]
Former-commit-id: f47dd3ef59
|
2014-02-11 15:52:50 -05:00 |
|
Brian.Dyke
|
e0236cc20a
|
14.1.1-17 baseline
Former-commit-id: 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]]
Former-commit-id: 23280af290
Former-commit-id: 6e66bb7b6e [formerly f1cc9d6ee2] [formerly 50e190ed8cb3b89c055f33e543707eeb6346818a [formerly 947ec5fd96]]
Former-commit-id: b5864c63c56c26489ecbcefc3b1a67b8472182a1 [formerly 948fffa361]
Former-commit-id: b8f7317b9d
|
2014-02-04 12:33:46 -05:00 |
|
Greg Armendariz
|
9e9a0044d1
|
Issue #2754 - Return commons logging to build for qpid
Former-commit-id: 7481545364 [formerly c70e69147d] [formerly 6d3e40d648] [formerly 7481545364 [formerly c70e69147d] [formerly 6d3e40d648] [formerly 976edd2545 [formerly 6d3e40d648 [formerly 460a0deb6abe7cd92d8cddc339ba20c35e52632a]]]]
Former-commit-id: 976edd2545
Former-commit-id: df7ce23942 [formerly b81825a668] [formerly f7ccb68536836e65517ff864bd975eed46384b48 [formerly 346d535a6c]]
Former-commit-id: 2b233ed3f7e318d1c45ca1ab06d01582b86001a7 [formerly 851b9180ec]
Former-commit-id: 30e5a6e2f9
|
2014-01-28 15:06:11 -06:00 |
|
Ron Anderson
|
f33f5aec85
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.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.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe [formerly dca7f21f7b] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f]
Former-commit-id: 77c132f706
|
2014-01-13 17:45:20 -06:00 |
|
Steve Harris
|
e44faa7943
|
14.1.1-15 baseline
Former-commit-id: c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]]
Former-commit-id: d8e5799328
Former-commit-id: 188b12a1b0 [formerly 282d10fe6d] [formerly 390c383ede3823f4b855f6230e3fad20d31e0e07 [formerly 35d8f5a281]]
Former-commit-id: 86d049732a94fe967ea42eb6fadaec484ef0117f [formerly cd4a09623c]
Former-commit-id: 1ca553385c
|
2014-01-06 14:08:08 -05:00 |
|
Richard Peter
|
08d2290f97
|
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 73f12bf669 [formerly 5c0cf804f1] [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]]
Former-commit-id: 3e8093536581ac6595438ca5eb497ae394fe30e8 [formerly 4059813742]
Former-commit-id: 1c743d4d44
|
2013-12-17 21:04:53 -06:00 |
|
Greg Armendariz
|
0f56d01ce6
|
Issue #2182 - Change release number
Former-commit-id: 7219a81337 [formerly 00fd9a7bc5] [formerly 85703b9919] [formerly 7219a81337 [formerly 00fd9a7bc5] [formerly 85703b9919] [formerly e994e19877 [formerly 85703b9919 [formerly f9b49df162e36376f96897db77e0504cba87f28a]]]]
Former-commit-id: e994e19877
Former-commit-id: e2da5b7daa [formerly e190469fc1] [formerly 02329498e90a03be29ba695e53af3906d56dfb9d [formerly fad73466a7]]
Former-commit-id: 96a63d3425ad88c3313a0b252fcbfe855966c019 [formerly d2e4a4a504]
Former-commit-id: ba43b7e1c9
|
2013-12-17 08:46:15 -06:00 |
|
Bryan Kowal
|
c8e49142f2
|
Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop
Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da
Former-commit-id: b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]]
Former-commit-id: 120ebd045a
Former-commit-id: a63bda59b4 [formerly 68181d3f62] [formerly 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8]]
Former-commit-id: ea54fc6cf0eb39a2eb253d886a1e3180ccf382a0 [formerly 9e0e6662c8]
Former-commit-id: fad82481c1
|
2013-12-16 16:39:10 -06:00 |
|
Steve Harris
|
e242b041ad
|
14.1.1-13 baseline
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]]
Former-commit-id: b0b55a676b
Former-commit-id: 690b177ded [formerly 5368f23247] [formerly afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979]]
Former-commit-id: 0ea21b66b82286c758014c97bc2a1696ff006efb [formerly ff08301890]
Former-commit-id: 800136d61b
|
2013-12-12 16:59:57 -05:00 |
|
Greg Armendariz
|
74c45e19aa
|
Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change
Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3
Former-commit-id: 74c49f1eee [formerly 57c98d4343] [formerly cb952cdb13] [formerly 74c49f1eee [formerly 57c98d4343] [formerly cb952cdb13] [formerly 2d2641ea7e [formerly cb952cdb13 [formerly 584c543fbab59889769570330e7d83529a6b733f]]]]
Former-commit-id: 2d2641ea7e
Former-commit-id: 07211ccd00 [formerly fce327c001] [formerly 5e9d4ca213ff3e8a2b41e6d180cedfce81e47a93 [formerly f5f21141a4]]
Former-commit-id: 8021fd79f7a48694795066c2335fc0f8dbf17fcd [formerly f9f10703e8]
Former-commit-id: 88437251d7
|
2013-12-11 13:46:27 -06:00 |
|
Bryan Kowal
|
3ab3dde09b
|
Issue #2509 - re-compile grib2.so for RHEL6 64-bit
Former-commit-id: e907393567 [formerly 8f053f9fcd] [formerly 187759698b] [formerly e907393567 [formerly 8f053f9fcd] [formerly 187759698b] [formerly 5b8a8ddbeb [formerly 187759698b [formerly 90958e13e98147130848aad26d077e7a040ddb51]]]]
Former-commit-id: 5b8a8ddbeb
Former-commit-id: 0c43ddc19a [formerly ea0243e5da] [formerly ce6e7989617ea657c038124ee01c2907330c0e40 [formerly eceffc3880]]
Former-commit-id: 670c6c05d0683cd40d129ff44552087cd66d1f04 [formerly 91cdeb8c89]
Former-commit-id: c2273bbf5f
|
2013-12-05 15:53:51 -06:00 |
|
Richard Peter
|
f362062048
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
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/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588 [formerly 60679a818a] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e]
Former-commit-id: ae6e34be4b
|
2013-12-05 12:12:27 -06:00 |
|
Steve Harris
|
43dc948ff1
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/gridslice.so (took the master_14.1.1 version)
Former-commit-id: 655c9931e4 [formerly a5f141a2cc] [formerly cc79281795] [formerly 655c9931e4 [formerly a5f141a2cc] [formerly cc79281795] [formerly ce7808a309 [formerly cc79281795 [formerly bf9379caa6a1f156997e21a271f27b86d7689ef0]]]]
Former-commit-id: ce7808a309
Former-commit-id: 445b20ba2e [formerly d67709483a] [formerly d1b039aab850486af92fdbc8361d52b37403588f [formerly 7611759aaa]]
Former-commit-id: 7732f3fbda02c68db5fc7fa0491b2f307e91e9c2 [formerly 57355f5eaf]
Former-commit-id: e36c9ca1b6
|
2013-12-04 16:48:47 -06:00 |
|
Steve Harris
|
31c94115c7
|
14.1.1-12 baseline
Former-commit-id: f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 1e4b2bac7b [formerly 4e6f319422] [formerly 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af]]
Former-commit-id: e177b16a88af27dc0abf4496fe58fbe454cfa8c9 [formerly 234ca267ed]
Former-commit-id: 60f062ea59
|
2013-12-04 16:47:59 -05:00 |
|
Richard Peter
|
2e90e498f3
|
Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
nativeLib/edexBridge/edexBridge.cpp
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 7969ef9648 [formerly 760f215e8c] [formerly f5f75ec629] [formerly 7969ef9648 [formerly 760f215e8c] [formerly f5f75ec629] [formerly e82e1137f9 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]]
Former-commit-id: e82e1137f9
Former-commit-id: 2cafd3a81b [formerly ee03dcf505] [formerly cecc12c190bbaa908cbfe835a5a9a64a5ba96dba [formerly 94994868fa]]
Former-commit-id: d636e539a84c2fe845b3dcfc419fff85a3a47055 [formerly b0e694483f]
Former-commit-id: 30862929e2
|
2013-12-03 16:25:31 -06:00 |
|
Steve Harris
|
c01c05f777
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: b455a385e9 [formerly 1195e95c8b] [formerly b210ab8842ebdea3014e30e92d627d7f9a1742d7 [formerly 6539b80ded]]
Former-commit-id: b298b019250daf5a2e5c72bbc4f82d1267a2ad12 [formerly 2e47683d4a]
Former-commit-id: 6f4e8734c8
|
2013-12-02 16:17:38 -06:00 |
|
Steve Harris
|
941d5f65df
|
14.1.1-11 baseline
Former-commit-id: 401ee156b8 [formerly 337b138200] [formerly 70a6f1936e] [formerly 401ee156b8 [formerly 337b138200] [formerly 70a6f1936e] [formerly 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]]
Former-commit-id: 71ae71c850
Former-commit-id: 41a54a5ca6 [formerly 8bd818de09] [formerly 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d]]
Former-commit-id: 163b900bd16bb48d13431ad4d1511ea0204fdfed [formerly f88a635a58]
Former-commit-id: bfa9d638cc
|
2013-12-02 17:10:10 -05:00 |
|
Steve Harris
|
c2c71e6bca
|
Issue #2297 - fixing build scripts
Former-commit-id: 35d141a1ce [formerly f5a4aa3fd8] [formerly 193f06f545] [formerly 35d141a1ce [formerly f5a4aa3fd8] [formerly 193f06f545] [formerly 94cd37acf6 [formerly 193f06f545 [formerly 3725a48cbdec19842d7c4e3facf737fc507e69dc]]]]
Former-commit-id: 94cd37acf6
Former-commit-id: 1ea87a31c1 [formerly 1914ddd079] [formerly 6f8066380ee7e58d7dbf970e1cf56bc481bf84f2 [formerly b0516c0938]]
Former-commit-id: 6679dd86e41a55daa6fb0bef55c854612c4d4dbd [formerly 5346faae3d]
Former-commit-id: f51f520acb
|
2013-12-02 14:57:20 -06:00 |
|
Bryan Kowal
|
4500b39058
|
Increment python release for gridslice update.
Former-commit-id: 1557e44d70 [formerly f413677106] [formerly 5f634773fe] [formerly 1557e44d70 [formerly f413677106] [formerly 5f634773fe] [formerly c48a946923 [formerly 5f634773fe [formerly 5c5a81739c64ff1ab7f8812be8ac9390e8d85588]]]]
Former-commit-id: c48a946923
Former-commit-id: 7da2d374f6 [formerly 869781248b] [formerly a42a37b4db425942f95c2badff68de48c45807dc [formerly f7438d4fa6]]
Former-commit-id: 9d3a1012028a963c5bc7ac4997509241fc087b2f [formerly e39159052c]
Former-commit-id: 7d66f1186d
|
2013-11-20 17:40:18 -06:00 |
|
Brian Clements
|
53149f4869
|
Issue #2495 changed gridslice to use correct dimension datatype
Former-commit-id: dc7ad4d465 [formerly 4c3453a657] [formerly aa24bc6fce] [formerly dc7ad4d465 [formerly 4c3453a657] [formerly aa24bc6fce] [formerly 5e7f2f0bdf [formerly aa24bc6fce [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]]]
Former-commit-id: 5e7f2f0bdf
Former-commit-id: b7a10192f4 [formerly 90601f6ff8] [formerly a6c84a48a463eebfa267a1df2818691820f5dc81 [formerly 05b2a015cb]]
Former-commit-id: 3e6817554d34956823e10a116728dc64ba182b44 [formerly a8c2c5870c]
Former-commit-id: 9d3df8f842
|
2013-11-19 17:53:39 -06:00 |
|
Steve Harris
|
2233e88c1d
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 70c79bb7e6 [formerly d1b2cdd566] [formerly 65ebfc1a18] [formerly 70c79bb7e6 [formerly d1b2cdd566] [formerly 65ebfc1a18] [formerly c0bb3a1102 [formerly 65ebfc1a18 [formerly c333fe23736110bcb273aafd90ee6551ff7e921d]]]]
Former-commit-id: c0bb3a1102
Former-commit-id: 2ed2e93b03 [formerly eff32cfbf3] [formerly 44a31523c0eab129c3c048ad551394d20361765b [formerly e8c6af3060]]
Former-commit-id: b6a790b61eeb5fc024d51cb557cc7d0a67bec23d [formerly 70536b40ba]
Former-commit-id: fbe9de41ad
|
2013-11-19 15:45:06 -06:00 |
|
Steve Harris
|
8a1ea4d35f
|
14.1.1-10 baseline
Former-commit-id: 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]]
Former-commit-id: 9248695a1f
Former-commit-id: 2c49ed51ac [formerly e35ec60f7e] [formerly 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304]]
Former-commit-id: 1da4cf492cf27e8f6e06f3cfbfcc4a4b3ce25255 [formerly 36d788890a]
Former-commit-id: ea65181d19
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
065882f44e
|
Merge branch 'master_13.5.3' into development_on_RHEL5
Former-commit-id: 5ef89f10a1 [formerly 58325f2c17] [formerly be0f3bf912] [formerly 5ef89f10a1 [formerly 58325f2c17] [formerly be0f3bf912] [formerly d810aacaaa [formerly be0f3bf912 [formerly 648659c6a364b85a8531f24910ab535c9bcf73ce]]]]
Former-commit-id: d810aacaaa
Former-commit-id: 582813fab6 [formerly c86e70be8c] [formerly 91838a405f0441744a78ba5ded1f77d0c0ed5f87 [formerly 8ca6f8d14b]]
Former-commit-id: c815079fc8e672fc80b9d4c37ec67cd1f1470d45 [formerly 4f6e7095a3]
Former-commit-id: f3604b2fc8
|
2013-11-15 13:19:01 -06:00 |
|
Steve Harris
|
2d3311aace
|
Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
cots/org.jep.linux32/libjep.so
cots/org.jep.linux64/libjep.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
(took all the omaha_14.1.1 versions)
Former-commit-id: f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 3b074763ab [formerly 3f9df61017] [formerly 1978596c628755147b84f2d7e363ca602a98cedf [formerly 869b505f80]]
Former-commit-id: aff5d0abe267c4419bbecd159b29ef6d6ca51480 [formerly c26818afe6]
Former-commit-id: 87ce579deb
|
2013-11-15 13:15:25 -06:00 |
|
Steve Harris
|
1c4b82577c
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)
Former-commit-id: 117cac310b [formerly dc4f3b7594] [formerly 1015e180f1] [formerly 117cac310b [formerly dc4f3b7594] [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: b1d82b9c2c [formerly 156395b85b] [formerly 72d35279c7375fe7db3bdc163cd5fbd4a655ec1d [formerly d97edb20d1]]
Former-commit-id: 29c5be7d12e460b8d18f00420279fd45027d33c8 [formerly 7127a1e665]
Former-commit-id: c4e9fe1c94
|
2013-11-15 13:05:40 -06:00 |
|
Steve Harris
|
e3de9e104e
|
14.1.1-9 baseline
Former-commit-id: ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 7977f24d77 [formerly eab5bb1147] [formerly 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d]]
Former-commit-id: 7d3151fa65482d7fe7a3ae91e52a20bb86097b97 [formerly ea382798b5]
Former-commit-id: ed58bc7f71
|
2013-11-15 12:47:49 -05:00 |
|
Steve Harris
|
3555ea5b7a
|
13.5.3-8 baseline
Former-commit-id: ed8ef11cb8 [formerly e644eb9219] [formerly 4029c51fbf] [formerly ed8ef11cb8 [formerly e644eb9219] [formerly 4029c51fbf] [formerly b05ffb2108 [formerly 4029c51fbf [formerly 5623700c1cde2020ca0a8322edbfcf56afacb604]]]]
Former-commit-id: b05ffb2108
Former-commit-id: c52a724799 [formerly 28e5c8f540] [formerly fecf6ab52aeb75463fdc9128c8ec88a97cf188f0 [formerly e86f211430]]
Former-commit-id: ca64f840d41e81ff7eafd7f3183c06bb2bbd06df [formerly d1bf24b8b0]
Former-commit-id: e494984ce7
|
2013-11-15 09:28:00 -05:00 |
|
Richard Peter
|
d289419c40
|
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]]
Former-commit-id: 0074b774f0
Former-commit-id: 625647a717 [formerly b4aac09ff4] [formerly 9dbc5783e450aca6291faa5547b5b3369711eda7 [formerly 96b4944b41]]
Former-commit-id: 2067b058e879c394c330dccfc1994698c7f7cb05 [formerly e2a16fd876]
Former-commit-id: 705339a320
|
2013-11-14 14:40:23 -06:00 |
|