Brian.Dyke
|
f3b51b9187
|
Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: 15381f5e9f [formerly 7b7ef56b04 ] [formerly a610fe6475 [formerly a77577595da1e2dcc8057c5a8b8643a612780339]]
Former-commit-id: a610fe6475
Former-commit-id: e64fe3875e
|
2014-09-04 15:59:00 -04:00 |
|
Brian.Dyke
|
1ee7743b8b
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: c586c26447 [formerly e762271240 ] [formerly e5227e90de [formerly ad120a9357402fbdedb350cabe88d2becf5d7361]]
Former-commit-id: e5227e90de
Former-commit-id: c48196cd33
|
2014-09-04 14:18:34 -04:00 |
|
Qinglu.Lin
|
920b6bb53b
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: 62bcefb9e1 [formerly 8c28597210 ] [formerly 902b6c55bd [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]
Former-commit-id: 902b6c55bd
Former-commit-id: 9c67b89df7
|
2014-09-04 14:09:24 -04:00 |
|
Brian.Dyke
|
6d69d0678c
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 2b613a26fd [formerly 72e2882496 ] [formerly 9e94c2c571 [formerly 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36]]
Former-commit-id: 9e94c2c571
Former-commit-id: 5a1fa755f9
|
2014-09-04 14:01:26 -04:00 |
|
Nate Jensen
|
6d47c3c987
|
Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320
Former-commit-id: a1bccdc57f [formerly 2cfbfc1dc4 ] [formerly 87d507313b [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]
Former-commit-id: 87d507313b
Former-commit-id: b1619c055a
|
2014-09-04 10:10:37 -05:00 |
|
Baoyu Yin
|
83de62e506
|
VLab Issue #4608 - AWIPS2_DR_16259 Minor Typo in Volume Menu of D2D 4-PanelFamilies ; fixes #4608
Change-Id: I73a3f5a441e33dffe3dc7f3962c3fceec930ce3a
Former-commit-id: 5ad996e60e [formerly 9e110936e8 ] [formerly 73f7935f46 [formerly cb4e2e652ba3763725b8ec7e6d528748d2472a6b]]
Former-commit-id: 73f7935f46
Former-commit-id: 17268bb5dd
|
2014-09-04 08:23:53 -04:00 |
|
Baoyu Yin
|
cbd1062ca8
|
VLab Issue #4567 - AWIPS2_DR_16933: Text Script Editor Edit Menu Delete Line Option; fixes #4567
Change-Id: I10e1dbdd6352adcfa39ae8980230a95afdc8cec1
Former-commit-id: 7f80279179 [formerly fd229c716d ] [formerly 309e1bc684 [formerly d9f69c85c6432a937f70c16053f45d5214ce5147]]
Former-commit-id: 309e1bc684
Former-commit-id: ba01db8d69
|
2014-09-04 07:53:38 -04:00 |
|
Brian.Dyke
|
947d137798
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: fa6b302ab6 [formerly 043a95d35e ] [formerly d695dd0084 [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]]
Former-commit-id: d695dd0084
Former-commit-id: 62a70ef5ca
|
2014-09-03 21:14:27 -04:00 |
|
Brian.Dyke
|
50858cac9f
|
ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: 3ddb5831a0 [formerly 121a2d100f ] [formerly cfe03adff6 [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]]
Former-commit-id: cfe03adff6
Former-commit-id: e8a85da57a
|
2014-09-03 21:10:16 -04:00 |
|
Steve Harris
|
550eb6e3ac
|
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 0ea6b72088 [formerly 0e869fa6c1 ] [formerly afa45bf919 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]]
Former-commit-id: afa45bf919
Former-commit-id: e3d99832ec
|
2014-09-03 15:22:00 -05:00 |
|
Stephen Gilbert
|
66f12874c0
|
VLab Issue #4003 - NCEP CAVE Plugins delivery for 14.2.1-n
NSharp, Pgen, and AWW updates.
Change-Id: Iba41d0974993ffcbd31e2642de490731c2145b2c
Former-commit-id: 6413e563d4 [formerly cd743e857b ] [formerly 8c9a49ffa8 [formerly a23938512b73efe78843d13d4f17539978ca84fe]]
Former-commit-id: 8c9a49ffa8
Former-commit-id: 7da72f9d6f
|
2014-09-03 15:12:48 -04:00 |
|
Stephen Gilbert
|
e69a3cbf72
|
VLab Issue #4350 - NTRANS resource selection GUI enhancements
Change-Id: Ic4ae8c69e53b373fc7c473921af3fe286c1f2b02
Former-commit-id: e8ed3853ae [formerly fee757ff1d ] [formerly eddd40fa96 [formerly e69657f6e114e2559f991d1b520bc57b18a3e763]]
Former-commit-id: eddd40fa96
Former-commit-id: 1670c71764
|
2014-09-03 14:59:30 -04:00 |
|
Chip Gobs
|
ab57f9a631
|
Merge remote-tracking branch 'origin/master_14.3.1' into ohd_14.3.1_v6
Former-commit-id: bc743b7bd7 [formerly 0278dfb45f ] [formerly 51f2d9df8e [formerly 2131a59fecbb9bc01dd395360f7f8dafe6d76b0b]]
Former-commit-id: 51f2d9df8e
Former-commit-id: 4ca70c7f7e
|
2014-09-03 14:48:29 -04:00 |
|
Stephen Gilbert
|
3353687520
|
VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
AWW and Upper Air updates. Revert some RTS xml files
Change-Id: I4cc48defcea33b9008c9734c1c53a193d0ce94da
Former-commit-id: 4abe38b3ac [formerly 32dffe58c8 ] [formerly 75277cb034 [formerly 72fa8af848f1452a517a62c6a54eae265a9ec8a1]]
Former-commit-id: 75277cb034
Former-commit-id: 3da185fa1a
|
2014-09-03 14:33:37 -04:00 |
|
Richard Peter
|
1277318360
|
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
Former-commit-id: 1c05f1b459 [formerly 3de26efce6 ] [formerly af87813ea9 [formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]]
Former-commit-id: af87813ea9
Former-commit-id: ad59d54110
|
2014-09-03 09:42:34 -05:00 |
|
Nate Jensen
|
e5f28ab1f9
|
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
Former-commit-id: a690b853bb [formerly 0f35426ad0 ] [formerly c23071f48c [formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]]
Former-commit-id: c23071f48c
Former-commit-id: d9d0068a1c
|
2014-09-02 17:34:59 -05:00 |
|
Brian.Dyke
|
75fccb7361
|
Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: 9e156775e5 [formerly fd8ad016ef ] [formerly 14e64881a1 [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]
Former-commit-id: 14e64881a1
Former-commit-id: 43c9dfa397
|
2014-09-02 16:32:54 -04:00 |
|
Brian.Dyke
|
3b9653ef00
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: e425e5bf8c [formerly f0875e724f ] [formerly 611e036e75 [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]
Former-commit-id: 611e036e75
Former-commit-id: caf5f778e9
|
2014-09-02 16:30:51 -04:00 |
|
Benjamin Phillippe
|
df919cf8e3
|
Issue #3560 Registry objects not re-sent after fully sync
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0
Former-commit-id: 30f3289917 [formerly 7265bf54c7 ] [formerly 955ac3a670 [formerly 15e57fc58bee1045c5574e4d66a727a672ac83cb]]
Former-commit-id: 955ac3a670
Former-commit-id: d6c265e78e
|
2014-09-02 14:46:50 -05:00 |
|
Brian.Dyke
|
045647bb37
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 65f8fc89f0 [formerly 368f80f220 ] [formerly b1dbaa0b50 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]]
Former-commit-id: b1dbaa0b50
Former-commit-id: a1889cd15e
|
2014-09-02 15:09:06 -04:00 |
|
Qinglu.Lin
|
3fcdc279ea
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: b32ea40289 [formerly 2374673f8d ] [formerly ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]
Former-commit-id: ae13ea419e
Former-commit-id: 075df9d234
|
2014-09-02 14:37:19 -04:00 |
|
Ron Anderson
|
19ce2bb34e
|
Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: c7fbca0298 [formerly 46c62a1db6 ] [formerly 434d412882 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]
Former-commit-id: 434d412882
Former-commit-id: 24fba5cc20
|
2014-09-02 12:21:42 -05:00 |
|
Richard Peter
|
050e1f67d3
|
Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: abc807850f [formerly be2474da34 ] [formerly 0e29b2d17f [formerly 6789576e88de568c6014c29d099349cec40c7c74]]
Former-commit-id: 0e29b2d17f
Former-commit-id: e992fee66a
|
2014-09-02 12:15:38 -05:00 |
|
Benjamin Phillippe
|
c180ce2758
|
Issue #3560 Fix for registry memory issue
Former-commit-id: 12914fb1e5 [formerly ab8b2ef473 ] [formerly 2da57d3bc2 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]
Former-commit-id: 2da57d3bc2
Former-commit-id: 393c67dbe9
|
2014-09-02 10:00:35 -05:00 |
|
Dave Hladky
|
80d0e2594f
|
Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a
Former-commit-id: 534b784843 [formerly 9c3b002990 ] [formerly 82fd7189b9 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]]
Former-commit-id: 82fd7189b9
Former-commit-id: 9ac2a3adee
|
2014-09-02 09:38:21 -05:00 |
|
Steve Harris
|
79c7e0b492
|
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: f7e39c9d6f [formerly 3b6a003884 ] [formerly e7705c328e [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]
Former-commit-id: e7705c328e
Former-commit-id: 92a45c76fb
|
2014-09-02 08:12:49 -05:00 |
|
Steve Harris
|
5f0e7e3581
|
Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: 142f1bff66 [formerly db74dc031e ] [formerly 425e8243f2 [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]
Former-commit-id: 425e8243f2
Former-commit-id: 6563187041
|
2014-09-02 08:09:48 -05:00 |
|
Ben Steffensmeier
|
cb95c6ee3a
|
Issue #3543 Fix gl datamapping of data with NaN conversions.
Former-commit-id: 9c2c00c71e [formerly 22f93b6905 ] [formerly 190893e807 [formerly bc12be9bb6e8c7f63550602f51bca3448c21d4c6]]
Former-commit-id: 190893e807
Former-commit-id: 6f9dca57e8
|
2014-08-29 15:08:03 -05:00 |
|
Kiran.Shrestha
|
f278d7edbf
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6
Former-commit-id: 3abf28f856 [formerly a285439c08 ] [formerly d8bd6a9c70 [formerly 1681bea10870df58b3f2cc0d0a59f21c596e9e95]]
Former-commit-id: d8bd6a9c70
Former-commit-id: 2687526cec
|
2014-08-29 13:50:55 -04:00 |
|
Brian.Dyke
|
07ffb04445
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: cbe59aded5 [formerly 6f3d0508e4 ] [formerly 2c25f68437 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]]
Former-commit-id: 2c25f68437
Former-commit-id: 2abed9c0eb
|
2014-08-29 10:19:02 -04:00 |
|
Baoyu Yin
|
939e96be9b
|
VLab Issue #4563 - AWIPS2_DR_17371 Changes made in MPE editor not available in D-2D; fixes #4563
Change-Id: I5f5c55486f209b89ecf276bb38d3d42c7f60d1d1
Former-commit-id: cbc7d2813f [formerly bf5bb1bacf ] [formerly bfc550b378 [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]]
Former-commit-id: bfc550b378
Former-commit-id: 70b265dae2
|
2014-08-29 10:17:54 -04:00 |
|
Brian.Dyke
|
d14d2b9a30
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: a5519a28d9 [formerly 37c926973c ] [formerly a2f66c8d97 [formerly cff9bfd2697a73ccc18642d8dc057b6a27aa2991]]
Former-commit-id: a2f66c8d97
Former-commit-id: f3eba57747
|
2014-08-29 10:07:14 -04:00 |
|
Brian Clements
|
c337087043
|
Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040
Former-commit-id: 981390eb22 [formerly b352bd3944 ] [formerly cfeb16eff8 [formerly b3482522860408c2d052261e845899cf73c2ce96]]
Former-commit-id: cfeb16eff8
Former-commit-id: a2010c729a
|
2014-08-29 08:55:58 -05:00 |
|
Juliya Dynina
|
62d2e61a75
|
Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: 5f001b7ad7 [formerly 169dc0ba43 ] [formerly 58a3df78a8 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]
Former-commit-id: 58a3df78a8
Former-commit-id: 07b6109b5f
|
2014-08-28 15:52:11 -05:00 |
|
Ana Rivera
|
2045699212
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: e033ed5546 [formerly 160dabc4d1 ] [formerly 9af77831a6 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]
Former-commit-id: 9af77831a6
Former-commit-id: fbe4d57f6b
|
2014-08-28 18:38:26 +00:00 |
|
Roger Ferrel
|
ffa95bce90
|
Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: 15c73be56c [formerly 6f8c6d6aa1 ] [formerly ef5dfb1f93 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]
Former-commit-id: ef5dfb1f93
Former-commit-id: fe50853adb
|
2014-08-28 13:10:11 -05:00 |
|
David Friedman
|
b2cc41f3de
|
ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa
Former-commit-id: 9c2545ed64 [formerly de6e79f9e3 ] [formerly d5c086a022 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]
Former-commit-id: d5c086a022
Former-commit-id: 6209bbc36f
|
2014-08-28 18:08:23 +00:00 |
|
Daniel.Huffman
|
eb9b743c46
|
ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e
Former-commit-id: c3731d5622 [formerly c89a7169b0 ] [formerly ca2aa8811b [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]
Former-commit-id: ca2aa8811b
Former-commit-id: dc2bc16bcc
|
2014-08-28 17:20:30 +00:00 |
|
steve.naples
|
1532c683a1
|
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: 4205d83452 [formerly 1856a05319 ] [formerly ff52f1dc0a [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]
Former-commit-id: ff52f1dc0a
Former-commit-id: 211e9f7546
|
2014-08-28 16:08:17 +00:00 |
|
David Friedman
|
10114b0bd1
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: ea1e9feb1d [formerly a2dfe8e8f6 ] [formerly ea9230b37c [formerly 6bfa1d6662b00925814be7126592bbe340651649]]
Former-commit-id: ea9230b37c
Former-commit-id: bc22f7309c
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
065b05e38c
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 76bd6575b6 [formerly 47ae6015e5 ] [formerly a24794ca7b [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]
Former-commit-id: a24794ca7b
Former-commit-id: 0e9a17540d
|
2014-08-28 11:39:48 -04:00 |
|
Kiran.Shrestha
|
07018d4558
|
ASM #539 Multiple flag functionality for textdb is not working properly
Change-Id: Iaae81cace051d97db464e6610d6fa94f86086fb8
Former-commit-id: e38e3af172 [formerly f11699eddd ] [formerly 571f6fb8ea [formerly 0220801fc1747c7659e3db7cf734538fdda270ef]]
Former-commit-id: 571f6fb8ea
Former-commit-id: 27f157349e
|
2014-08-28 10:05:41 -04:00 |
|
Baoyu Yin
|
b400d2388c
|
VLab Issue #4554 - AWIPS2_DR_17469 Radar Digital Vertical Integrated Liquid wrongly capped at value of >60 kg*m^-2; fixes #4554
Change-Id: I78b45576bd2be9e3baa1f85da5a124de60842e3b
Former-commit-id: 8e88237eab [formerly 2d3589e7af ] [formerly ebc018c7f6 [formerly 8d3b878a9c32b77e7bb19b087e7da8de492a4481]]
Former-commit-id: ebc018c7f6
Former-commit-id: 81a3dadf58
|
2014-08-28 09:50:26 -04:00 |
|
Baoyu Yin
|
612d095a8f
|
VLab Issue #4553 - AWIPS2_DR_16047 Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
Change-Id: I20f7aeb70828c27e1e6250c54f90f82b88390056
Former-commit-id: 01b3186495 [formerly a42c9f6bc2 ] [formerly dc1b76a996 [formerly 3aabef4b96bfb848bb5201d8eac2681b3dc49c83]]
Former-commit-id: dc1b76a996
Former-commit-id: 89fa321360
|
2014-08-28 08:34:34 -04:00 |
|
Steve Harris
|
60d5eec1b0
|
Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: 080a50d28c [formerly 891019aadd ] [formerly d3b18900b3 [formerly 579781387325a36e27135b8384b2a8b14cb38317]]
Former-commit-id: d3b18900b3
Former-commit-id: 683c32dc70
|
2014-08-27 11:34:06 -05:00 |
|
Brian.Dyke
|
f90649d7e7
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: a08db8d73d [formerly e654318431 ] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: aa83bf804f
Former-commit-id: f7f16ff9eb
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
b3b2a8f365
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 3459e1fcbc [formerly d168e371aa ] [formerly 175f4e67c1 [formerly a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3]]
Former-commit-id: 175f4e67c1
Former-commit-id: 25282d10ac
|
2014-08-26 15:00:55 -04:00 |
|
Brian.Dyke
|
1b9a28cc62
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 489fec4b25 [formerly 86f0ed23c1 ] [formerly b3767167c7 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]
Former-commit-id: b3767167c7
Former-commit-id: f2b9203001
|
2014-08-26 13:31:34 -04:00 |
|
Brian.Dyke
|
dc14c2e6ce
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 8ac44dfbd3 [formerly de56ccebc0 ] [formerly 59bacf90ac [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]]
Former-commit-id: 59bacf90ac
Former-commit-id: 8c803e81d3
|
2014-08-26 10:56:45 -04:00 |
|
Daniel.Huffman
|
7d09253674
|
ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: e2e132e7a5 [formerly 8962a069be ] [formerly d1cd90b487 [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]
Former-commit-id: d1cd90b487
Former-commit-id: 64672eb478
|
2014-08-26 13:30:09 +00:00 |
|