David Gillingham
|
0de3daedfb
|
Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf
Former-commit-id: f8e5a17f3f [formerly 850eecb1b9] [formerly aa78ed1b69] [formerly f8e5a17f3f [formerly 850eecb1b9] [formerly aa78ed1b69] [formerly f368412ef2 [formerly aa78ed1b69 [formerly 3d8a23e2e2802d19768de47c61cedb723ec53c8f]]]]
Former-commit-id: f368412ef2
Former-commit-id: 2f1d7aeecd [formerly 3c4ee53300] [formerly f5f983e70edc8e09841a2c25cb10ec9abc9bffb2 [formerly b3a859fe39]]
Former-commit-id: 50c20dae3ab7e945eaa90db92077559d66ce1ed0 [formerly 64bd4b81dc]
Former-commit-id: da652d1c4a
|
2014-05-01 16:19:51 -05:00 |
|
Ron Anderson
|
70dacd1553
|
Issue #3097 Fix return type for SmartScript.getGrids()
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0
Former-commit-id: fa1c34691c [formerly fcfd6e4c00] [formerly 374e8224f1] [formerly fa1c34691c [formerly fcfd6e4c00] [formerly 374e8224f1] [formerly 613aa1e94a [formerly 374e8224f1 [formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]]]]
Former-commit-id: 613aa1e94a
Former-commit-id: 5954a74787 [formerly 9bcd5d3f4a] [formerly 6210770d82431a108e71b3e2243051996167dc6d [formerly 8ba17da4df]]
Former-commit-id: 52d4a5cb088bfe7fe78ec51c870946dd048722c1 [formerly 453065268c]
Former-commit-id: 6fe1a0d1b7
|
2014-04-30 17:26:57 +00:00 |
|
Nate Jensen
|
0382243dfe
|
Issue #3039 fix ifpImage class cast exception
Former-commit-id: 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 31fb61e824 [formerly 2b6db445c0 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]]
Former-commit-id: 31fb61e824
Former-commit-id: 17544a32ba [formerly 19f0be6afc] [formerly ab6962b9080189e0cbac802398d99762ae5982e2 [formerly a1dd7f24fa]]
Former-commit-id: 59458bd25850cd5eb277eabb12c6fc5b515b5cb1 [formerly 7e7bbfd784]
Former-commit-id: 64e7ac4225
|
2014-04-16 16:17:05 -05:00 |
|
Brian.Dyke
|
f77319aa5b
|
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: 70e228a893 [formerly afc1da9015] [formerly 460c0f2c903a9254ae079d95afd674824e6d6212 [formerly ff51498036]]
Former-commit-id: 9404d535e7a6fa45f9825f9c281883c24eedc7c4 [formerly f051b95a7a]
Former-commit-id: fbefee3e1d
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
52a54f5e9f
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
38a8f60a43
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]]
Former-commit-id: 929b736038
Former-commit-id: a6ebdbfc3a [formerly d76d3a26cb] [formerly ef99224ab38fbdf6c62ed3f358f4c50051cbc248 [formerly 5163a31a66]]
Former-commit-id: 281a7b2833a1dc51969eab1f2b614dfd6fa8f7eb [formerly 462952ce65]
Former-commit-id: 8ef50f023b
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
ae3f5dbff6
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
|
2014-04-04 12:57:32 -04:00 |
|
Ron Anderson
|
f60398861b
|
Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly d556055299 [formerly 11fbd86558 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]]
Former-commit-id: d556055299
Former-commit-id: 5001c1f2be [formerly 3ac3d5de1b] [formerly dec5605ca65dcc7794d7aa2a917294e93e71160b [formerly ac7c5460f6]]
Former-commit-id: 1dcb3833d22665a093272a2766e36a92adf65c41 [formerly 4e88052beb]
Former-commit-id: 0033d7d3ef
|
2014-04-02 09:07:22 -05:00 |
|
Steve Harris
|
3348f6857a
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: a94f800324 [formerly 4d1fbf8743] [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]]
Former-commit-id: 0b70d2b7739772b630136c56408866dc53a2bdcd [formerly ea01373320]
Former-commit-id: e29b96b6bd
|
2014-03-07 15:16:18 -06: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 |
|
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 |
|
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 |
|
Steve Harris
|
a5d78a7f44
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 1fbbb6e73f [formerly 146412a8bd] [formerly 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7]]
Former-commit-id: 3a7d7a0e21b09081b233b6aa8dcf49e018ef8486 [formerly 28aa3dd195]
Former-commit-id: 7805eac857
|
2014-02-17 08:54:34 -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 |
|
David Gillingham
|
cc3256e77a
|
Issue #2509: Fix baseline merge breakage to ifpIMAGE.
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00
Former-commit-id: dc8f0dde25 [formerly b12e29dd7c] [formerly 03d36b8309] [formerly dc8f0dde25 [formerly b12e29dd7c] [formerly 03d36b8309] [formerly e8ffc73893 [formerly 03d36b8309 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]]]
Former-commit-id: e8ffc73893
Former-commit-id: 8cdf1ce158 [formerly ad8c40032f] [formerly bcf359e669db6d450eb89b007e4262c8f81e5b91 [formerly 94ec272ab2]]
Former-commit-id: 6d66a54db19d8e116fa26979efe8601acefd73a2 [formerly 06d68cc0be]
Former-commit-id: e20060f1da
|
2014-02-07 09:51:42 -06:00 |
|
Brian.Dyke
|
2bc1fcbaa2
|
Issue #83
Former-commit-id: 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 484119f6b0 [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 8e78870c71 [formerly 3c160bb05e] [formerly 75d1cbbdb2e42e3d0ad9d5112f388174acbf50f1 [formerly f088dab5ef]]
Former-commit-id: 799ac9274e6dd53615f019c76b975281bd597c94 [formerly 870b355263]
Former-commit-id: 42e17bf5f3
|
2014-02-04 16:32:42 -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 |
|
Steve Harris
|
f8496662a0
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
Former-commit-id: 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 9843517cb3 [formerly 7ea285c48b] [formerly 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]]
Former-commit-id: 656727c4e55c34f4fb4a1128b81b68286b1e7757 [formerly b5f7f35ccb]
Former-commit-id: ccd2f6cdaa
|
2014-01-20 10:17:44 -06:00 |
|
gerritcm
|
e924818487
|
14.1.1-16 baseline
Former-commit-id: 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly b84f7d4203 [formerly 6be938e6eb [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]]
Former-commit-id: b84f7d4203
Former-commit-id: c1df3eb55c [formerly b72cd19055] [formerly 8a149ceb12545503e179389c0569fad3eefaed15 [formerly 644da23327]]
Former-commit-id: d2214c65a6550cba23bc7837777ef6a2fc6d443a [formerly 5f79da2501]
Former-commit-id: 6bf3189db9
|
2014-01-16 16:43:05 -05: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
|
f8f17037ca
|
14.1.1-14 baseline
Former-commit-id: 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 4a516444b6 [formerly 0989c17710] [formerly 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d]]
Former-commit-id: a6acd13ea8d0052cec52c8cee5a726953d78e66e [formerly a2bdee5cc1]
Former-commit-id: 5862555160
|
2014-01-06 14:02:30 -05:00 |
|
David Gillingham
|
ec522d0ee0
|
Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: ab3f8b200a [formerly c48c0523ff] [formerly 136265183d] [formerly ab3f8b200a [formerly c48c0523ff] [formerly 136265183d] [formerly 09bfdc49e3 [formerly 136265183d [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]]]]
Former-commit-id: 09bfdc49e3
Former-commit-id: f4dfa0efb1 [formerly 6e642b81fe] [formerly 54ef06cbf4b4c0bf6f652f24388beb4dfdf1db37 [formerly 8f3802eecf]]
Former-commit-id: 01fe09b5b4718cd40ed3a2ba5206139e1de68dcb [formerly 24c8fc930e]
Former-commit-id: 203e25ab3c
|
2013-12-18 16:18:47 -06: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 |
|
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 |
|
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 |
|
Ron Anderson
|
d3d2ea3745
|
Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3
Former-commit-id: 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 20eeb2796e [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]]
Former-commit-id: 20eeb2796e
Former-commit-id: fb3b7b0a9f [formerly e30d6041ee] [formerly 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f]]
Former-commit-id: 89e88491b334d8f079138c920fd456262fa46656 [formerly 89e87a1683]
Former-commit-id: bbd7ea36a1
|
2013-12-04 17:10:48 -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 |
|
Ron Anderson
|
e3fc955e54
|
Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2
Former-commit-id: 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 7459d65134 [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: 21f431f203 [formerly a99197c5c2] [formerly 5277e256cdac93c4f9b0fa236643a91c2e6af6d3 [formerly 75d2dd7a29]]
Former-commit-id: 0193b4e72e257f2b7fccd9d06a481874e19ebeef [formerly 1988e86bbd]
Former-commit-id: 95d6bebb13
|
2013-12-04 15:29:28 -06:00 |
|
Ron Anderson
|
f54ac1014a
|
Issue #2488 Change to use DejaVu fonts
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224
Former-commit-id: a83d214f40 [formerly 7a3c7d530e] [formerly d72119409e] [formerly a83d214f40 [formerly 7a3c7d530e] [formerly d72119409e] [formerly 633137d8c0 [formerly d72119409e [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]]]
Former-commit-id: 633137d8c0
Former-commit-id: bbb24dfdbd [formerly 769df41dea] [formerly ebfd4c9fd692514b821af5e75fe51a87a50ddecc [formerly f6b9e69738]]
Former-commit-id: 88b789c28703f9bf73991585ff00bcc13e9d24bd [formerly a731f80011]
Former-commit-id: e2f54e78d0
|
2013-11-20 13:43:25 -06:00 |
|
Ron Anderson
|
33c8d2300b
|
Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: 143847e37d [formerly 0bfd9a1c98] [formerly a5bc64473a] [formerly 143847e37d [formerly 0bfd9a1c98] [formerly a5bc64473a] [formerly 42229b8eee [formerly a5bc64473a [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]]]
Former-commit-id: 42229b8eee
Former-commit-id: 7f62cacd3b [formerly 9d56a36dbe] [formerly bbdfb7b1f3c5e064c379a3b9b24470e4ae2b4b73 [formerly 6442e2e933]]
Former-commit-id: 0dc39943f970c9aa139fc1b7cec8d35b83776fcb [formerly 298f4abbae]
Former-commit-id: cc95af7fa8
|
2013-11-07 14:38:39 -06:00 |
|
Richard Peter
|
0bcf000a31
|
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
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.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 93c776022a [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]]
Former-commit-id: 93c776022a
Former-commit-id: aec254aac0 [formerly c97efbf656] [formerly 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4 [formerly 520dd57f02]]
Former-commit-id: 8eb1848d92c6225ecf7e4aff08b65f9f7fc71abe [formerly 910464ea6a]
Former-commit-id: 94e0faa6c6
|
2013-11-07 14:25:45 -06:00 |
|
David Gillingham
|
d918c5e1fa
|
Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67
Former-commit-id: 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 0e74638eb2 [formerly e1df69e312 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]]]
Former-commit-id: 0e74638eb2
Former-commit-id: 2cd30bab98 [formerly 1ed80f471c] [formerly 90a0e1bc7e0ea65d26c6784350bcc46d6a2824c9 [formerly d0b188d577]]
Former-commit-id: 253f6827d6bd7e24ee2c90bede0d9493ee7db128 [formerly 50f9ad420b]
Former-commit-id: be9ed341f5
|
2013-11-07 11:36:49 -06:00 |
|
Steve Harris
|
24ec3c5993
|
14.1.1-6 baseline
Former-commit-id: f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly 6067af4252 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]]
Former-commit-id: 6067af4252
Former-commit-id: 2a5f4c26d6 [formerly e86a0aa489] [formerly 70967acd51143f4f43cec1322c400d567f95c3ce [formerly 26da1ce793]]
Former-commit-id: 30c24036c09dc21bf6f32deefe9a7a44f35d8005 [formerly 270c5f1a2d]
Former-commit-id: 0aa90a7855
|
2013-11-06 14:08:33 -05:00 |
|
Ron Anderson
|
a9c8950fe6
|
Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]]
Former-commit-id: cc991ed528
Former-commit-id: a0f67a006f [formerly f453d92818] [formerly c1140f67ed8f586264c71a61de18f87988cedd70 [formerly deb89a88f5]]
Former-commit-id: b4e8d1a865f6177e1d0672dcd506844aafc34864 [formerly 84adff8e96]
Former-commit-id: 638b57e188
|
2013-11-01 11:07:39 -05:00 |
|
David Gillingham
|
dc6a531641
|
Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af
Former-commit-id: 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly c4f5cc53bb [formerly 6e1cca2966 [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 82721bfe07 [formerly 3776f258a3] [formerly 345b0c83f25f83ef27ba6cbf8e70827c774b053d [formerly 3bac577a31]]
Former-commit-id: 5b6106d6a9109e95e2fa9e2742d6f3022a33ac54 [formerly 5df42898ad]
Former-commit-id: 4862c1d171
|
2013-10-31 14:07:20 -05:00 |
|
Ron Anderson
|
2b4809ead7
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly 42e924e021 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]]
Former-commit-id: 42e924e021
Former-commit-id: dd1b50d116 [formerly 2f23072e41] [formerly e573e83de25a263065e03ab739ab5d58c0ca7fb1 [formerly eef9d2dfb0]]
Former-commit-id: 6420457c498cf2f6184538b3831ba133f0623c15 [formerly e3a0440825]
Former-commit-id: 49ea9c0444
|
2013-10-31 14:04:55 -05:00 |
|
David Gillingham
|
c7e966b43e
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 2ddacaea30 [formerly 68b0b2e3db] [formerly 0f0aefb2c1b9d5dfbee8cd33020b863e61f2b01f [formerly 996817f124]]
Former-commit-id: 88b3c16c68fc66755ed20e6b4157548ca26d3124 [formerly eef2c93d6c]
Former-commit-id: 75acd532a1
|
2013-10-30 11:34:46 -05:00 |
|
Nate Jensen
|
89b3b81ab3
|
Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: dced4c4d11 [formerly 19043faeaa] [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]]
Former-commit-id: 15fd50423e5c76bf2d7d7f54653759492ef97c8d [formerly e8c199f108]
Former-commit-id: f2184b9379
|
2013-10-29 14:33:53 -05:00 |
|
Ron Anderson
|
b0f0709755
|
Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 306a5d72f4 [formerly 3575496955] [formerly 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]]
Former-commit-id: 53c38fe54d2869c9707556e4244b69af6f55a908 [formerly 1daa0f8649]
Former-commit-id: 643624f1a9
|
2013-10-28 12:59:44 -05:00 |
|
Ben Steffensmeier
|
5ac77f7f76
|
Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]]
Former-commit-id: 44a6f05986
Former-commit-id: 2400380daf [formerly 0e3cf8b47f] [formerly 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]]
Former-commit-id: d4c767bc5d9a92f47044beb03900b35fdf1a24a2 [formerly 0c3bb6ef3e]
Former-commit-id: 47d3fb8249
|
2013-10-28 10:14:08 -05:00 |
|
Steve Harris
|
cbf859daf6
|
14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
c784003711
|
14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
|
2013-10-28 10:46:02 -04:00 |
|
Ben Steffensmeier
|
20d9922f17
|
Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 694511af94 [formerly 4eea088717] [formerly ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]]
Former-commit-id: 122ec98ee5a18fcf8773f9c00abd54bcb37bbc42 [formerly 5645da0b45]
Former-commit-id: ddd58aa99c
|
2013-10-25 15:50:10 -05:00 |
|
Steve Harris
|
d1c823fe65
|
13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]]
Former-commit-id: bcb531e671
Former-commit-id: 2e6e031198 [formerly 15d9848170] [formerly 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d]]
Former-commit-id: d6cb813e26904b36ed5b21ea7664539b21d552fa [formerly 248e79aa2f]
Former-commit-id: f97c128cc8
|
2013-10-25 09:59:15 -04:00 |
|
Ron Anderson
|
7a6209b7a5
|
Issue #2446 Added cluster lock and check for purgeable data to publish.
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089
Former-commit-id: 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly cc28fca175 [formerly 002bb6ab89 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]]]
Former-commit-id: cc28fca175
Former-commit-id: 88f6e5d9d7 [formerly 0d9df14596] [formerly 4b9ce7666378daf235ca6c2275644a5d5cc7407a [formerly 20fcbd322e]]
Former-commit-id: bf7072abec62c42c21107a8d66df0a85d338f36d [formerly b9c5d96961]
Former-commit-id: ee845f3634
|
2013-10-23 16:02:40 -05:00 |
|
Richard Peter
|
929a8dd118
|
Merge branch 'omaha_13.5.3' (13.5.2-10) into development
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: cbf18e7a32 [formerly cbf53120dd] [formerly cd504e4e98] [formerly cbf18e7a32 [formerly cbf53120dd] [formerly cd504e4e98] [formerly 0787e7cc86 [formerly cd504e4e98 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]]]]
Former-commit-id: 0787e7cc86
Former-commit-id: 210927720b [formerly 9896b051c1] [formerly 36f2423845a35dba4181db0c68f0634fbfc9eaef [formerly 1a62020265]]
Former-commit-id: 18e091b61bbc0c33f4f15918e97355378cbc6ded [formerly 03a58dabb2]
Former-commit-id: a8f823447e
|
2013-10-15 11:36:12 -05:00 |
|
Steve Harris
|
90889f8aa3
|
13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]
Former-commit-id: 18325949fb
Former-commit-id: 9e5ad5cd96 [formerly 21b84f0290] [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]]
Former-commit-id: eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac [formerly 088eb89ca7]
Former-commit-id: e1f7463a41
|
2013-10-04 11:30:03 -04:00 |
|