Steve Harris
|
1c8f2f6185
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: c782956ef32875130bd97a0bdbffdf005e1940e3
|
2014-05-05 08:21:02 -05:00 |
|
Steve Harris
|
18e79fe08d
|
Merge branch 'master_14.2.1' (14.2.1-19,20) into omaha_14.2.1
Change-Id: Ib48a2c15e266cd012aba975c25ef094b828a0f68
Former-commit-id: 749922901de5a57c7344f29def844a5ecf90304a
|
2014-04-25 09:09:38 -05:00 |
|
Brian.Dyke
|
e82fc8f89c
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: 4e921dbeab89e61635144b441ae0015155376c59
|
2014-04-24 13:01:50 -04:00 |
|
Ron Anderson
|
859d709a03
|
Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052
Former-commit-id: 6f141288cae462aac8c1ea8c77dd7f88a33c382a
|
2014-04-22 14:38:54 -05:00 |
|
Zhidong.Hao
|
0177756f97
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4
|
2014-04-22 14:31:14 -04:00 |
|
Brian.Dyke
|
35ad867281
|
Merged 13.5.5-1 into 1412
Former-commit-id: f44629e87a6401a5b872c050b9cf79defd306171
|
2014-04-16 12:09:12 -04:00 |
|
brian.dyke
|
a6708cc174
|
Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: 14cd23697c705352544609e7ba7a3afdf5d778b1
|
2014-04-14 15:29:23 -04:00 |
|
Zhidong.Hao
|
9c18f60924
|
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: 015d4307168ca7fbc70bf0ae0e2e9abd24463d90
|
2014-04-11 15:51:12 -04:00 |
|
Zhidong.Hao
|
1a91b820d9
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 30eba1a2397c41fed1b564af4c31791040b14eac
|
2014-04-11 15:34:06 -04:00 |
|
Brian.Dyke
|
9cce8eb0d1
|
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: 4e5541582b38abcd744cf25549d007c9e8f1a104
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
b15d288530
|
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: 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
dd98c213c7
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 407b42b0eff676a95483e219d6be899e45effd6c
|
2014-04-04 12:57:32 -04:00 |
|
David Gillingham
|
70b28b4e1e
|
Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: e820f7ea4046e42ae1112fe8b1a0f8455dbc997d
|
2014-03-31 15:49:33 -05:00 |
|
Steve Harris
|
ffcc34f8d4
|
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: 889200c9eb3fbb835f8fef067476799f30a7a7e0
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
1a8a0b703e
|
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: f7a43d07109a7c04ffb9754c285043ce446d46b5
|
2014-02-24 14:51:00 -05:00 |
|
Brian.Dyke
|
10b723647b
|
OB_14.1.1-19 baseline
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
|
2014-02-21 06:50:59 -05:00 |
|
Ron Anderson
|
14a082a4e9
|
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: 4155b9785e0a82078db6805659146980cafc2aa7
|
2014-02-18 10:45:20 -06:00 |
|
Steve Harris
|
9fcc5ad930
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: a494febee5f45d211797843d56077ac0ef358dbf
|
2014-02-17 08:54:34 -06:00 |
|
Ron Anderson
|
2f067699f2
|
Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad
|
2014-02-13 10:10:34 -06:00 |
|
Ron Anderson
|
ee89463d27
|
Issue #2719 Update NHA GFE domain
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c
Former-commit-id: 28008b46b5d68e544dace5f721b283c222701699
|
2014-02-11 17:07:01 -06:00 |
|
Brian.Dyke
|
1d6a9456b7
|
14.1.1-18 baseline
Former-commit-id: a8009c4ee3effc8586b830244db8db716ec0f37c
|
2014-02-11 15:52:50 -05:00 |
|
Brian.Dyke
|
edccef5569
|
Issue #88
Former-commit-id: 66a1b2ba9933754b0d6d0324108268563e6381bc
|
2014-02-04 16:34:40 -05:00 |
|
Brian.Dyke
|
23280af290
|
14.1.1-17 baseline
Former-commit-id: 810229668fd7ff81b5c426161d496fc62e24b75c
|
2014-02-04 12:33:46 -05:00 |
|
Ron Anderson
|
7c06f0b011
|
Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
Former-commit-id: 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e
|
2014-01-29 14:16:31 -06:00 |
|
Ron Anderson
|
0f6e082769
|
Issue #2719 Add NHA domain to serverConfig.py
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044
Former-commit-id: 2c8d067a3a4c4848bc2eb313c4e901507844074d
|
2014-01-29 13:55:54 -06:00 |
|
David Gillingham
|
c802315ddc
|
Issue #2170: Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route.
Former-commit-id: 3dfffb5f49a84a6ed82481d08c809e1217750f70
|
2014-01-29 11:56:05 -06:00 |
|
Ron Anderson
|
a54c44a6fb
|
Issue #2504 Change other GFESuite scripts to use iscUtil.getLogger for consistency
Change-Id: I4ce123e8030075bf4a247152dd053ba16dad6987
Former-commit-id: b0357df1c4b82623f1345362ddd6ca57d514a1e6
|
2014-01-24 17:01:40 -06:00 |
|
Ron Anderson
|
e13a34a8b3
|
Issue #2504 Add hostname to log path for GFESuite scripts
Change-Id: I734d8f6ec89720d23371bd9c1187ef95eeaf22eb
Former-commit-id: 975cf49b49e6266081e7b9ebcce6782b3e411667
|
2014-01-24 09:04:11 -06:00 |
|
Ron Anderson
|
9805de99fa
|
Issue #2720 Improve efficiency of merging polygons in edit area generation
Change-Id: I8fd83384431942fd71f30aba6053ee12af7d0eb4
Former-commit-id: c1ab9bc049528eb33b311355f6b089e67ea4997d
|
2014-01-21 13:25:31 -06:00 |
|
David Gillingham
|
5401124a1f
|
Issue #2418: Fix PHISH parameter name case issues discovered in test.
Former-commit-id: a33e5eb63fe0ad7b9d79e878a9877500065a05a8
|
2014-01-20 15:37:52 -06:00 |
|
Steve Harris
|
9371eeeee0
|
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: cf9f10b2e5a4038dce0003a1c0a4f227335d5db4
|
2014-01-20 10:17:44 -06:00 |
|
gerritcm
|
b84f7d4203
|
14.1.1-16 baseline
Former-commit-id: dee925ccd6738c3ca6727a7c65f4471170bc698c
|
2014-01-16 16:43:05 -05:00 |
|
Ron Anderson
|
2db1ae7b2d
|
Issue #2660 Improved error logging in GetBrokerConnections.py
Change-Id: Icf39a847106c13785e16aaef12283f44f4791cd1
Former-commit-id: b078a4fa3dc8df69903fa07e172b5de6313bb17a
|
2014-01-16 09:04:15 -06:00 |
|
Ron Anderson
|
fae5283358
|
Issue #1571 Fix bug in GFE where DbId in ParmId did not match the Database.
Change-Id: I08b5ec1dbbf95d269c9f1ad7fb5e02a8a471b7ec
Former-commit-id: c03aacd100a73d84d96bfcd3db447597f478fcb7
|
2014-01-15 16:16:44 -06:00 |
|
Ron Anderson
|
62c445d872
|
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: 9f121ec921a2f8635c48f005ddb71787ad6bf166
|
2014-01-13 17:45:20 -06:00 |
|
Ron Anderson
|
1c520b8cd1
|
Issue #2044 Fix some error handling in GFE to eliminate exceptions in edex logs.
Change-Id: Iad8edf92318d6c9277648396ba450a3fc6eb5c5a
Former-commit-id: 3f9f254229066cfe12501aacd14e68937764fadb
|
2014-01-10 15:01:10 -06:00 |
|
Ron Anderson
|
d80ce4a19e
|
Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic.
Change-Id: I503cf82ce896e8cdf39c238eda0f31453d8510a5
Former-commit-id: 142f68c426c4e2fbeb1e0b97cbb7b47c38e3b90d
|
2014-01-10 13:17:44 -06:00 |
|
Ron Anderson
|
82d3277785
|
Issue #2509 Fix merge error in iscMosaic (fix indentation)
Change-Id: I1745af1a51d6fffe221168cc8dca217d2f309007
Former-commit-id: 94c97fee9c6925ac9e73530bd18ec03d8cab4a40
|
2014-01-08 08:49:32 -06:00 |
|
Steve Harris
|
d8e5799328
|
14.1.1-15 baseline
Former-commit-id: cb8eca2a0dfc0e2348301e8d9932db824ecaf34c
|
2014-01-06 14:08:08 -05:00 |
|
Steve Harris
|
9ef1c841b9
|
14.1.1-14 baseline
Former-commit-id: 46bdb43889bdc681fec2aba45004a1583caaa6ae
|
2014-01-06 14:02:30 -05:00 |
|
Richard Peter
|
2e7fd9ddba
|
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: 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9
|
2013-12-17 21:04:53 -06:00 |
|
Steve Harris
|
b0b55a676b
|
14.1.1-13 baseline
Former-commit-id: 6eef3022653638f9031a85932d8d551aba5600d2
|
2013-12-12 16:59:57 -05:00 |
|
Richard Peter
|
a8b251223a
|
Issue #2509: Fix IFPWE merge issue
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75
Former-commit-id: 9450ca459d6b2efdea0d0124a6f9e7100eb5472a
|
2013-12-05 12:33:51 -06:00 |
|
Richard Peter
|
a0b6ea8bb2
|
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: b09f1559254f06a82afa91f0cc14c8150f88ce64
|
2013-12-05 12:12:27 -06:00 |
|
Ron Anderson
|
20eeb2796e
|
Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3
Former-commit-id: a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c
|
2013-12-04 17:10:48 -06:00 |
|
Richard Peter
|
fbda83aeb9
|
Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277
Former-commit-id: 081a19d5cfca3d717a332357dbaead199767e0b8
|
2013-12-03 11:41:21 -06:00 |
|
Steve Harris
|
71ae71c850
|
14.1.1-11 baseline
Former-commit-id: c32b2b2037c84cc074e7dc5a5a13b93223640d7d
|
2013-12-02 17:10:10 -05:00 |
|
Steve Harris
|
9248695a1f
|
14.1.1-10 baseline
Former-commit-id: 6970b56e5970df5cd40ddfc41470324d652f0afd
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
c7d36eb6ad
|
14.1.1-8 baseline
Former-commit-id: 41e87fe87d5074f138649c5ca8053e658488fbd0
|
2013-11-13 12:32:17 -05:00 |
|
Richard Peter
|
460a7b8b5d
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
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/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 333073fc97c9d454d0e41f8fbe01be3a19b18184
|
2013-11-12 11:11:36 -06:00 |
|