xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33028 commits 31 branches 40 tags 3.8 GiB
Commit graph

1960 commits

Author SHA1 Message Date
Fay.Liang
3d25551183 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1 
Former-commit-id: 483383876bfe73eb58ec0eb314106288dab4d172
 2015-04-27 14:08:47 -04:00
Shawn.Hooper
0e6e87b762 Merge branch 'master_15.1.1' into asm_15.1.1 
Merges up to 15.1.1-7 back into the asm_15.1.1 branch.

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: Ica098ffb233837e4fcb718e9c75a78de443eb267

Former-commit-id: 78b3f7a15c5d2ab60235f40f5236bbbbe58d28ce
 2015-04-24 15:44:14 -04:00
Rici.Yu
c89a5c5afc ASM #17340 - Fix clipping zone selector map to domain issue 
Change-Id: Ie59580f02a6f145a5c23cb431ce042f2e25ac5a5

Former-commit-id: 5d7d7e956ce69945c5226dccca18942ba2052a80
 2015-04-23 10:46:26 -04:00
Ron Anderson
87286949fd Omaha #4027 More GFE changes for Mixed Case WA 
Change-Id: Ia1b65979d442246984b1e281c902c9f078fa4848

Former-commit-id: 0eef8697e269644ec36c1c7f7b09610778beb4a1
 2015-04-20 17:17:08 -05:00
Fay.Liang
197a0d9316 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 6dd4acc2c2 [formerly 5606e3cfa0 [formerly 03e663afae6eb0998892e2921566652f42196e1f]]
Former-commit-id: 5606e3cfa0
Former-commit-id: f28633c1d4
 2015-04-16 23:06:25 -04:00
Fay.Liang
5606e3cfa0 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 03e663afae6eb0998892e2921566652f42196e1f
 2015-04-16 23:06:25 -04:00
Rici.Yu
ac9c9f5aa9 ASM #14946 - fix issue when timezone is not defined for any zone in a segment 
Change-Id: I252f78cb9f5bf1cf556788c79fe14ad338b546aa

Former-commit-id: 03034f57c8 [formerly 3b59050996 [formerly ef4c5307d5693abd834f4210e081fb8e3a21f90b]]
Former-commit-id: 3b59050996
Former-commit-id: 524fa004d3
 2015-04-16 13:24:29 -04:00
Rici.Yu
3b59050996 ASM #14946 - fix issue when timezone is not defined for any zone in a segment 
Change-Id: I252f78cb9f5bf1cf556788c79fe14ad338b546aa

Former-commit-id: ef4c5307d5693abd834f4210e081fb8e3a21f90b
 2015-04-16 13:24:29 -04:00
Rici.Yu
8fee3a32f7 ASM #17390 - Fix string/int conversion issue preventing BOIVerify from launching 
Change-Id: I6c0a0ea22650a5b42b24b41e41e3ca0acabbf14b

Former-commit-id: c9337caeb2 [formerly c9955bce55 [formerly c6888b4aa86ed3425b5a016d2fbe5664763b4682]]
Former-commit-id: c9955bce55
Former-commit-id: c1511407bc
 2015-04-16 10:51:23 -04:00
Rici.Yu
c9955bce55 ASM #17390 - Fix string/int conversion issue preventing BOIVerify from launching 
Change-Id: I6c0a0ea22650a5b42b24b41e41e3ca0acabbf14b

Former-commit-id: c6888b4aa86ed3425b5a016d2fbe5664763b4682
 2015-04-16 10:51:23 -04:00
Fay.Liang
c31d3f0910 Merge tag 'OB_14.4.1-25' into master_15.1.1 
This merge includes all changes in 14.4.1-22, -23, -24, and -25

Conflicts:
	cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt

Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
 2015-04-13 13:02:24 -04:00
Fay.Liang
36f4f953cb Merge tag 'OB_14.3.3-2' into master_14.4.1 
14.3.3-2

Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: 618781f10c [formerly c8962caee7 [formerly f5fad51061f568aea4ea581a099ef8353758add6]]
Former-commit-id: c8962caee7
Former-commit-id: 8f3b4cb35a
 2015-04-06 15:40:31 -04:00
Fay.Liang
c8962caee7 Merge tag 'OB_14.3.3-2' into master_14.4.1 
14.3.3-2

Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: f5fad51061f568aea4ea581a099ef8353758add6
 2015-04-06 15:40:31 -04:00
Ron Anderson
c456aa2776 Merge "Omaha #4027 Convert all GFE text products to mixed case" into omaha_15.1.1 
Former-commit-id: 67762d2b731cba6e8846ff04609454b354fa89a6
 2015-04-02 17:05:47 -05:00
Rici.Yu
df0b9d2d0c ASM #17194 - convert SerpConfig.py from smart tool to utility 
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d

Former-commit-id: 0492e66d87 [formerly d47caf2552 [formerly 6968986c535bbadee8436cca5cfcc329d47c606b]]
Former-commit-id: d47caf2552
Former-commit-id: 466b38d20d
 2015-04-02 10:48:25 -04:00
Rici.Yu
d47caf2552 ASM #17194 - convert SerpConfig.py from smart tool to utility 
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d

Former-commit-id: 6968986c535bbadee8436cca5cfcc329d47c606b
 2015-04-02 10:48:25 -04:00
Steve Harris
1aab7b1831 Merge tag 'OB_15.1.1-2m' into omaha_15.1.1 
15.1.1-2m

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
 2015-03-30 11:07:52 -05:00
Ron Anderson
e6cfc5f40d Omaha #4027 Convert all GFE text products to mixed case 
Change-Id: I94275b65e8733d5bed1242f78503f1613b2e0aff

Former-commit-id: 07088e71d78d6302da23683894d96d72e4f69a96
 2015-03-26 18:30:39 -05:00
Steve Harris
25bd3ee930 Merge tag 'OB_14.4.1-20m' into omaha_15.1.1 
14.4.1-20m

 Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
 2015-03-26 09:57:17 -05:00
Ron Anderson
1e82efdb12 Omaha #4313 Updated Service Backup html help files for Multi-Site capability 
Change-Id: I5d456a87ea651e377366c3826edacc29cfe38d5f

Former-commit-id: 2fb059379d95abe1762cde7258dd722319fc0165
 2015-03-25 10:53:36 -05:00
Ron Anderson
7aa3d76477 Omaha #4300 Minor updates to the Service Backup Dialogs 
Change-Id: I409be11a06ff181f184d22dea311c6b0a7e96cca

Former-commit-id: 6833a9db5bc8c0187ce999d8a7f310bcd4892ad2
 2015-03-25 10:46:36 -05:00
Ron Anderson
dcfd2c2e7c Omaha #4300 Client-side changes for multi-site service backup 
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034

Former-commit-id: 8daff8d5bb3e1bbf23a559671040cae4a03c9911
 2015-03-23 16:08:31 -05:00
Fay.Liang
fb86bbc988 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: 53bdc83ba4 [formerly f2e952b71a [formerly dd741e026ef0599738bbbc82579a679b57feeef7]]
Former-commit-id: f2e952b71a
Former-commit-id: af80d5b682
 2015-03-19 17:18:52 -04:00
Fay.Liang
f2e952b71a Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: dd741e026ef0599738bbbc82579a679b57feeef7
 2015-03-19 17:18:52 -04:00
David Gillingham
fd5b270fdd Omaha #4103: Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status. 
NOTE: Service Backup features are broken until DR 4300 lands on this branch.

Change-Id: Ic0184c10c553187c8d0515f639c5a33fd3abde1f

Former-commit-id: 732208b6600882a9ba9fcc0eefd7c8be0157beab
 2015-03-19 16:13:56 -05:00
Paul Grell
72b1a9ee64 Merge "Revert "Revert "ASM #17217 - GFE: default to smart formatter types""" into asm_14.4.1 
Former-commit-id: f47e4fdcff [formerly 81c34481c1 [formerly 60344f611d90d46fffcf2a05230670b72f303916]]
Former-commit-id: 81c34481c1
Former-commit-id: 2d17527faa
 2015-03-19 16:05:49 -05:00
Paul Grell
81c34481c1 Merge "Revert "Revert "ASM #17217 - GFE: default to smart formatter types""" into asm_14.4.1 
Former-commit-id: 60344f611d90d46fffcf2a05230670b72f303916
 2015-03-19 16:05:49 -05:00
Paul Grell
bdf62a0cdd Revert "Revert "ASM #17217 - GFE: default to smart formatter types"" 
This reverts commit f4920cc0b9 [formerly f31cdc6925] [formerly 2495ce971f] [formerly b1d84d2964 [formerly 2495ce971f [formerly 111f2d19b08ded3e5ab05406f475da8245af851f]]].

Change-Id: I17493c7867a87fd53814fcc16c7e248a3ee7cddf

Former-commit-id: 3b71d36945 [formerly 07491fe499 [formerly 8c93f552b1af035c1de2f8d9ce71a82c85776afc]]
Former-commit-id: 07491fe499
Former-commit-id: b36de51998
 2015-03-19 16:02:22 -05:00
Paul Grell
07491fe499 Revert "Revert "ASM #17217 - GFE: default to smart formatter types"" 
This reverts commit 2495ce971f [formerly 111f2d19b08ded3e5ab05406f475da8245af851f].

Change-Id: I17493c7867a87fd53814fcc16c7e248a3ee7cddf

Former-commit-id: 8c93f552b1af035c1de2f8d9ce71a82c85776afc
 2015-03-19 16:02:22 -05:00
Fay.Liang
2eb8777058 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1 
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/build.edex/edex/common.properties

Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
 2015-03-19 12:35:31 -04:00
Fay.Liang
15560cc42e Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: 475019fb61 [formerly 0284b3b7e9 [formerly e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e]]
Former-commit-id: 0284b3b7e9
Former-commit-id: 228e85dcb9
 2015-03-18 15:12:56 -04:00
Fay.Liang
0284b3b7e9 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e
 2015-03-18 15:12:56 -04:00
Paul Grell
8f9ec5ac48 Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1 
Former-commit-id: 4b1cec4b99 [formerly b28a5d5350 [formerly 4601ad77a9e49efaf34d4563baddcdf61dbd5804]]
Former-commit-id: b28a5d5350
Former-commit-id: d0daa26bdb
 2015-03-18 10:44:10 -05:00
Paul Grell
b28a5d5350 Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1 
Former-commit-id: 4601ad77a9e49efaf34d4563baddcdf61dbd5804
 2015-03-18 10:44:10 -05:00
Paul Grell
f4920cc0b9 Revert "ASM #17217 - GFE: default to smart formatter types" 
This reverts commit 2b5a21a115 [formerly d5ca25bb18] [formerly dc489dabe2] [formerly 70e5e24941 [formerly dc489dabe2 [formerly 81aea3167f21670d7b41eec5458a1f7d36edb36a]]].

As requested by Matt Howard email, reverting to remove from build 14.4.1-19

Change-Id: I8517fa02f22089d1d8433007e85ffa5a38274294

Former-commit-id: b1d84d2964 [formerly 2495ce971f [formerly 111f2d19b08ded3e5ab05406f475da8245af851f]]
Former-commit-id: 2495ce971f
Former-commit-id: f31cdc6925
 2015-03-18 09:36:12 -05:00
Paul Grell
2495ce971f Revert "ASM #17217 - GFE: default to smart formatter types" 
This reverts commit dc489dabe2 [formerly 81aea3167f21670d7b41eec5458a1f7d36edb36a].

As requested by Matt Howard email, reverting to remove from build 14.4.1-19

Change-Id: I8517fa02f22089d1d8433007e85ffa5a38274294

Former-commit-id: 111f2d19b08ded3e5ab05406f475da8245af851f
 2015-03-18 09:36:12 -05:00
Rici.Yu
d602aa1fcd ASM #17217 - Add fullStationID entry for table products 
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847

Former-commit-id: 6a7fbec942 [formerly 72af59fcb6 [formerly a987fe4493e4e58618271fffb37a708185ed4139]]
Former-commit-id: 72af59fcb6
Former-commit-id: 26ae2cded5
 2015-03-18 10:30:38 -04:00
Rici.Yu
72af59fcb6 ASM #17217 - Add fullStationID entry for table products 
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847

Former-commit-id: a987fe4493e4e58618271fffb37a708185ed4139
 2015-03-18 10:30:38 -04:00
Steve Harris
2fd5ba420f Merge tag 'OB_14.4.1-18m' into omaha_15.1.1 
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
 2015-03-18 09:29:01 -05:00
Rici.Yu
2b5a21a115 ASM #17217 - GFE: default to smart formatter types 
Change-Id: Ib831998a7293e61a5b606d03ef19f47b09f2e0d5

Former-commit-id: 70e5e24941 [formerly dc489dabe2 [formerly 81aea3167f21670d7b41eec5458a1f7d36edb36a]]
Former-commit-id: dc489dabe2
Former-commit-id: d5ca25bb18
 2015-03-17 11:26:37 -04:00
Rici.Yu
dc489dabe2 ASM #17217 - GFE: default to smart formatter types 
Change-Id: Ib831998a7293e61a5b606d03ef19f47b09f2e0d5

Former-commit-id: 81aea3167f21670d7b41eec5458a1f7d36edb36a
 2015-03-17 11:26:37 -04:00
Ron Anderson
61cb550ad4 Omaha #4246 Changes to support VCModules at base, site, and user levels 
Change-Id: I995ad5c185ec8c5f0056f28f7e2e1c5b5d7395fc

Former-commit-id: 33c2ab1111deb0ede6a3196d889475bc69dd63d4
 2015-03-12 18:09:58 -05:00
Ron Anderson
fb6168d190 Omaha #3955 Additional updates to try to make the procedures more bulletproof. 
Change-Id: Ie4c9d02c880dd460ef3470db9c68f5a67c0e924c

Former-commit-id: 1ff0a8ab8715a780fdc14db7f81f1708567fdc78
 2015-03-12 16:23:37 -05:00
Ron Anderson
0503bc3994 Omaha #3955 Fix regression that brok ViewWCL 
Change-Id: Ib1ff4137004cff22ef94e8029bbc62875992252e

Former-commit-id: 6af18dc2a364507481a119661f940aa420e379a9
 2015-03-12 12:58:00 -05:00
Steve Harris
379163b888 Merge tag 'OB_14.4.1-16m' into omaha_15.1.1 
14.4.1-16m


Former-commit-id: 468600e9d5144873e5af1529ae0d38673e81bb17
 2015-03-09 18:54:39 -05:00
Fay.Liang
1138f48ee9 Merge tag 'OB_14.3.2-19m' into master_14.4.1 
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.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.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 0e475cb704 [formerly 059eb032b1 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]
Former-commit-id: 059eb032b1
Former-commit-id: a9945f1981
 2015-03-09 16:11:13 -04:00
Fay.Liang
059eb032b1 Merge tag 'OB_14.3.2-19m' into master_14.4.1 
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.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.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
 2015-03-09 16:11:13 -04:00
Shawn.Hooper
b332c872ed ASM #17178 - Update TCMWindTool to remove option for background Wind field 
Change-Id: Ia299900784b9fe05a68ca25a74528abdc68a3f1f

Former-commit-id: 54d5553a93 [formerly c0b675033a [formerly bc4ec070e81298f7ed7312692a7f43cbd2d854ec]]
Former-commit-id: c0b675033a
Former-commit-id: a9a2bddc61
 2015-03-05 12:58:44 -05:00
Shawn.Hooper
c0b675033a ASM #17178 - Update TCMWindTool to remove option for background Wind field 
Change-Id: Ia299900784b9fe05a68ca25a74528abdc68a3f1f

Former-commit-id: bc4ec070e81298f7ed7312692a7f43cbd2d854ec
 2015-03-05 12:58:44 -05:00
Fay.Liang
065ce3318a Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 1ed5d493fa [formerly f00b3d3156 [formerly c91a37257cd2882047e79200f624acc1e0312cba]]
Former-commit-id: f00b3d3156
Former-commit-id: 07c0347c3e
 2015-03-03 14:44:31 -05:00