Brian.Dyke
cf09c46335
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 814b9a2869
[formerly 41921f7db2
[formerly 60756ddb841a0daa347493047b76d2fcb93f7f4a]]
Former-commit-id: 41921f7db2
Former-commit-id: 858cfa1078
2014-09-26 15:15:57 -04:00
Brian.Dyke
67a9c88d27
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: a4f68caac6
[formerly 8245370186
[formerly 6ed90023551e25216c10d05f2568593992326900]]
Former-commit-id: 8245370186
Former-commit-id: f520ff97b6
2014-09-26 13:02:49 -04:00
Richard Peter
472d8b2f38
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications. Check in the rest of the changes I missed the first time." into omaha_14.4.1
...
Former-commit-id: 1656522716
[formerly 941305b33d
[formerly 3daaa4e6b33bd284a088f290b40b7f63b4c27a43]]
Former-commit-id: 941305b33d
Former-commit-id: 5b023b628e
2014-09-26 11:44:41 -05:00
Ron Anderson
3708671dfb
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Check in the rest of the changes I missed the first time.
Change-Id: I8640f8f09aeb6019374a857daf335b27c69e0880
Former-commit-id: 43d3aca5ea
[formerly b032f7f24e
[formerly 67d19df57e57a77a0a1a83e695631a7a9cb22368]]
Former-commit-id: b032f7f24e
Former-commit-id: e2d5bfa0b6
2014-09-26 11:39:06 -05:00
Richard Peter
f2199a38d4
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications." into omaha_14.4.1
...
Former-commit-id: 23747ad042
[formerly a4668b64a6
[formerly acbc667cfeab1ab6449a93967896e6e303bb238d]]
Former-commit-id: a4668b64a6
Former-commit-id: c9c4dda54c
2014-09-26 11:27:53 -05:00
Brian.Dyke
3b71fe393a
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
...
Former-commit-id: bd983e1932
[formerly 586a504500
[formerly d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7]]
Former-commit-id: 586a504500
Former-commit-id: 0045c3100f
2014-09-26 11:47:38 -04:00
Ron Anderson
371589fc61
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Change-Id: I647bf118f558721867722cfc13d889e637237911
Former-commit-id: dd4f22789a
[formerly 92575e8db3
[formerly 8f687189a5c71f3bd04b5e31f6a45606fe456386]]
Former-commit-id: 92575e8db3
Former-commit-id: 71aad3ecff
2014-09-26 15:19:08 +00:00
Shawn.Hooper
645452e694
ASM #600 - WarnGen: template optional watch inclusion
...
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 831af82c23
[formerly da77322fd0
[formerly 04bd69f437b897d63ac78d6cbd7c60451366cc6d]]
Former-commit-id: da77322fd0
Former-commit-id: 56cd6483ef
2014-09-25 16:25:43 -04:00
Ron Anderson
7b2a988bee
Issue #3648 Fix GridParmManager.d2dGridDataPurged() to use deallocateDb.
...
Change-Id: Id9bb73c54028615c33a61373d7b565a230867c1a
Former-commit-id: 34df50963e
[formerly 7020daa55a
[formerly 8c177752b8e2baa2e739fc69320c4e4b31d972c7]]
Former-commit-id: 7020daa55a
Former-commit-id: df1d9f8b72
2014-09-25 13:48:11 -05:00
Ana Rivera
cfd6a847d6
VLab Issue #4836 - O&M RM14013; Update aKrtmaNDFD.xml; fixes #4836
...
Change-Id: I18d92482782e4c95cdd147d1edb1f65f3865b98f
Former-commit-id: c1b58f214f
[formerly 39fc13eb38
[formerly cf3d9a81a52c19977371e3abee755d1c239b1f8a]]
Former-commit-id: 39fc13eb38
Former-commit-id: 043ec96c2d
2014-09-25 18:18:21 +00:00
Kevin.Johnson
42254be5e5
ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
...
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7
Former-commit-id: 4d8efeeb9a
[formerly 5a38528711
[formerly c36b732cc8057cf7b830de647998f679725760da]]
Former-commit-id: 5a38528711
Former-commit-id: 7d677d0023
2014-09-25 10:50:07 -04:00
Nate Jensen
b7ebdc03a8
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
...
Former-commit-id: 174b036c56
[formerly 364aff9278
[formerly e2f23221c3f8301460df2945deb8c760cdf216e9]]
Former-commit-id: 364aff9278
Former-commit-id: e74bfdc195
2014-09-25 08:44:50 -05:00
Baoyu Yin
9e899d0b4e
VLab Issue #4553 - AWIPS2_DR_16047: An update for Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
...
Change-Id: Ib4e566154c6b8282efb33464b850ff1f66a5e6d0
Former-commit-id: c9385c0912
[formerly dea223412e
[formerly 847ecb836cf5d7bad28817dd68e752e4ba79f6c4]]
Former-commit-id: dea223412e
Former-commit-id: e9e3ad94ab
2014-09-25 09:44:21 -04:00
Slav Korolev
87c7787cb2
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
...
Former-commit-id: ce2ef5019b
[formerly 7b1a4c6774
[formerly d7a921d6206f5b09e7a6784c7e86b9167b74685f]]
Former-commit-id: 7b1a4c6774
Former-commit-id: 1120f9a440
2014-09-25 09:02:27 -04:00
Nate Jensen
d01c6840cb
Omaha #3663 move airep and pirep plguins to ncep features
...
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219
Former-commit-id: 36556fc48b
[formerly 4cf93c0acb
[formerly 8f743862722b2af08e6659ca3beb0366095bcf79]]
Former-commit-id: 4cf93c0acb
Former-commit-id: 86b76b399d
2014-09-24 15:20:17 -05:00
Ana Rivera
17f629b3b6
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
...
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: 9a0e9b17f4
[formerly 535f254357
[formerly 2c16492202230dcbec93cf390b47f400a77a545e]]
Former-commit-id: 535f254357
Former-commit-id: bb533d9ddd
2014-09-24 20:11:29 +00:00
Benjamin Phillippe
4ca05061de
Issue #3560 Fixed slow memory leak in registry
...
Former-commit-id: 81870960e6
[formerly fb8dc9fe7d
[formerly 918119b26864ee246ac2571baa4e380ae21f2ded]]
Former-commit-id: fb8dc9fe7d
Former-commit-id: c7d6c602bd
2014-09-24 14:36:34 -05:00
Brian.Dyke
6dafb062e9
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
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
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: 87fa32d2d4
[formerly 4b418918d4
[formerly e04ad21771ce410beb25e15fe300a34796a1a062]]
Former-commit-id: 4b418918d4
Former-commit-id: b49b13f77e
2014-09-24 11:05:37 -04:00
Slav Korolev
d8f3f75c07
Issue #2757 - Fixed problem with adding and removing zones.
...
Former-commit-id: a4914bd85d
[formerly 443c7c7482
[formerly 31ccaf218df628327fe4b27d69a4500eb1dc8d84]]
Former-commit-id: 443c7c7482
Former-commit-id: 4c209b4958
2014-09-24 09:34:43 -04:00
Ron Anderson
ab1773e62e
Issue #3648 Improve GFE error handling for getAllAvailableParms.
...
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf
Former-commit-id: c37618c16c
[formerly 429de3224f
[formerly b77b3c916b4dcc9034408220006f941cd301ed3c]]
Former-commit-id: 429de3224f
Former-commit-id: 8d0d43a437
2014-09-23 18:47:38 -05:00
Ron Anderson
fc5854eac7
Issue #3648 Change GFE version purging to be event driven.
...
Change-Id: I204a37535464d6d04dddd0614716dfe8f51ef40e
Former-commit-id: 580db71dc8
[formerly 25a41ff9db
[formerly ad725686f80a1f67ca6865859ad4f072edd1c54f]]
Former-commit-id: 25a41ff9db
Former-commit-id: b0bb1aba4b
2014-09-23 13:43:14 -05:00
David Friedman
c4d6fe5af5
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: 2ee1ebe72d
[formerly a6acf71a0a
[formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]]
Former-commit-id: a6acf71a0a
Former-commit-id: 0ed1ce5726
2014-09-23 18:39:22 +00:00
Nate Jensen
8084bfdf35
Merge "Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools" into omaha_14.4.1
...
Former-commit-id: 3ae54c26c6
[formerly c9033dc300
[formerly 21ad2f0d0229235495edc9319e8493d8a6b4d6b4]]
Former-commit-id: c9033dc300
Former-commit-id: 5582df03b9
2014-09-23 12:15:56 -05:00
Mark Peters
bfd99d02af
Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
...
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65
Former-commit-id: 9176913542
[formerly bd5996a599
[formerly 1350720111ceeb83893c5c0129eb41d662d16211]]
Former-commit-id: bd5996a599
Former-commit-id: 27f5ae502d
2014-09-23 12:12:22 -05:00
Steve Harris
db4aa1cebe
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: b979960b7b
[formerly 7692e3f21d
[formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]
Former-commit-id: 7692e3f21d
Former-commit-id: 2e2072a963
2014-09-23 11:41:10 -05:00
Nate Jensen
69d77c36b3
Merge "Omaha #3356 fix apps_dir setting detection in viz/cave" into omaha_14.4.1
...
Former-commit-id: 29ee81f50c
[formerly 39f330b583
[formerly 39c26499805dc23b232397a2f9349ed17564ae13]]
Former-commit-id: 39f330b583
Former-commit-id: 3e82c0f768
2014-09-23 09:52:22 -05:00
Shawn.Hooper
742512a663
ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff
...
Change-Id: Ibd5d2caad16de2ab2a645b507c0e00bea61e9d5e
Former-commit-id: 94b3acd437
[formerly 99f6ff6d0a
[formerly 4ddd428c4168eb90b6d9b01db2e0bdd02206a9e7]]
Former-commit-id: 99f6ff6d0a
Former-commit-id: 77b4daa18e
2014-09-23 10:44:38 -04:00
Nate Jensen
de8cddaf94
Merge "Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools" into omaha_14.4.1
...
Former-commit-id: 16f91ce391
[formerly 2a675e48dd
[formerly 677421b80157aa32c2ccf484eebe8e0a6a4c304f]]
Former-commit-id: 2a675e48dd
Former-commit-id: 54fa54ef31
2014-09-23 09:00:59 -05:00
Steve Harris
502bbdc81c
Merge branch 'master_14.3.1' (14.3.1-20) into omaha_14.3.1
...
Former-commit-id: 00eda3f982
[formerly 3301300c7e
[formerly 68ff0acbe3739e2fd3aa89b13ed070c39db48551]]
Former-commit-id: 3301300c7e
Former-commit-id: fa6f4c608d
2014-09-22 22:18:26 -05:00
Steve Harris
285088805a
Merge branch 'master_14.2.4' (14.2.4-12) into omaha_14.2.4
...
Former-commit-id: b1931ae7dc
[formerly 38daf108e6
[formerly 9bc599dd5481360d7a00b9c8455805893922127d]]
Former-commit-id: 38daf108e6
Former-commit-id: 7aa6719ca2
2014-09-22 22:06:05 -05:00
Nate Jensen
2477ef370c
Omaha #3356 fix apps_dir setting detection in viz/cave
...
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3
Former-commit-id: e637963736
[formerly e163ae0e5b
[formerly ca8195c7835b9d96158d048fdd548cc744ba96bc]]
Former-commit-id: e163ae0e5b
Former-commit-id: 9ef3bce809
2014-09-22 13:00:04 -05:00
Ron Anderson
80430aa444
Issue #3526 Fix errors found during testing in SS
...
Change-Id: Ic2a7f0b38f57fcae6b3fea904a457642472b2157
Former-commit-id: ba501a4210
[formerly 5407eb6a71
[formerly 0e3e60bcc4b8adcb9efa51df28d4b35bb6228ed7]]
Former-commit-id: 5407eb6a71
Former-commit-id: 12dbec98fd
2014-09-22 11:34:31 -05:00
Nate Jensen
a2352c7c09
Omaha #3356 fix ingestDat startup issues
...
Change-Id: I47b66fd753513230849dd2710f518511895602fc
Former-commit-id: cbd5b270b5
[formerly 9ac3ad9890
[formerly f5ca6846eee39074abc856a1d2c9f6ed58ae0cff]]
Former-commit-id: 9ac3ad9890
Former-commit-id: b7f93f7a4d
2014-09-22 10:59:10 -05:00
Brian.Dyke
2b25aa4b01
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 1018c65552
[formerly c0dc990974
[formerly 41a854146a3f4ab156b63e2ea24e60681fc586f2]]
Former-commit-id: c0dc990974
Former-commit-id: b94198ffb3
2014-09-19 16:59:12 -04:00
Brian.Dyke
32d63dff6f
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 8d665b93b5
[formerly 4db67c581c
[formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]
Former-commit-id: 4db67c581c
Former-commit-id: 75f3bb31d5
2014-09-19 16:56:50 -04:00
Mark Peters
d065b2610f
Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools
...
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f
Former-commit-id: c5da5ccb9b
[formerly 3f1e21107b
[formerly 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc]]
Former-commit-id: 3f1e21107b
Former-commit-id: 68044d2dd7
2014-09-19 14:02:54 -05:00
Baoyu Yin
0ed507f8d1
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
...
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d
Former-commit-id: 28b7e8d6e2
[formerly 8568cd8419
[formerly f077d3cd4084faf8ad7c8865e84df53e59a5db72]]
Former-commit-id: 8568cd8419
Former-commit-id: 957c12653b
2014-09-19 15:02:23 -04:00
Brian.Dyke
3791bd2cae
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 9c33ae6d2c
[formerly 6ad8d500ef
[formerly e895f7927a95c2416c05953e131d9e0c6095beb3]]
Former-commit-id: 6ad8d500ef
Former-commit-id: 9fc3eb20c1
2014-09-19 14:42:29 -04:00
Brian.Dyke
1704e76ac1
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: e601d3fa51
[formerly 7f49052445
[formerly 88e26cd8b378ffc81db87aee226ceca47ae58aa7]]
Former-commit-id: 7f49052445
Former-commit-id: 279f67ff54
2014-09-19 13:08:06 -04:00
Darrel Kingfield
48387a6bcf
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
...
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: 88a8dddef3
[formerly 1cabae50b1
[formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]
Former-commit-id: 1cabae50b1
Former-commit-id: 3eeaa8f359
2014-09-19 11:14:09 -05:00
Steve Harris
813f2ec1a9
Merge branch 'master_14.3.1' (14.3.1-19) into omaha_14.3.1
...
Former-commit-id: fbab75af66
[formerly 07a7645fcd
[formerly c72e05b87f6eb6d094bde5e7caec3cccb20476ce]]
Former-commit-id: 07a7645fcd
Former-commit-id: 0ef8105b04
2014-09-19 11:13:46 -05:00
Steve Harris
e3a7796362
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: 4c56844e29
[formerly 091555cf10
[formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 091555cf10
Former-commit-id: da530db540
2014-09-19 10:28:57 -05:00
Nate Jensen
08b017edad
Merge "Omaha #3623 Created command line utilities to activate/deactivate sites" into omaha_14.4.1
...
Former-commit-id: 51bbc3351b
[formerly dc49c41b39
[formerly fba50e36f951594f6c8bb069ceb9b8a82a02ad89]]
Former-commit-id: dc49c41b39
Former-commit-id: 7d574ec247
2014-09-17 15:27:50 -05:00
Brian.Dyke
80f677e1e3
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 57a361073d
[formerly e1c88f287a
[formerly 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f]]
Former-commit-id: e1c88f287a
Former-commit-id: 1c0d6624a3
2014-09-17 15:50:13 -04:00
Brian.Dyke
cad0d0b87c
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 0f6b0f3d9d
[formerly a155bbd8c1
[formerly 0813f96fbb673fdbbdb2c0f049ec722a80b212f9]]
Former-commit-id: a155bbd8c1
Former-commit-id: 125760432b
2014-09-17 15:45:27 -04:00
Ron Anderson
c3d77cb778
Omaha #3623 Created command line utilities to activate/deactivate sites
...
Change-Id: I2bc0a10caf51129af06aa4ae4cb1f0471bc49408
Former-commit-id: b09244975e
[formerly e8db5a1bbf
[formerly 670a9bd71874fbd6fecd0c9df5567ad342892333]]
Former-commit-id: e8db5a1bbf
Former-commit-id: f0e06502ee
2014-09-17 14:35:47 -05:00
Brian.Dyke
bdffe16188
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 97dfb04eb6
[formerly 4bd417b313
[formerly 1f186fb314e78d93adefe03faaa71f348ee207c7]]
Former-commit-id: 4bd417b313
Former-commit-id: c2033ff569
2014-09-17 13:32:25 -04:00
Richard Peter
b81ebfda25
Merge "Omaha #2707 LSR rework" into omaha_14.4.1
...
Former-commit-id: e2bd527996
[formerly cf7fee3b58
[formerly e9636595208e033882c6f7ec85329845a99cb66b]]
Former-commit-id: cf7fee3b58
Former-commit-id: 1304c2b343
2014-09-17 11:22:45 -05:00
Brian Clements
9f4315eb5c
Omaha #2707 LSR rework
...
removed dataURI column from DB
removed eventType from hdf5
eventType in DB now string
unknown event types now render direct
Change-Id: I24f5041f761758371dcef1fd1157be0bcf329e73
Former-commit-id: 6fd51c01fe
[formerly 423421175f
[formerly 9950454fbe4158bcfcb9d3ce25abafad4d012556]]
Former-commit-id: 423421175f
Former-commit-id: 84f85d1436
2014-09-17 10:57:07 -05:00
Brian Clements
6cd4e130fb
Omaha #3015 improved exception handling for MPE lightning
...
Change-Id: I3ab01d811bf49dbeced48d43744b93d470815636
Former-commit-id: 246dcda707
[formerly eccfebaa96
[formerly 57f997f93e7e063ad6f24074ab3d1b8f02962bb8]]
Former-commit-id: eccfebaa96
Former-commit-id: 9aa1cb03e1
2014-09-17 10:30:08 -05:00