Commit graph

6966 commits

Author SHA1 Message Date
Qinglu.Lin
7ec0ec8877 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 b32ea40289 [formerly 2374673f8d] [formerly ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]
Former-commit-id: ae13ea419e
Former-commit-id: 3fcdc279ea [formerly 075df9d234]
Former-commit-id: 415af39911
2014-09-02 14:37:19 -04:00
Richard Peter
bb5b769b96 Merge "Omaha #2926 switched textdb to thrift client" into omaha_14.4.1
Former-commit-id: 612990b3ed [formerly 7628a0a56a] [formerly 612990b3ed [formerly 7628a0a56a] [formerly 0f94b663a4 [formerly 80294bbd891edde5b190941175f73d634f1a3e08]]]
Former-commit-id: 0f94b663a4
Former-commit-id: e3e9368411 [formerly 6151d549ce]
Former-commit-id: eca48d7b90
2014-09-02 12:45:37 -05:00
Nate Jensen
78b9181a68 Omaha #3549 improve error message
Change-Id: I54cdefd3b77fa5ad8eba9aad6ae8c93b7bd0a67d

Former-commit-id: 3cf81ab39e [formerly fa330b698d] [formerly 3cf81ab39e [formerly fa330b698d] [formerly 37501b884a [formerly 369867e18b5209895137f5e4121fa06bfa2858c7]]]
Former-commit-id: 37501b884a
Former-commit-id: 635604b7a9 [formerly 11b4f270e6]
Former-commit-id: 7336cbb500
2014-09-02 12:38:04 -05:00
Richard Peter
76be4ae710 Merge "Omaha #3549 improve acarssounding error message" into omaha_14.4.1
Former-commit-id: 78550587d8 [formerly 1ebcacee88] [formerly 78550587d8 [formerly 1ebcacee88] [formerly 09a044b9af [formerly 4d0cb95dfed73beeb51e15d753b76c315877d2ea]]]
Former-commit-id: 09a044b9af
Former-commit-id: e9114850ac [formerly 7fa3a9b834]
Former-commit-id: 33b9f58bc3
2014-09-02 12:32:39 -05:00
Ron Anderson
699fe1637e Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: c7fbca0298 [formerly 46c62a1db6] [formerly c7fbca0298 [formerly 46c62a1db6] [formerly 434d412882 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]]
Former-commit-id: 434d412882
Former-commit-id: 19ce2bb34e [formerly 24fba5cc20]
Former-commit-id: cad80d1060
2014-09-02 12:21:42 -05:00
Richard Peter
063bfe0a8a Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: abc807850f [formerly be2474da34] [formerly abc807850f [formerly be2474da34] [formerly 0e29b2d17f [formerly 6789576e88de568c6014c29d099349cec40c7c74]]]
Former-commit-id: 0e29b2d17f
Former-commit-id: 050e1f67d3 [formerly e992fee66a]
Former-commit-id: 3408442222
2014-09-02 12:15:38 -05:00
Ron Anderson
c13e748b6c Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
Former-commit-id: 8d9741bd83 [formerly 6a5d4acf7c] [formerly 8d9741bd83 [formerly 6a5d4acf7c] [formerly aa6835147b [formerly 31578a50044053da2ecf14697764bfac2ee8ac8d]]]
Former-commit-id: aa6835147b
Former-commit-id: f27986f541 [formerly 017378f646]
Former-commit-id: 8ab30a7e02
2014-09-02 12:08:44 -05:00
Mark Peters
3a8e2b71fd Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ib0aa88dd3341ae65aef9b2b02ffbd1645510b95e

Former-commit-id: be6dae0cf9 [formerly ad994bc4c6] [formerly be6dae0cf9 [formerly ad994bc4c6] [formerly 53869a4b0b [formerly 07b54b870e36f37b909d9e7da1f1da4d181b06b0]]]
Former-commit-id: 53869a4b0b
Former-commit-id: 6ddbbc366a [formerly 2c02132ec0]
Former-commit-id: ae87858e3d
2014-09-02 11:38:06 -05:00
Nate Jensen
0189b9da69 Omaha #3549 improve acarssounding error message
Change-Id: I850eb6bbcd825bee26f0e93226b10d077378dacf

Former-commit-id: 6838a4d8cc [formerly 8570cad6c6] [formerly 6838a4d8cc [formerly 8570cad6c6] [formerly 82ef4c1646 [formerly 16e66726bd5a8f20d6de21708c7f3372a046cea8]]]
Former-commit-id: 82ef4c1646
Former-commit-id: c7fdb67228 [formerly eed90eceeb]
Former-commit-id: fddcabac0a
2014-09-02 11:21:10 -05:00
Greg Armendariz
8566996f06 Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1
Former-commit-id: a9f6d3528c [formerly 33b0ac3811] [formerly a9f6d3528c [formerly 33b0ac3811] [formerly b229adbf38 [formerly 2a4e26c1be0118f71e18a2c5bfa8777163a97d30]]]
Former-commit-id: b229adbf38
Former-commit-id: d63a9da4d6 [formerly edb50956c8]
Former-commit-id: a2aa3fa6ff
2014-09-02 10:40:13 -05:00
Nate Jensen
0c55719688 Merge "Omaha #3356 fix cave startup" into omaha_14.4.1
Former-commit-id: 3258b9a2b2 [formerly 5247f4833f] [formerly 3258b9a2b2 [formerly 5247f4833f] [formerly 653d594382 [formerly e3c3d979ba7dcb46d2af716aa73e05c67f0dd2ba]]]
Former-commit-id: 653d594382
Former-commit-id: 9067556a0e [formerly a63f5ee67b]
Former-commit-id: 8078915092
2014-09-02 10:14:08 -05:00
Brian Clements
54a627e05a Omaha #3573 fixed clean in collaboration dataserver ant script
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a

Former-commit-id: eb84b255b0 [formerly 9fe49043e7] [formerly eb84b255b0 [formerly 9fe49043e7] [formerly 23f1f7b2b6 [formerly d2bfe367c9753fc4a2db181c7966179a20713a02]]]
Former-commit-id: 23f1f7b2b6
Former-commit-id: 8da4a4ccf4 [formerly 7a29eef035]
Former-commit-id: e56c909c26
2014-09-02 10:04:39 -05:00
Benjamin Phillippe
94ffd5d5f0 Issue #3560 Fix for registry memory issue
Former-commit-id: 12914fb1e5 [formerly ab8b2ef473] [formerly 12914fb1e5 [formerly ab8b2ef473] [formerly 2da57d3bc2 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]]
Former-commit-id: 2da57d3bc2
Former-commit-id: c180ce2758 [formerly 393c67dbe9]
Former-commit-id: 565c858c3e
2014-09-02 10:00:35 -05:00
Nate Jensen
070ef331b9 Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: e673ed62bd [formerly 2c209af1fa] [formerly e673ed62bd [formerly 2c209af1fa] [formerly fe457e89a7 [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]]
Former-commit-id: fe457e89a7
Former-commit-id: 675bf92355 [formerly 5661124038]
Former-commit-id: 84a107c8fa
2014-09-02 09:53:25 -05:00
Nate Jensen
037859fb38 Merge "Omaha #3459 Ensure font is initialized before queryJob runs, Additional refactoring to someday allow ZoneSelectorResource to use more common code." into omaha_14.4.1
Former-commit-id: 3efe4cf3b0 [formerly c4333e030c] [formerly 3efe4cf3b0 [formerly c4333e030c] [formerly 13f1a5a8ab [formerly 172d733902e6430de4f776eed3ad4cd6a94164a5]]]
Former-commit-id: 13f1a5a8ab
Former-commit-id: ce408af16d [formerly d7a2ff8336]
Former-commit-id: f913771eb0
2014-09-02 09:52:38 -05:00
Nate Jensen
9f908d764c Omaha #3356 fix cave startup
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595

Former-commit-id: 9bf9e3a658 [formerly 4395ab6f11] [formerly 9bf9e3a658 [formerly 4395ab6f11] [formerly ef99d43451 [formerly d326ee1a73a852e5534e76bf2148afd7646adb7e]]]
Former-commit-id: ef99d43451
Former-commit-id: b2d1d16230 [formerly fe789cce26]
Former-commit-id: 20aa52b2ed
2014-09-02 09:50:08 -05:00
Dave Hladky
f165391a1b Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a

Former-commit-id: 534b784843 [formerly 9c3b002990] [formerly 534b784843 [formerly 9c3b002990] [formerly 82fd7189b9 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]]]
Former-commit-id: 82fd7189b9
Former-commit-id: 80d0e2594f [formerly 9ac2a3adee]
Former-commit-id: c1bf96b142
2014-09-02 09:38:21 -05:00
Richard Peter
5496419cc9 Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1
Former-commit-id: 5db143cd92 [formerly 6f66071eca] [formerly 5db143cd92 [formerly 6f66071eca] [formerly 40917b6118 [formerly f7aa38e6092e59e314fedad22829eed9e5c22ad2]]]
Former-commit-id: 40917b6118
Former-commit-id: 0f7e216834 [formerly 59ad20bac3]
Former-commit-id: c1fcdcfde2
2014-09-02 09:23:58 -05:00
Steve Harris
f1c77c42ed Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: f7e39c9d6f [formerly 3b6a003884] [formerly f7e39c9d6f [formerly 3b6a003884] [formerly e7705c328e [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]]
Former-commit-id: e7705c328e
Former-commit-id: 79c7e0b492 [formerly 92a45c76fb]
Former-commit-id: 6279cdb55c
2014-09-02 08:12:49 -05:00
Steve Harris
3806bd14eb Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: 142f1bff66 [formerly db74dc031e] [formerly 142f1bff66 [formerly db74dc031e] [formerly 425e8243f2 [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]]
Former-commit-id: 425e8243f2
Former-commit-id: 5f0e7e3581 [formerly 6563187041]
Former-commit-id: f72eb20900
2014-09-02 08:09:48 -05:00
Mark Peters
aa58dab103 Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473

Former-commit-id: 966879b8a1 [formerly e35a7451c6] [formerly 966879b8a1 [formerly e35a7451c6] [formerly 045746ec21 [formerly 8099cbe2359334d6718761046a1475fca687af35]]]
Former-commit-id: 045746ec21
Former-commit-id: c850f6b6cd [formerly cc96e1fb1f]
Former-commit-id: 264c5afa15
2014-08-29 16:17:22 -05:00
Ben Steffensmeier
7476405193 Issue #3543 Fix gl datamapping of data with NaN conversions.
Former-commit-id: 9c2c00c71e [formerly 22f93b6905] [formerly 9c2c00c71e [formerly 22f93b6905] [formerly 190893e807 [formerly bc12be9bb6e8c7f63550602f51bca3448c21d4c6]]]
Former-commit-id: 190893e807
Former-commit-id: cb95c6ee3a [formerly 6f9dca57e8]
Former-commit-id: 16561bb4c7
2014-08-29 15:08:03 -05:00
Mark Peters
9cab14d5b6 Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9

Former-commit-id: 86b9016338 [formerly 097ce54969] [formerly 86b9016338 [formerly 097ce54969] [formerly 91f2b365a1 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]]
Former-commit-id: 91f2b365a1
Former-commit-id: abd256ab93 [formerly 54f9a37e6c]
Former-commit-id: a3c382c0f7
2014-08-29 15:05:29 -05:00
Kiran.Shrestha
df635b2a58 ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6

Former-commit-id: 3abf28f856 [formerly a285439c08] [formerly 3abf28f856 [formerly a285439c08] [formerly d8bd6a9c70 [formerly 1681bea10870df58b3f2cc0d0a59f21c596e9e95]]]
Former-commit-id: d8bd6a9c70
Former-commit-id: f278d7edbf [formerly 2687526cec]
Former-commit-id: 022a4dc4dc
2014-08-29 13:50:55 -04:00
Ron Anderson
4a821c89b7 Omaha #3459 Ensure font is initialized before queryJob runs,
Additional refactoring to someday allow ZoneSelectorResource to use more common code.

Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062

Former-commit-id: f3f2ec8843 [formerly 8583386e5f] [formerly f3f2ec8843 [formerly 8583386e5f] [formerly de490ea582 [formerly a1896437f432bcb360365d28a0ee7377cec565af]]]
Former-commit-id: de490ea582
Former-commit-id: ae69665e50 [formerly 338672c03f]
Former-commit-id: 3954787487
2014-08-29 12:04:52 -05:00
Nate Jensen
5e78fb700b Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1
Former-commit-id: 47261a4ac4 [formerly 16191b10ab] [formerly 47261a4ac4 [formerly 16191b10ab] [formerly c60dfb889c [formerly 3482282527df3ffd13c93d1a5d63d52ce79f8b2b]]]
Former-commit-id: c60dfb889c
Former-commit-id: 6647ce3111 [formerly b61f93a2e4]
Former-commit-id: 08a9210cce
2014-08-29 11:16:16 -05:00
Steve Harris
a7e18342d9 Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
Former-commit-id: f51ceee718 [formerly aedf89c00b] [formerly f51ceee718 [formerly aedf89c00b] [formerly c49eabbb45 [formerly 94468f09bd626bd2ff26e7312ceede154f427664]]]
Former-commit-id: c49eabbb45
Former-commit-id: 113bcace66 [formerly d24b29f7b2]
Former-commit-id: aed5540042
2014-08-29 11:05:34 -05:00
Ron Anderson
acc6079444 Omaha #3561 Yet another attempt to fix combinations file updating
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f

Former-commit-id: 89cde78ea6 [formerly bd52b5a924] [formerly 89cde78ea6 [formerly bd52b5a924] [formerly 9f37d7914a [formerly b1c067fe33d1fe09f89e981b03ef178bcc3a5f93]]]
Former-commit-id: 9f37d7914a
Former-commit-id: b58479dc0b [formerly b489928744]
Former-commit-id: 7158207736
2014-08-29 10:45:54 -05:00
Steve Harris
ecf26b3ac5 Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	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/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	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.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: bddf9c0f27 [formerly 793064063b] [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: 66b485c000 [formerly d984dd538f]
Former-commit-id: e681e0a457
2014-08-29 10:17:52 -05:00
Brian.Dyke
b01c60ca50 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: cbe59aded5 [formerly 6f3d0508e4] [formerly cbe59aded5 [formerly 6f3d0508e4] [formerly 2c25f68437 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]]]
Former-commit-id: 2c25f68437
Former-commit-id: 07ffb04445 [formerly 2abed9c0eb]
Former-commit-id: 8d7b13548f
2014-08-29 10:19:02 -04:00
Baoyu Yin
4e755d38e6 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 cbc7d2813f [formerly bf5bb1bacf] [formerly bfc550b378 [formerly 5189ae1c3ce12320045c431d9552036ea9272cef]]]
Former-commit-id: bfc550b378
Former-commit-id: 939e96be9b [formerly 70b265dae2]
Former-commit-id: 88e01c26db
2014-08-29 10:17:54 -04:00
Brian.Dyke
85d763def5 Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: a5519a28d9 [formerly 37c926973c] [formerly a5519a28d9 [formerly 37c926973c] [formerly a2f66c8d97 [formerly cff9bfd2697a73ccc18642d8dc057b6a27aa2991]]]
Former-commit-id: a2f66c8d97
Former-commit-id: d14d2b9a30 [formerly f3eba57747]
Former-commit-id: 24a0b8457e
2014-08-29 10:07:14 -04:00
Brian Clements
e9eb97a8fb Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: 981390eb22 [formerly b352bd3944] [formerly 981390eb22 [formerly b352bd3944] [formerly cfeb16eff8 [formerly b3482522860408c2d052261e845899cf73c2ce96]]]
Former-commit-id: cfeb16eff8
Former-commit-id: c337087043 [formerly a2010c729a]
Former-commit-id: 139466b9ef
2014-08-29 08:55:58 -05:00
Juliya Dynina
95f1799dc6 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 5f001b7ad7 [formerly 169dc0ba43] [formerly 58a3df78a8 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]]
Former-commit-id: 58a3df78a8
Former-commit-id: 62d2e61a75 [formerly 07b6109b5f]
Former-commit-id: 9a5eb28213
2014-08-28 15:52:11 -05:00
Nate Jensen
7e2f184332 Merge "Omaha #3356 inject spatial query through spring" into omaha_14.4.1
Former-commit-id: 8f0bd2bb84 [formerly 67d5cb52ae] [formerly 8f0bd2bb84 [formerly 67d5cb52ae] [formerly 822f1a20b0 [formerly afd5131062926a78942db59f35a5c2e719a542da]]]
Former-commit-id: 822f1a20b0
Former-commit-id: 975f93d6cf [formerly 0a8312b09d]
Former-commit-id: 1aa74a38d8
2014-08-28 14:32:57 -05:00
Ana Rivera
aec8eba1a7 VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: e033ed5546 [formerly 160dabc4d1] [formerly e033ed5546 [formerly 160dabc4d1] [formerly 9af77831a6 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]
Former-commit-id: 9af77831a6
Former-commit-id: 2045699212 [formerly fbe4d57f6b]
Former-commit-id: dee335f370
2014-08-28 18:38:26 +00:00
Roger Ferrel
89f66db462 Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec

Former-commit-id: 15c73be56c [formerly 6f8c6d6aa1] [formerly 15c73be56c [formerly 6f8c6d6aa1] [formerly ef5dfb1f93 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]]
Former-commit-id: ef5dfb1f93
Former-commit-id: ffa95bce90 [formerly fe50853adb]
Former-commit-id: 86d4730538
2014-08-28 13:10:11 -05:00
David Friedman
e42ffa0ad4 ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa

Former-commit-id: 9c2545ed64 [formerly de6e79f9e3] [formerly 9c2545ed64 [formerly de6e79f9e3] [formerly d5c086a022 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]]
Former-commit-id: d5c086a022
Former-commit-id: b2cc41f3de [formerly 6209bbc36f]
Former-commit-id: 41b4886743
2014-08-28 18:08:23 +00:00
Daniel.Huffman
ff850b4cf0 ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e

Former-commit-id: c3731d5622 [formerly c89a7169b0] [formerly c3731d5622 [formerly c89a7169b0] [formerly ca2aa8811b [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]]
Former-commit-id: ca2aa8811b
Former-commit-id: eb9b743c46 [formerly dc2bc16bcc]
Former-commit-id: b97ea429c3
2014-08-28 17:20:30 +00:00
Nate Jensen
fe0cd768ad Omaha #3356 inject spatial query through spring
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d

Former-commit-id: baece22d79 [formerly 58c85c76ef] [formerly baece22d79 [formerly 58c85c76ef] [formerly 8f226399f7 [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]]]
Former-commit-id: 8f226399f7
Former-commit-id: 244395af69 [formerly 9843865254]
Former-commit-id: 2b829dc66b
2014-08-28 11:46:25 -05:00
Nate Jensen
91ae999120 Merge "Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily" into omaha_14.4.1
Former-commit-id: 9fe0e6df69 [formerly 625f0db18f] [formerly 9fe0e6df69 [formerly 625f0db18f] [formerly 0ee832fc2f [formerly 0a6287431cbcc43ad6f42898a94d173fe451566e]]]
Former-commit-id: 0ee832fc2f
Former-commit-id: 2a7cd5957d [formerly ce138b3e31]
Former-commit-id: 0e0cf3ba67
2014-08-28 11:30:45 -05:00
Nate Jensen
5b03e9fa4a Merge "Omaha #3562 jetty upgrade change for dataserver" into omaha_14.4.1
Former-commit-id: 22f24dbb13 [formerly c8c93dccf1] [formerly 22f24dbb13 [formerly c8c93dccf1] [formerly e0d861461b [formerly 96882cbdc801c37e63ca0bc1ce950cbdffd97122]]]
Former-commit-id: e0d861461b
Former-commit-id: 16ee6e44a2 [formerly 1d3c307bd8]
Former-commit-id: 419437c6bd
2014-08-28 11:23:43 -05:00
steve.naples
03f50a48f1 ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138

Former-commit-id: 4205d83452 [formerly 1856a05319] [formerly 4205d83452 [formerly 1856a05319] [formerly ff52f1dc0a [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]]
Former-commit-id: ff52f1dc0a
Former-commit-id: 1532c683a1 [formerly 211e9f7546]
Former-commit-id: 3f11e82772
2014-08-28 16:08:17 +00:00
Ron Anderson
932d9e2783 Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34

Former-commit-id: dc185b8dd1 [formerly bb1e80b844] [formerly dc185b8dd1 [formerly bb1e80b844] [formerly 2b88ade974 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]]
Former-commit-id: 2b88ade974
Former-commit-id: 39d00a72ce [formerly 0962c75d18]
Former-commit-id: 56b56ea4f3
2014-08-28 10:43:54 -05:00
David Friedman
39c7024668 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9

Former-commit-id: ea1e9feb1d [formerly a2dfe8e8f6] [formerly ea1e9feb1d [formerly a2dfe8e8f6] [formerly ea9230b37c [formerly 6bfa1d6662b00925814be7126592bbe340651649]]]
Former-commit-id: ea9230b37c
Former-commit-id: 10114b0bd1 [formerly bc22f7309c]
Former-commit-id: bfc3fa98b4
2014-08-28 15:43:32 +00:00
Nate Jensen
2db6fa9583 Merge "Omaha #3503 Composite product generators init after spring beans are loaded" into omaha_14.4.1
Former-commit-id: fb0829fd4d [formerly de69231d3a] [formerly fb0829fd4d [formerly de69231d3a] [formerly afe94aca08 [formerly 1eb554cd30d53daf44de42e0ddd3f35bf8f37bae]]]
Former-commit-id: afe94aca08
Former-commit-id: da6259a198 [formerly 8952d15b12]
Former-commit-id: f3454a7941
2014-08-28 10:40:50 -05:00
Brian.Dyke
c5aec69ab3 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 76bd6575b6 [formerly 47ae6015e5] [formerly a24794ca7b [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]]
Former-commit-id: a24794ca7b
Former-commit-id: 065b05e38c [formerly 0e9a17540d]
Former-commit-id: bab69f3764
2014-08-28 11:39:48 -04:00
Kiran.Shrestha
adc256365e ASM #539 Multiple flag functionality for textdb is not working properly
Change-Id: Iaae81cace051d97db464e6610d6fa94f86086fb8

Former-commit-id: e38e3af172 [formerly f11699eddd] [formerly e38e3af172 [formerly f11699eddd] [formerly 571f6fb8ea [formerly 0220801fc1747c7659e3db7cf734538fdda270ef]]]
Former-commit-id: 571f6fb8ea
Former-commit-id: 07018d4558 [formerly 27f157349e]
Former-commit-id: 36c1c2c788
2014-08-28 10:05:41 -04:00
Baoyu Yin
41a0ef8b62 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 8e88237eab [formerly 2d3589e7af] [formerly ebc018c7f6 [formerly 8d3b878a9c32b77e7bb19b087e7da8de492a4481]]]
Former-commit-id: ebc018c7f6
Former-commit-id: b400d2388c [formerly 81a3dadf58]
Former-commit-id: 88d16f16fd
2014-08-28 09:50:26 -04:00
Baoyu Yin
89da9759d6 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 01b3186495 [formerly a42c9f6bc2] [formerly dc1b76a996 [formerly 3aabef4b96bfb848bb5201d8eac2681b3dc49c83]]]
Former-commit-id: dc1b76a996
Former-commit-id: 612d095a8f [formerly 89fa321360]
Former-commit-id: 24a0253edf
2014-08-28 08:34:34 -04:00