Richard Peter
|
631aa74a10
|
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
Former-commit-id: 6236137635 [formerly 390e73af44] [formerly 6236137635 [formerly 390e73af44] [formerly 897980da08 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]]
Former-commit-id: 897980da08
Former-commit-id: a910870531 [formerly 780b504251]
Former-commit-id: 9060aab6dd
|
2014-03-24 09:53:13 -05:00 |
|
Dave Hladky
|
a37f87968c
|
Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 39343e1801 [formerly 3ac04dd071] [formerly 39343e1801 [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: e464a1d8f8 [formerly 43cbcff538]
Former-commit-id: 3d61ca32f6
|
2014-03-24 08:27:12 -05:00 |
|
Mike Duff
|
05fbcc61ca
|
Issue #2941 - Sort data before returning
Former-commit-id: ff07b90659 [formerly 73a011b940] [formerly ff07b90659 [formerly 73a011b940] [formerly 4db73e42a5 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]]
Former-commit-id: 4db73e42a5
Former-commit-id: 8d1347d1f7 [formerly 43eccead7c]
Former-commit-id: 8f00b37688
|
2014-03-24 08:19:21 -05:00 |
|
Brian.Dyke
|
aea0544eec
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 50e5f4f78d [formerly 06ee9a6384] [formerly 50e5f4f78d [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: d97b88f433 [formerly 14567f20a7]
Former-commit-id: f540c6fb2d
|
2014-03-24 07:01:29 -04:00 |
|
Brian.Dyke
|
7aeb9af309
|
OB_14.1.1-24 baseline
Former-commit-id: 37e9d48d45 [formerly 37b6368268] [formerly 37e9d48d45 [formerly 37b6368268] [formerly face1ebeeb [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]
Former-commit-id: face1ebeeb
Former-commit-id: cfa058a345 [formerly 6b2175da93]
Former-commit-id: 2fda566cfb
|
2014-03-21 12:43:50 -04:00 |
|
steve.naples
|
f0b105bbdf
|
ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204
Former-commit-id: 64b19f2e41 [formerly d0f4df4ad9] [formerly 64b19f2e41 [formerly d0f4df4ad9] [formerly 1aa970164f [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]]]
Former-commit-id: 1aa970164f
Former-commit-id: 885ceb834b [formerly 9c9ddaba6a]
Former-commit-id: 47e1a3627f
|
2014-03-19 18:16:41 +00:00 |
|
Juliya Dynina
|
668c24997d
|
Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2
Former-commit-id: 34b6972f79 [formerly 9aa170ca5f] [formerly 34b6972f79 [formerly 9aa170ca5f] [formerly 7a14dfb5a9 [formerly 8f842b0defba552ebbbe980b42dfb7618a2a7ccd]]]
Former-commit-id: 7a14dfb5a9
Former-commit-id: f4c1f51b2c [formerly e939d718e5]
Former-commit-id: b5c93d06e6
|
2014-03-18 13:52:48 -05:00 |
|
steve.naples
|
2d22f976f4
|
ASM #338 Updated HRAPCoordinates to not parse whitespace
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6
Former-commit-id: 46675eec43 [formerly 309ff4e7f7] [formerly 46675eec43 [formerly 309ff4e7f7] [formerly 75e8a907fe [formerly 220ef7b1195366834c9f85b828862f128dd3fea1]]]
Former-commit-id: 75e8a907fe
Former-commit-id: 2ff30dac48 [formerly 54cc3397ee]
Former-commit-id: 72d6b1f1a5
|
2014-03-18 15:40:13 +00:00 |
|
Juliya Dynina
|
5505320aa3
|
Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2
Former-commit-id: 30545f79c5 [formerly 85fd3b3888] [formerly 30545f79c5 [formerly 85fd3b3888] [formerly ef873880b6 [formerly 0d338537015e8e8a98fa67bc658fa3a4ed0f15f0]]]
Former-commit-id: ef873880b6
Former-commit-id: bd6ae766c2 [formerly 67f8f79e9f]
Former-commit-id: cc3e0b3360
|
2014-03-18 08:47:22 -05:00 |
|
Juliya Dynina
|
de68dcfeb4
|
Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
Former-commit-id: d6e2b7f741 [formerly c735051e00] [formerly d6e2b7f741 [formerly c735051e00] [formerly 867f00b438 [formerly 669d66d3b8279833df4a361c961c113e653a542d]]]
Former-commit-id: 867f00b438
Former-commit-id: ed07060240 [formerly c54631024a]
Former-commit-id: d34b5c1a2c
|
2014-03-18 08:13:51 -05:00 |
|
David Friedman
|
cf85796def
|
ASM #330 - Fix reloading of TextDB static files
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5
Former-commit-id: fd203b5999 [formerly 15ca9f4dcc] [formerly fd203b5999 [formerly 15ca9f4dcc] [formerly decdadce01 [formerly 0a94094f0f140de68da634cbc6c79039507712ca]]]
Former-commit-id: decdadce01
Former-commit-id: f19895db07 [formerly 9beaf9be16]
Former-commit-id: 5fe3990a9e
|
2014-03-18 13:12:40 +00:00 |
|
Qinglu.Lin
|
119fc9840e
|
ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: 09e90dfe43 [formerly 4b3c821ce0] [formerly 09e90dfe43 [formerly 4b3c821ce0] [formerly af82143e84 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]
Former-commit-id: af82143e84
Former-commit-id: 1b352b8600 [formerly bd7d68bd16]
Former-commit-id: 72b8b32e25
|
2014-03-17 18:17:49 -04:00 |
|
Brian.Dyke
|
5fb2fe9266
|
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: 9f332e938c [formerly d23acbdd48] [formerly 9f332e938c [formerly d23acbdd48] [formerly 9c412e444e [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]
Former-commit-id: 9c412e444e
Former-commit-id: 57f7e4b084 [formerly 88efccf309]
Former-commit-id: 35427557c4
|
2014-03-14 11:13:30 -04:00 |
|
Brian.Dyke
|
516ba8e81a
|
Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 4e3096631d [formerly d4b6d22ae2] [formerly 4e3096631d [formerly d4b6d22ae2] [formerly f999e48df0 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]
Former-commit-id: f999e48df0
Former-commit-id: 82756e3855 [formerly 3ab2df3507]
Former-commit-id: 76271269c5
|
2014-03-14 08:44:39 -04:00 |
|
Brian.Dyke
|
be8f052cff
|
OB_14.1.1-23 baseline
Former-commit-id: 55918ee421 [formerly dcc2e4fd61] [formerly 55918ee421 [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]
Former-commit-id: bc6a7bf946
Former-commit-id: e78e030b7c [formerly 8f72db144b]
Former-commit-id: c7fbd5dfe4
|
2014-03-14 08:18:16 -04:00 |
|
Ben Steffensmeier
|
1bde438f3a
|
Issue #2528 Fix satellite units/style.
Former-commit-id: e6cd8b3167 [formerly 77041e5b17] [formerly e6cd8b3167 [formerly 77041e5b17] [formerly 75120a09cd [formerly 7e38454a31aa55c606c155a108253c0433ecb517]]]
Former-commit-id: 75120a09cd
Former-commit-id: e2995114dc [formerly d29daf8ede]
Former-commit-id: fc62e2679d
|
2014-03-12 14:19:49 -05:00 |
|
Richard Peter
|
318c61b1bf
|
Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
Former-commit-id: e981ce3e36 [formerly 18234c5d73] [formerly e981ce3e36 [formerly 18234c5d73] [formerly f59d1433db [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]]
Former-commit-id: f59d1433db
Former-commit-id: cc35481b48 [formerly 76f15c73dd]
Former-commit-id: 937c89866d
|
2014-03-11 16:43:37 -05:00 |
|
Dave Hladky
|
78441a1250
|
Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: 7cd4304140 [formerly 3500ad262a] [formerly 7cd4304140 [formerly 3500ad262a] [formerly 76e216d319 [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]]
Former-commit-id: 76e216d319
Former-commit-id: f3876233e4 [formerly 03fd32144a]
Former-commit-id: c0d2eb8f6b
|
2014-03-11 15:53:59 -05:00 |
|
David Gillingham
|
0e0fdae804
|
Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68
Former-commit-id: e3a3cf7bad [formerly b0783b64ce] [formerly e3a3cf7bad [formerly b0783b64ce] [formerly 187196b519 [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]]
Former-commit-id: 187196b519
Former-commit-id: 4179172d0e [formerly 68edb8d9a1]
Former-commit-id: f30292b471
|
2014-03-11 11:54:25 -05:00 |
|
Juliya Dynina
|
ddf1c4f4f6
|
Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
Former-commit-id: b3ec4c363f [formerly 6bbd88e62c] [formerly b3ec4c363f [formerly 6bbd88e62c] [formerly 7952862443 [formerly a167748b77baad66784893304a18e8866f5471f1]]]
Former-commit-id: 7952862443
Former-commit-id: bedc9082b0 [formerly 7e35f36651]
Former-commit-id: 7966aac771
|
2014-03-11 09:24:12 -05:00 |
|
brian.dyke
|
fba0188c90
|
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
Former-commit-id: 1a482f91bc [formerly 654778bb0d] [formerly 1a482f91bc [formerly 654778bb0d] [formerly b1b216f196 [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]
Former-commit-id: b1b216f196
Former-commit-id: d1b389ae05 [formerly d57a3dd24c]
Former-commit-id: f3df3e3690
|
2014-03-10 15:36:56 -04:00 |
|
Steve Harris
|
e29b96b6bd
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 068297b90a [formerly 92232fa063] [formerly 068297b90a [formerly 92232fa063] [formerly 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: 4d1fbf8743 [formerly f992a6b046]
Former-commit-id: ea01373320
|
2014-03-07 15:16:18 -06:00 |
|
Shawn.Hooper
|
df59dabcb5
|
ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: e894b1279a [formerly 41a4905f9f] [formerly e894b1279a [formerly 41a4905f9f] [formerly 56a949fba8 [formerly b18b8f64040b1c41810f391b8ed785327b6e5d59]]]
Former-commit-id: 56a949fba8
Former-commit-id: 84b71d7252 [formerly aa827610b1]
Former-commit-id: fb673d390f
|
2014-03-07 14:53:54 -05:00 |
|
David Friedman
|
2eb0b3dfb0
|
ASM #349 - Workaround for QPID-5569
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: 103fece7b7 [formerly 2c1a3442d6] [formerly 103fece7b7 [formerly 2c1a3442d6] [formerly a58f3cb7df [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]]
Former-commit-id: a58f3cb7df
Former-commit-id: 91b22ff9bb [formerly 2a4a92c223]
Former-commit-id: ab5f533c72
|
2014-03-07 14:58:09 +00:00 |
|
Steve Harris
|
2db5dcf6eb
|
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: 3ba28aabea [formerly 069093884f] [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 587f15a95d [formerly 96658d8ce0]
Former-commit-id: 36a0533f19
|
2014-03-06 08:39:43 -06:00 |
|
Benjamin Phillippe
|
d0999c05e8
|
Issue #2769: Added batching to registry sync
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: 7bf51d507e [formerly 59323be87e] [formerly 7bf51d507e [formerly 59323be87e] [formerly 9fd35140f0 [formerly a265027cacde7690171d30455227c5a843e0d397]]]
Former-commit-id: 9fd35140f0
Former-commit-id: daeb8bec5f [formerly cd04d7dcbe]
Former-commit-id: 6b6a5b0e4f
|
2014-03-04 13:31:41 -06:00 |
|
Richard Peter
|
0219b80555
|
Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
Former-commit-id: 5280398130 [formerly aa8e1a3625] [formerly 5280398130 [formerly aa8e1a3625] [formerly f9bd27c061 [formerly 26cbe68f0a86660968016da88a4b51d1735e8227]]]
Former-commit-id: f9bd27c061
Former-commit-id: a81447f434 [formerly 3b800bcc09]
Former-commit-id: 9ce19b16cc
|
2014-03-04 12:54:23 -06:00 |
|
John.McPherson
|
24389e3792
|
ASM #113 DR 16464 rsync_parms.site may not always exist for Service Backup
Change-Id: I2abbb68dcbd064483a262ddba4b9ab9e0dee211a
Former-commit-id: 058bb8d60e [formerly bdbe5577e9] [formerly 058bb8d60e [formerly bdbe5577e9] [formerly 2d8ce4e577 [formerly 4d9b74dc181c359681eda8bae04f7c46f41d5769]]]
Former-commit-id: 2d8ce4e577
Former-commit-id: f1eeaf6580 [formerly 218f2de16a]
Former-commit-id: d75de22f67
|
2014-03-04 17:24:00 +00:00 |
|
Nate Jensen
|
5132a0f8cb
|
Issue #2813 fix subscription package names
Former-commit-id: af76b58b27 [formerly 0ec866f1d2] [formerly af76b58b27 [formerly 0ec866f1d2] [formerly d7d0803ee9 [formerly 081b621b5932d77c03117840e887ed7017f1d48b]]]
Former-commit-id: d7d0803ee9
Former-commit-id: 78b2b50370 [formerly df44f8246e]
Former-commit-id: e22b486f25
|
2014-03-04 10:53:58 -06:00 |
|
Brian.Dyke
|
ea56516bf5
|
OB_14.1.1-21 baseline
Former-commit-id: 271ec85c0c [formerly 1d92e5bab6] [formerly 271ec85c0c [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]
Former-commit-id: 29681c7ca4
Former-commit-id: c68649b4f9 [formerly 7cad374af5]
Former-commit-id: 079cc93f89
|
2014-03-04 11:47:42 -05:00 |
|
Benjamin Phillippe
|
719b90e1e7
|
Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: d339e232f4 [formerly ed050996a2] [formerly d339e232f4 [formerly ed050996a2] [formerly 5483d6d7ae [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]]
Former-commit-id: 5483d6d7ae
Former-commit-id: 603e433054 [formerly 15a5e7c4a4]
Former-commit-id: 090dbe3918
|
2014-03-03 10:57:16 -06:00 |
|
Juliya Dynina
|
42a1294ce4
|
Merge "ASM #78 - Fix MDCRS display" into asm_14.2.2
Former-commit-id: 6fd59caff3 [formerly 0130876a7a] [formerly 6fd59caff3 [formerly 0130876a7a] [formerly 4bc91be899 [formerly 081b98f0e1a2dad2d4aff981cbe9980e0c97e12a]]]
Former-commit-id: 4bc91be899
Former-commit-id: 6e3dbfdff7 [formerly 7a30b05e9a]
Former-commit-id: b0e3794ce8
|
2014-03-03 11:27:39 -05:00 |
|
Melissa Porricel
|
adc09f6896
|
ASM #78 - Fix MDCRS display
Change-Id: I28b6788f822100469f0fe292197b6020381e6e38
Former-commit-id: 20624da288 [formerly 769fc1ed2f] [formerly 20624da288 [formerly 769fc1ed2f] [formerly e5213e9415 [formerly 2c655d5313882f811219c7a16f713d977008f949]]]
Former-commit-id: e5213e9415
Former-commit-id: 8daf0520bc [formerly 774e236d63]
Former-commit-id: eafea2f5ee
|
2014-02-27 12:48:09 -05:00 |
|
Brian.Dyke
|
f9587d39d1
|
OB_14.1.1-20 baseline
Former-commit-id: b2401d2f0d [formerly 324696c436] [formerly b2401d2f0d [formerly 324696c436] [formerly 2bad40cfee [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]
Former-commit-id: 2bad40cfee
Former-commit-id: c873f20d04 [formerly 16117255f3]
Former-commit-id: 5feadbe4d9
|
2014-02-26 17:39:15 -05:00 |
|
steve.naples
|
2e088612ec
|
ASM #236
Change-Id: I849aa9c15622973e49f385ada9df84ba3b1417dd
Former-commit-id: 06f619b3ff [formerly 6be82c41fc] [formerly 06f619b3ff [formerly 6be82c41fc] [formerly cc9e62c806 [formerly 8d0e82a46186f3457c5d4e3001548d067ebbaae2]]]
Former-commit-id: cc9e62c806
Former-commit-id: 1c6f6be15e [formerly 9b850d81df]
Former-commit-id: 73e5bc8949
|
2014-02-26 18:54:36 +00:00 |
|
Richard Peter
|
e28b3bb5b9
|
Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
Former-commit-id: 90b48e0393 [formerly 3735cd3ffe] [formerly 90b48e0393 [formerly 3735cd3ffe] [formerly b4e48698ed [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]
Former-commit-id: b4e48698ed
Former-commit-id: f803d557c2 [formerly 66b271a550]
Former-commit-id: e78e5a15b9
|
2014-02-25 12:34:38 -06:00 |
|
Brad Gonzales
|
aa2d8b76a1
|
Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.
Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22
Former-commit-id: b6e2ce4b74 [formerly 783afb1585] [formerly b6e2ce4b74 [formerly 783afb1585] [formerly 8b2b50baaf [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: f57f472f6a [formerly 5ce1939d01]
Former-commit-id: f4513d0e64
|
2014-02-25 09:22:08 -06:00 |
|
Brian.Dyke
|
0bcf7c89b8
|
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 363403fb34 [formerly 2faab606e5] [formerly 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 73a1c238f4 [formerly 227131e5f1]
Former-commit-id: 38829b9014
|
2014-02-24 14:51:00 -05:00 |
|
Ron Anderson
|
3c673caec2
|
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: 45ccac0859 [formerly 4364e7497c] [formerly 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: 7d3af157f8 [formerly 3b2ea2d6ac]
Former-commit-id: f2b0cc20e8
|
2014-02-24 13:46:48 -06:00 |
|
Nate Jensen
|
da2a363550
|
Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
Former-commit-id: 98a6101cd3 [formerly 2111109ce2] [formerly 98a6101cd3 [formerly 2111109ce2] [formerly b1586f8603 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]
Former-commit-id: b1586f8603
Former-commit-id: d6e9cb73f5 [formerly bf8bb95f51]
Former-commit-id: 6979321635
|
2014-02-24 13:25:35 -06:00 |
|
Dave Hladky
|
e030ac65b2
|
Issue #2469 Fixed default rules implementation
Former-commit-id: f9c6a396f0 [formerly 1d256bfcee] [formerly f9c6a396f0 [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]
Former-commit-id: 45413d0db4
Former-commit-id: dc97eb7890 [formerly ff5a5961db]
Former-commit-id: 8a924bcc2c
|
2014-02-24 13:06:52 -06:00 |
|
Ben Steffensmeier
|
831bb0b021
|
Issue #2762 Use UCUM to format units so IRPixel formats correctly.
Former-commit-id: f7c48b24bb [formerly 9e5f7d90a0] [formerly f7c48b24bb [formerly 9e5f7d90a0] [formerly f8cc0e3d95 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 3c7e578000 [formerly a510abdb22]
Former-commit-id: 358e7d3b1d
|
2014-02-24 10:27:30 -06:00 |
|
John.McPherson
|
995015a0ca
|
ASM #209 DR 16362
Change-Id: Ide103349188f12f3b1350bea75f80b225def13e7
Former-commit-id: ea0dc8b3dc [formerly 1d987c36d9] [formerly ea0dc8b3dc [formerly 1d987c36d9] [formerly bbd70c06f1 [formerly b01f04471631f5e2c24dba77f7e96b72444becff]]]
Former-commit-id: bbd70c06f1
Former-commit-id: acf30e83bf [formerly ae671c3601]
Former-commit-id: dbad6b2701
|
2014-02-24 03:07:21 +00:00 |
|
Dave Hladky
|
c4e70210fd
|
Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: 542ba7e504 [formerly c4bed432da] [formerly 542ba7e504 [formerly c4bed432da] [formerly 49f6c31256 [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]
Former-commit-id: 49f6c31256
Former-commit-id: 3b9f80d03e [formerly 445b55f796]
Former-commit-id: c545368839
|
2014-02-21 16:01:20 -06:00 |
|
Brian.Dyke
|
f86f9f8918
|
OB_14.1.1-19 baseline
Former-commit-id: 779553142c [formerly cfa4997978] [formerly 779553142c [formerly cfa4997978] [formerly 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: c41dd22ff2 [formerly 64044e7ce5]
Former-commit-id: 1b359c2564
|
2014-02-21 06:50:59 -05:00 |
|
Juliya Dynina
|
04413ee642
|
Merge "ASM #118" into asm_14.2.2
Former-commit-id: d9fecf06d2 [formerly 0f5ce6fbde] [formerly d9fecf06d2 [formerly 0f5ce6fbde] [formerly f1a10568d6 [formerly f2354898d0a40ae7a19b4349d25b4204d2da3e4d]]]
Former-commit-id: f1a10568d6
Former-commit-id: 8b164ca292 [formerly a668f336bf]
Former-commit-id: 70d512cb7d
|
2014-02-20 11:23:32 -05:00 |
|
David Gillingham
|
5911f4b2d4
|
Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 607ce13c19 [formerly 32719432ff] [formerly 607ce13c19 [formerly 32719432ff] [formerly de12904c7a [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]
Former-commit-id: de12904c7a
Former-commit-id: a83191356d [formerly 1520317c24]
Former-commit-id: 474dda75de
|
2014-02-18 13:24:37 -06:00 |
|
Richard Peter
|
bbce2567a7
|
Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1
Former-commit-id: c666adb530 [formerly 3ed6ad64ce] [formerly c666adb530 [formerly 3ed6ad64ce] [formerly d19e464a1a [formerly 5bf461753675af961c484d022cec4006fabfeba8]]]
Former-commit-id: d19e464a1a
Former-commit-id: f7e43bdabd [formerly 3c4e188037]
Former-commit-id: ccd90f2d86
|
2014-02-18 12:44:57 -06:00 |
|
Lee Venable
|
0bd01db3cc
|
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
Former-commit-id: e9226e7140 [formerly 0cf2dba731] [formerly e9226e7140 [formerly 0cf2dba731] [formerly 4e7c3c0cbe [formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]]
Former-commit-id: 4e7c3c0cbe
Former-commit-id: 46dbd967a5 [formerly 6fc9dcb3b1]
Former-commit-id: 28b0809a1c
|
2014-02-18 12:19:41 -06:00 |
|
Brad Gonzales
|
d50a8cd7a5
|
Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
Amend: updated test envlope sizes.
fixed ticket numbers in software history.
Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5
Former-commit-id: 49ddffc99b [formerly 36a24c1cb5] [formerly 49ddffc99b [formerly 36a24c1cb5] [formerly 794bbc3c9b [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 3bb9975728 [formerly 90d34f7386]
Former-commit-id: b99b5d9373
|
2014-02-18 12:11:02 -06:00 |
|