Steve Harris
|
8a07970ba6
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
|
2016-01-06 11:55:00 -06:00 |
|
Nate Jensen
|
3511de9e2b
|
Omaha #4834 remove more LocalizationOpFailedExceptions
Change-Id: I0b8717b72b051169360ce167e796b35a786ee1a1
Former-commit-id: 4605396f4a9d1f77df9566e02cca1bd3e9f56e26
|
2015-12-01 13:13:26 -06:00 |
|
Shawn.Hooper
|
e93839673c
|
Merge branch 'asm_16.2.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.2.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
Former-commit-id: 0d5c4caf82d74459f9412800955d6cb9da18f3fb
|
2015-11-25 14:31:20 -05:00 |
|
Nate Jensen
|
acc931788c
|
Omaha #4834 remove catch LocalizationOpFailedException
replace catching LocalizationOpFailedException with
LocalizationException
Change-Id: Ib5ed69539474d798d04363106a5a2aaf47ac6e58
Former-commit-id: c465340cf3d5215c10409354b380ed76bbbca270
|
2015-11-12 14:32:01 -06:00 |
|
Zhidong.Hao
|
2edd4b719b
|
ASM #15464 AvnFPS: error occurs in generating guidance in certain case
Change-Id: I065aea4c91c8edbdf5450c323ca6ec41b32318bf
Former-commit-id: a4267039a0d1fae0dc7325747037de076d18c96d
|
2015-10-28 15:06:22 -04:00 |
|
David Gillingham
|
648bb0e367
|
Omaha #5003: Update A2 baseline code to utilize apache commons-lang version 3.
Change-Id: I2b23399b2cfd3d37a41f89cb3c3173ca628caecb
Former-commit-id: b9c41fe3354a90a03440e1ea67991e6ecd5885c0
|
2015-10-28 13:21:07 -05:00 |
|
Slav Korolev
|
0f49d915aa
|
Omaha #5017 - Fixed AvnFPS Syntax check for P6SM +SN errors.
Former-commit-id: f8b893a62b59d2de9fe33b361b6949569b59cbc3
|
2015-10-23 09:46:07 -04:00 |
|
Bryan Kowal
|
5295e7538b
|
Omaha #4897 - The Collection/Dissemination menu item is now optional.
Change-Id: I3be625b8e2d46babce7359a089c8c7d2ce59a987
Former-commit-id: d224f6c514c9ecc48b832c998ad86fd104ae2faf
|
2015-10-13 11:26:17 -05:00 |
|
Nate Jensen
|
8a0031aeec
|
Merge "Omaha #4880 remove unused A1 avnfps code" into omaha_16.2.1
Former-commit-id: 3b2982a4eed9d28a5920376a9de9249cdc533274
|
2015-09-16 12:14:11 -05:00 |
|
Nate Jensen
|
a6c2a05e75
|
Merge "Omaha #4880 remove dead avnfps java code" into omaha_16.2.1
Former-commit-id: 892b612e66d7ab98afec1784929fc67d0708a9e2
|
2015-09-15 18:06:43 -05:00 |
|
Steve Harris
|
fbdce3bede
|
Merge tag 'OB_16.1.1-11' into omaha_16.2.1
16.1.1-11
Conflicts:
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 3104ad23039ebe9333df058e004e3c9a6cdb1a11
|
2015-09-15 15:43:10 -05:00 |
|
Nate Jensen
|
97c8f777a1
|
Omaha #4880 remove dead avnfps java code
Change-Id: Iefdc821cdb21f7947ee8c2d97a346ff532a61fb3
Former-commit-id: 50136bba2d368b68d41ce76c0ce0a660ff5e73ce
|
2015-09-15 14:01:51 -05:00 |
|
Nate Jensen
|
aacefea3d5
|
Omaha #4880 remove unused A1 avnfps code
Change-Id: I2f4ec83a7298614405dcf5ae6205ccca356e421c
Former-commit-id: e8083f3740c74bd315a4e2b92d93d5abe79d852f
|
2015-09-15 09:25:51 -05:00 |
|
Zhidong.Hao
|
81b94c87c4
|
ASM #17540 AvnFPS: Unable to set TAF default issuance time
Change-Id: I70cf4675c19575320b1763aa0e5c35f6336bea3b
Former-commit-id: 5141a592712ec56b95d3e954507624b5f2081f37
|
2015-08-28 11:27:27 -04:00 |
|
Steve Harris
|
b95fd6e5a2
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: 8de0a0d42550690492c701c11c551f53aca5b02f
|
2015-08-11 19:47:53 -05:00 |
|
Steve Harris
|
f696d5731d
|
Merge tag 'OB_16.1.1-2' into omaha_16.2.1
16.1.1-2
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java
Former-commit-id: 8053621c46adc8813128ecfa81c0834f670db64f
|
2015-08-03 17:06:31 -05:00 |
|
Matthew Howard
|
3dd1dc8bc6
|
Merge "ASM #17540 AvnFPS: Unable to set TAF default issuance time" into asm_16.1.1
Former-commit-id: 1081501a23f7fd8717e8ec091bcea99d0ad8bed8
|
2015-08-03 10:11:57 -05:00 |
|
Zhidong.Hao
|
0205e50e16
|
ASM #17540 AvnFPS: Unable to set TAF default issuance time
Change-Id: I0722ce915e7f3d209875b173db6e6f8ff4af798b
Former-commit-id: 349591330b4804078afc46a92ca17576288ddc67
|
2015-08-03 10:09:01 -04:00 |
|
David Friedman
|
4bdfeb8da8
|
Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
cave/build/static/linux/alertviz/alertviz.sh
cave/build/static/linux/cave/cave.sh
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226
Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
|
2015-07-30 20:53:19 +00:00 |
|
David Gillingham
|
e5d1de2aaa
|
Omaha #4544: Update AvnFPS to use new LAMP bufrmos lightning parameters.
Change-Id: I1c8e97e4bfd55082df3770b8321f34b0e4a1f208
Former-commit-id: e9f1505c8972f7ba362b64376421755f620e0201
|
2015-07-14 15:38:33 -05:00 |
|
Zhidong.Hao
|
3e12a5ecf4
|
ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
Change-Id: Ifa6ee6b0fb64ce2a4fd9a9ac0f7976e855242d33
Former-commit-id: fc4a2bcfb918cce995444464aefe92a438ba995f
|
2015-07-10 15:13:44 -04:00 |
|
Zhidong.Hao
|
02599a6039
|
ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
Change-Id: Ibfd5fa35b58ffd66eaf81945fb0b31f7ea632b65
Former-commit-id: 81c22bdd36a80a1f5deaf81926f8f07f24c929f9
|
2015-07-07 14:33:12 -04:00 |
|
Zhidong.Hao
|
4446a46179
|
ASM #16973 Drifting Snow abbrev (DRSN) not accepted in AvnFPS
Change-Id: I4547b9d761252725d911bbd4db50417c359db548
Former-commit-id: cb8a47032b697ef0caeb00f6b21e7857dc8e643b
|
2015-07-07 11:28:37 -04:00 |
|
Steve Harris
|
4de63454fc
|
Merge tag 'OB_15.1.1-16' into omaha_16.1.1
15.1.1-16
Conflicts:
cave/com.raytheon.viz.gfe/build.properties
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
|
2015-06-05 15:38:00 -05:00 |
|
Steve Harris
|
7e7cdd1c7a
|
Merge tag 'OB_15.1.1-14' into omaha_16.1.1
15.1.1-14
Conflicts:
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Former-commit-id: 92470a2ce7952ee72dbe2557ee16ee54d7ae901c
|
2015-06-04 11:08:19 -05:00 |
|
Matthew Howard
|
64fa93c1aa
|
Merge "ASM #17533 - get all rules in AvnFPS Monitoring Criteria window" into asm_15.1.1
Former-commit-id: 34eb6e4644918e798ede647752be99c60a5edbe0
|
2015-06-02 14:50:18 -05:00 |
|
Yun.Teng
|
871aaeab91
|
ASM #17533 - get all rules in AvnFPS Monitoring Criteria window
Change-Id: Icf1ffb6dd5849583e41ce3aab917df34006a4a22
Former-commit-id: 34987045d6e8df599d5f2ec0ca34c5ecabf5f4e8
|
2015-06-02 18:46:58 +01:00 |
|
Yun.Teng
|
f1b109a3fb
|
ASM #17417 - Display complete AvnFPS station list instead of one
Change-Id: I6de2526250d5c0df553c60668b690574bc4ba1f8
Former-commit-id: 4db44b41db3b13ac55f77752dca1e5ebf458b999
|
2015-05-28 17:08:25 -04:00 |
|
Roger Ferrel
|
ea022b29b9
|
Omaha #4275 MetarViewer modified pattern to pick SFC VIS values such as M1/4.
Former-commit-id: ccde21b7a9a0d506fae6aa2ebb1dab01f8bcca86
|
2015-05-22 13:16:05 -05:00 |
|
Steve Harris
|
9b3d8a8443
|
Merge tag 'OB_15.1.1-12' into omaha_16.1.1
15.1.1-12
Conflicts:
build/deploy.edex.awips2/esb/bin/setup.env
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
|
2015-05-20 11:25:45 -05:00 |
|
David Lovely
|
80dc4c85d9
|
Omaha #4146 Bundled class files in a jar when unpacked.
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
|
2015-05-19 10:23:35 -05:00 |
|
Roger Ferrel
|
83132e735c
|
Omaha #4275 Allow scfvis token with fraction starting with M. Example M1/4.
Change-Id: I10578bb24b1301c7814a670cf6f75776299f1839
Former-commit-id: ee5e67c6c7118e9f42f268efa34a5620a866e892
|
2015-05-14 15:19:26 -05:00 |
|
Roger Ferrel
|
8de10b653e
|
Omaha #4378 - Change vcnty token to allow optional plus or minus sign at start of the token.
Former-commit-id: a9cd797efeadcc231ef82e82851a6f69f00223ff
|
2015-05-14 12:25:20 -05:00 |
|
Yun.Teng
|
b605ae0bcd
|
ASM #17417 - AvnFPS retrieve multiple sites from configuration file
Change-Id: I0edf02ac1ae06a4a4d4ce926390cc7d003acba3c
Former-commit-id: 5c59562cb0fcfe0b1669cf5f19bb4a320e0f199b
|
2015-05-04 18:23:34 +01:00 |
|
Nate Jensen
|
7df44931e7
|
Omaha #4259 avnfps, textws, uengine, handleOUP, qc changes for jep 3.3
Change-Id: I409f6743f4d901fd7dbce250d277a693e00329ad
Former-commit-id: f5ad526339c73623da4ccc7aee9c6b0fd2f387b0
|
2015-04-30 14:41:13 -05:00 |
|
Nate Jensen
|
8dbe6abbe4
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
|
2014-12-03 15:47:10 -06:00 |
|
Steve Harris
|
3b6a8a1447
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
|
2014-09-29 12:58:56 -05:00 |
|
Zhidong.Hao
|
396519b17a
|
ASM #537 - fix for AvnFPS: Syntax failed to flag format error
Change-Id: I39615891fb92f876e06d13eb3232ee937ec9080a
Former-commit-id: 52d355b81fd7f7376d26f43ca6abe4d2ee744adf
|
2014-09-17 15:02:13 -04:00 |
|
Brian Clements
|
fc322a74b2
|
Omaha #3502 common.util changes
moved ConvertUtil, reworked StringUtil.split()
Change-Id: I82114f8a9ec7fb907c85258a070169dcba61be03
Former-commit-id: 72b5092e87e71f78fa35065dfc8bcb8e746f67b8
|
2014-08-07 16:48:57 -05:00 |
|
Roger Ferrel
|
42fe1bf5b2
|
Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: 787261f13c47b5de81b2e7c4f861645614a11f1f
|
2014-06-12 10:08:51 -05:00 |
|
Roger Ferrel
|
10e7a33f08
|
Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data.
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5
Former-commit-id: 3e976b7ed5cf46687bbb76073e53f35ffc2c2812
|
2014-06-04 08:14:06 -05:00 |
|
brian.dyke
|
58683ad040
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
|
2014-05-19 09:45:37 -04:00 |
|
Zhidong.Hao
|
074713bb4a
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 62f8c0ab0e046fd4365bd37394f93e8bca4e642d
|
2014-05-12 14:33:25 -04:00 |
|
Richard Peter
|
32957285fc
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 311c52426b3715d3a73c1fa79a8fd427a4b1b09d
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
3524838f9f
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: f54d2c639a915db14f01f56a7fcc5841b60e1509
|
2014-04-25 11:06:11 -04:00 |
|
Ron Anderson
|
f3185dd206
|
Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
Fixed Wx parsing for AvnFPS
Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73
Former-commit-id: e636563052042d2dbfab6a4e476b71004b28c165
|
2014-04-23 17:04:16 -05:00 |
|
Brian.Dyke
|
b8829139a2
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 712064db471de93da585f9c765bb4dfbe510df53
|
2014-04-17 14:42:35 -04:00 |
|
Richard Peter
|
21ae3b5fcd
|
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: bd13bc332bcdd87723bec8669885f4594ad483b9
|
2014-04-11 16:23:09 -05: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 |
|
Lee Venable
|
5b73c516d3
|
Issue #2925 - Fixed NPE found during testing.
Former-commit-id: 86306076f94bbfe4e063c4e6d82b7140b5911e61
|
2014-03-21 12:42:13 -05:00 |
|