Fay.Liang
|
cb60c82771
|
Merge branch 'mdl_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: da2f15f749 [formerly 94a7507b9b] [formerly da2f15f749 [formerly 94a7507b9b] [formerly 47882c9ca1 [formerly d6d761a5170a91dbd6fed78af582bfc2a8f662a3]]]
Former-commit-id: 47882c9ca1
Former-commit-id: a54a056c67 [formerly 7ff67d57da]
Former-commit-id: ed78e2d716
|
2015-02-24 14:56:50 -05:00 |
|
Darrel Kingfield
|
fbf2c0047c
|
VLab Issue #6585 - MRMS Menu Activation for 14.4.1; fixes #6585
Former-commit-id: 41ece8fea1 [formerly 00880112ba] [formerly 41ece8fea1 [formerly 00880112ba] [formerly d73e7e2d8b [formerly f43b83069eaf12e4190f1827eeed8d954239b164]]]
Former-commit-id: d73e7e2d8b
Former-commit-id: 31ee025ea6 [formerly e19974b779]
Former-commit-id: d558124cd4
|
2015-02-24 10:14:35 -06:00 |
|
Ana Rivera
|
613232a4dc
|
Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: I855933b8c46cd835ff872a098e74f36201cf6ecb
Former-commit-id: 9c17244d9c [formerly 90d3fcece6] [formerly 9c17244d9c [formerly 90d3fcece6] [formerly 62642d62bc [formerly 4df76b701f4a85fd0c55f0dd9fd351d1768bd92e]]]
Former-commit-id: 62642d62bc
Former-commit-id: e883e41912 [formerly a4938264a7]
Former-commit-id: 066f2a5ecb
|
2015-02-20 14:04:10 +00:00 |
|
Joshua Watson
|
ffeb125843
|
VLab Issue #6496 - Key in sfcGrid.xml changed from HI-MOSGuide to MOSGuide-HI; fixes #6496
Change-Id: I4571bb639d474a86df39b7ea3bde1a23bad8f37f
Former-commit-id: 2c4042f5d9 [formerly 20dbdea326] [formerly 2c4042f5d9 [formerly 20dbdea326] [formerly a1a7877f92 [formerly aa05e8a312511e61c0dd01680b536282ee733154]]]
Former-commit-id: a1a7877f92
Former-commit-id: 8347778ba0 [formerly 6af80563ef]
Former-commit-id: ba500bb277
|
2015-02-18 16:17:16 -05:00 |
|
Fay.Liang
|
2546eeb607
|
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Former-commit-id: c95baa3c40 [formerly 8cdd180b0a] [formerly c95baa3c40 [formerly 8cdd180b0a] [formerly af8b95bb97 [formerly fd4e0b9ada38ab93586088948809279e39a0374c]]]
Former-commit-id: af8b95bb97
Former-commit-id: f18381db69 [formerly 8d5a9c2045]
Former-commit-id: 984091af0c
|
2015-02-13 09:34:24 -05:00 |
|
Fay.Liang
|
13b425347f
|
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: b54c101e34 [formerly adc24b15b6] [formerly b54c101e34 [formerly adc24b15b6] [formerly 92d4e5b370 [formerly c08dc1a7d558fba175460ef8255fc3b7b1db5c71]]]
Former-commit-id: 92d4e5b370
Former-commit-id: 450bfe4dca [formerly fbdb149621]
Former-commit-id: 709c5ac369
|
2015-02-13 09:29:20 -05:00 |
|
David Lovely
|
d6913e3259
|
Omaha #3300 Fixing merge errors in PointPrecipPlotResource
Change-Id: I6c5b8f0f2e590b0cf0440c1885435c2bf5649df4
Former-commit-id: 260a818778 [formerly 56c3135aef] [formerly 260a818778 [formerly 56c3135aef] [formerly 25f32b4c70 [formerly e7968f03e688e7dbad9a2e87b9de7f0664997a5f]]]
Former-commit-id: 25f32b4c70
Former-commit-id: d282d70d60 [formerly ca03110763]
Former-commit-id: 7322783d3f
|
2015-02-12 09:16:30 -06:00 |
|
Ana Rivera
|
cb4300775b
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209
Former-commit-id: 461db8a395 [formerly 420132b396] [formerly 461db8a395 [formerly 420132b396] [formerly 6191c93a9c [formerly f6b3765fc1670db2b9ceef75be7422a07b2badcf]]]
Former-commit-id: 6191c93a9c
Former-commit-id: 726045354b [formerly d8b54a59cf]
Former-commit-id: 85de48c8bf
|
2015-02-11 22:00:40 +00:00 |
|
Steve Harris
|
f2f6d56366
|
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10
Former-commit-id: e76330fac0 [formerly 3fe3d35339] [formerly e76330fac0 [formerly 3fe3d35339] [formerly 9311e6f440 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]]
Former-commit-id: 9311e6f440
Former-commit-id: 300e3e50fe [formerly 6a2d5ec16d]
Former-commit-id: 07475d998f
|
2015-02-11 15:53:38 -06:00 |
|
Fay.Liang
|
9f124dc2e5
|
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 8d4bab98d5 [formerly 30859f6ee6] [formerly 8d4bab98d5 [formerly 30859f6ee6] [formerly 1208dbde06 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]]]
Former-commit-id: 1208dbde06
Former-commit-id: c8b9377e84 [formerly 10c325518c]
Former-commit-id: 9f2f5af448
|
2015-02-11 15:36:05 -05:00 |
|
Ana Rivera
|
7585c6e288
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f
Former-commit-id: 631d700cf9 [formerly bdb0e3aacb] [formerly 631d700cf9 [formerly bdb0e3aacb] [formerly c2f02ff4b2 [formerly c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265]]]
Former-commit-id: c2f02ff4b2
Former-commit-id: e6ea29b193 [formerly 0bab05a20b]
Former-commit-id: 3eb45fd8e1
|
2015-02-10 14:41:19 +00:00 |
|
Fay.Liang
|
31607db1e1
|
Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: e3107ce1e4 [formerly 59f3f87190] [formerly e3107ce1e4 [formerly 59f3f87190] [formerly 43c7161dcf [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]]
Former-commit-id: 43c7161dcf
Former-commit-id: 149102ec85 [formerly 0b98fc8be6]
Former-commit-id: 2d5858f8f0
|
2015-02-09 17:19:41 -05:00 |
|
Joshua Watson
|
fa057c8063
|
VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml, changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init; fixes #6363
Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848
Former-commit-id: cb6420914f [formerly 05c119663f] [formerly cb6420914f [formerly 05c119663f] [formerly f6cf02c893 [formerly 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff]]]
Former-commit-id: f6cf02c893
Former-commit-id: 7235e8444e [formerly 5a136bb86b]
Former-commit-id: 4827934718
|
2015-02-06 16:06:37 -05:00 |
|
Nate Jensen
|
f20fb4afa8
|
Omaha #4089 harden safety of numpy dtypes in gfe arrays
Change-Id: Ic77b459bc4d68930418ad66680ee86069c540c1f
Former-commit-id: ac02fc3a81 [formerly b42dec0e4a] [formerly ac02fc3a81 [formerly b42dec0e4a] [formerly ea273e14bf [formerly ed77ff564520c8f6ad157dd115d37d69cbfab660]]]
Former-commit-id: ea273e14bf
Former-commit-id: eea6f68b54 [formerly 2346be4023]
Former-commit-id: e4edba9ee7
|
2015-02-05 18:03:47 -06:00 |
|
Richard Peter
|
9646b3f0e6
|
Merge "Omaha #4086 resurrect undead textws scripting code and make it work with TextDBQuery" into omaha_14.4.1
Former-commit-id: e7ee620ccb [formerly d9eb0d8b55] [formerly e7ee620ccb [formerly d9eb0d8b55] [formerly 948dce2527 [formerly 3196b314c2f75424933163112742c3646a0529b4]]]
Former-commit-id: 948dce2527
Former-commit-id: bc0fabc8f4 [formerly e0e70ca408]
Former-commit-id: 0a79ebe10e
|
2015-02-05 09:00:57 -06:00 |
|
Nate Jensen
|
a9b62ff68d
|
Omaha #4086 resurrect undead textws scripting code and make it work with
TextDBQuery
Change-Id: I33ddf04b2f02ee088f7b8956c5c31e874747ddf8
Former-commit-id: 49440898a8 [formerly b6fe8b843e] [formerly 49440898a8 [formerly b6fe8b843e] [formerly fa547ac3dd [formerly 9cdf82d433bd07289002c1f4df9f5242dce0de7e]]]
Former-commit-id: fa547ac3dd
Former-commit-id: b25d5630fe [formerly 99dc91dd0b]
Former-commit-id: 0a8e498e9f
|
2015-02-04 16:46:21 -06:00 |
|
Slav Korolev
|
486bd8eb90
|
Omaha #3841 - Fixed saving problem for distance and time.
Former-commit-id: bfbe322c73 [formerly 15ae209055] [formerly bfbe322c73 [formerly 15ae209055] [formerly b8be69c429 [formerly d6737249fc9d3db54a143345053acdfe889686bf]]]
Former-commit-id: b8be69c429
Former-commit-id: d023dc9dd3 [formerly 8ba4d73cff]
Former-commit-id: a79bc229d5
|
2015-02-04 15:49:49 -05:00 |
|
Matthew Howard
|
c0cce89287
|
Merge "ASM #17039 - Remove HighlightFramingCodes feature" into asm_14.4.1
Former-commit-id: b482802e1e [formerly 4a46df6ed9] [formerly b482802e1e [formerly 4a46df6ed9] [formerly cfc9629774 [formerly a68b74fd45f4da2dfe73085833432416380219f7]]]
Former-commit-id: cfc9629774
Former-commit-id: 2731ac39dc [formerly 7e18ae7ff6]
Former-commit-id: b43e16d769
|
2015-02-04 11:16:20 -05:00 |
|
Rici.Yu
|
520899992d
|
ASM #17039 - Remove HighlightFramingCodes feature
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: 0a489fea9c [formerly 5470139b42] [formerly 0a489fea9c [formerly 5470139b42] [formerly 1188dab0f4 [formerly cb047745b4a5c523bd1ca26692c758d3e72d8ddc]]]
Former-commit-id: 1188dab0f4
Former-commit-id: e1762b3ae9 [formerly f41d5cffef]
Former-commit-id: ff0177a6dd
|
2015-02-04 10:23:30 -05:00 |
|
Steve Harris
|
d09bee3e06
|
Merge tag 'OB_14.4.1-7m' into omaha_14.4.1
14.4.1-7
Former-commit-id: 8f2af8e359 [formerly f428e16ebb] [formerly 8f2af8e359 [formerly f428e16ebb] [formerly 2468be4dd1 [formerly 88b43275725882327d4487733e3135489874de1f]]]
Former-commit-id: 2468be4dd1
Former-commit-id: 520023d6c2 [formerly 8a8e66a3e1]
Former-commit-id: 8513926d87
|
2015-02-03 17:18:57 -06:00 |
|
Steve Harris
|
2a1c5cfc23
|
Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
14.4.1-6
Former-commit-id: 80dae4bc15 [formerly db185ed16c] [formerly 80dae4bc15 [formerly db185ed16c] [formerly b684848820 [formerly 6873606777f0c7c18928b0b0814050742c256dc2]]]
Former-commit-id: b684848820
Former-commit-id: b971724d20 [formerly 40f44c9e15]
Former-commit-id: 9ffe8b7084
|
2015-02-03 11:24:39 -06:00 |
|
Fay.Liang
|
7f3a53beaf
|
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 5550322f62 [formerly ae85ade54d] [formerly 5550322f62 [formerly ae85ade54d] [formerly f1c34884a5 [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]]
Former-commit-id: f1c34884a5
Former-commit-id: 7ac4ff3f48 [formerly 82b3637598]
Former-commit-id: 37f830c123
|
2015-02-03 11:24:57 -05:00 |
|
Ron Anderson
|
a3bfe3b090
|
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
Former-commit-id: 8c6c42fe43 [formerly f280c0ab2e] [formerly 8c6c42fe43 [formerly f280c0ab2e] [formerly 933590f36a [formerly 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c]]]
Former-commit-id: 933590f36a
Former-commit-id: cc882eae28 [formerly 074512f362]
Former-commit-id: fa9890db7a
|
2015-02-02 15:04:51 -06:00 |
|
Bradley Mabe
|
1911c68fb3
|
Merge remote branch 'origin/omaha_pgen' into ncep_14.4.1
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResource.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResourceGhost.java
Change-Id: I8506bb7deb4f57f5989d3513d682561948870593
Former-commit-id: e8dc39ee79 [formerly 847c663329] [formerly e8dc39ee79 [formerly 847c663329] [formerly de986a26ed [formerly a71f38e658319ac1109de6c73dfa29db35535f96]]]
Former-commit-id: de986a26ed
Former-commit-id: 165e747e6e [formerly eebc4f4232]
Former-commit-id: d86ae801fb
|
2015-02-02 15:49:14 -05:00 |
|
Ron Anderson
|
07ac450c18
|
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: 67443be919 [formerly bdc365d9c9] [formerly 67443be919 [formerly bdc365d9c9] [formerly 346ea417ea [formerly 9d2f64b08acbec0567c7f29871480827ff0f6de7]]]
Former-commit-id: 346ea417ea
Former-commit-id: d3bce10b61 [formerly 48c2f0e843]
Former-commit-id: 30824e2e86
|
2015-02-02 11:26:59 -06:00 |
|
Fay.Liang
|
614d6f9c9e
|
Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/doConfig.py
Former-commit-id: 99b1511120 [formerly 4ddd4cec81] [formerly 99b1511120 [formerly 4ddd4cec81] [formerly 15f28c0245 [formerly 307e986b8e9ce89ad1eb7b28f88afe82c2596f30]]]
Former-commit-id: 15f28c0245
Former-commit-id: 4d1427b012 [formerly 5b1b9cff50]
Former-commit-id: 92f0a1bfb1
|
2015-02-02 10:06:58 -05:00 |
|
Ana Rivera
|
7cea67cfc6
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: ccd0a40621 [formerly ea92049aac] [formerly ccd0a40621 [formerly ea92049aac] [formerly 070f0136ec [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]
Former-commit-id: 070f0136ec
Former-commit-id: e358377ca7 [formerly 1bbb9bad78]
Former-commit-id: 0715e923df
|
2015-01-30 19:29:29 +00:00 |
|
Slav Korolev
|
5246a9025d
|
Omaha #3220 - Performance - Safe Seas, Snow, Fog.
Former-commit-id: efee22d0fb [formerly 2bb8bc22a6] [formerly efee22d0fb [formerly 2bb8bc22a6] [formerly 9e076f7970 [formerly f8ee84a324b3653a75aa3c63a793eca412e1bd81]]]
Former-commit-id: 9e076f7970
Former-commit-id: c52914126d [formerly 13397de60b]
Former-commit-id: dd20df78ee
|
2015-01-29 14:50:02 -05:00 |
|
Steve Harris
|
be1e949e33
|
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
14.4.1-5
Former-commit-id: 1cce5ed9ef [formerly 9927bac8ed] [formerly 1cce5ed9ef [formerly 9927bac8ed] [formerly bc3f196d48 [formerly 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021]]]
Former-commit-id: bc3f196d48
Former-commit-id: 8eadb10d1d [formerly 690c18ae04]
Former-commit-id: e1df0f4767
|
2015-01-28 12:57:55 -06:00 |
|
Ana Rivera
|
cf29758096
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 4071b58b85 [formerly 8bfa7c4087] [formerly 4071b58b85 [formerly 8bfa7c4087] [formerly 20ad0a65f3 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]]
Former-commit-id: 20ad0a65f3
Former-commit-id: de74e8a90d [formerly 3696a3a1d1]
Former-commit-id: 0af5d55eb6
|
2015-01-27 22:05:59 +00:00 |
|
Ron Anderson
|
7ab27329ff
|
Omaha #4018 Formatted all formatter launcher code to make later code reviews easier
Change-Id: Iaf415b8bdd3e8fdc46b8ea66e066b9c2ce3b6f7a
Former-commit-id: a7ab638203 [formerly 5c08543da0] [formerly a7ab638203 [formerly 5c08543da0] [formerly 8a86832fb2 [formerly 99ae51d268e784461c0686a9d86d512049a501ac]]]
Former-commit-id: 8a86832fb2
Former-commit-id: a4c15c7bea [formerly a00e04a8d7]
Former-commit-id: 6d25f74625
|
2015-01-27 13:43:44 -06:00 |
|
steve.naples
|
1baaa49edf
|
ASM #283 - MPE GroupEditPrecipStns updated to fix issue with selecting gages when filtered out with Reverse Point slider.
Change-Id: I9743b37adfb8658d40458c00204ad87c50c10528
Former-commit-id: 86b4054251 [formerly d960e4bba1] [formerly 86b4054251 [formerly d960e4bba1] [formerly 0260da784d [formerly b10de7db401a9d4199c9eed98e41913a87b4b64a]]]
Former-commit-id: 0260da784d
Former-commit-id: 3c53be0a28 [formerly 88dcd9b784]
Former-commit-id: 6ddc4a0a1a
|
2015-01-27 18:36:49 +00:00 |
|
steve.naples
|
bfa932f1e9
|
ASM #559 - Updated PostAnalysisManager and SummedHourlyMpeDlg to fix issue when opening PostAnalysis.
Change-Id: I9c2dcfd6af891b9ce0b60443a46e5cf9f3c7e99a
Former-commit-id: ffb1fbe0e6 [formerly 349ff47f53] [formerly ffb1fbe0e6 [formerly 349ff47f53] [formerly 565c4d69da [formerly fe5c51f43047d77202e6d5056d7d8be1736562bd]]]
Former-commit-id: 565c4d69da
Former-commit-id: 2d1e742a7b [formerly 19e9977a61]
Former-commit-id: 9d178a199f
|
2015-01-27 18:36:07 +00:00 |
|
Steve Harris
|
fcf2003d09
|
Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
Former-commit-id: 0ac687b980 [formerly 1891ed5e5b] [formerly 0ac687b980 [formerly 1891ed5e5b] [formerly 82f2a146da [formerly cfd0a31a17fc4a92af6db3f034d46b01996d2cc0]]]
Former-commit-id: 82f2a146da
Former-commit-id: 9f0e63961f [formerly fbc5eabb4f]
Former-commit-id: 73c5d6e51c
|
2015-01-27 11:34:06 -06:00 |
|
Fay.Liang
|
5ef24fe432
|
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 65d91d9113 [formerly d29d86ad05] [formerly 65d91d9113 [formerly d29d86ad05] [formerly 7bc10075e5 [formerly 6ad30059fa7249aba100a39c7c39215212a929cc]]]
Former-commit-id: 7bc10075e5
Former-commit-id: 86a40666bd [formerly 5e75c0c5aa]
Former-commit-id: f0713c1934
|
2015-01-27 12:08:28 -05:00 |
|
Ana Rivera
|
d4e36fe496
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: 62094315d2 [formerly 7c5fc26537] [formerly 62094315d2 [formerly 7c5fc26537] [formerly 327945af8b [formerly 889608360567b829f81ed6392c64c669798f34a9]]]
Former-commit-id: 327945af8b
Former-commit-id: a84f43a8c6 [formerly 5e97e24201]
Former-commit-id: ef4ca10b8a
|
2015-01-27 16:28:42 +00:00 |
|
Ana Rivera
|
be37ebdc3e
|
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
Former-commit-id: f565ef4315 [formerly 171a38175c] [formerly f565ef4315 [formerly 171a38175c] [formerly dee10b3f6f [formerly 6c72e1864ad5843c4ac42a558b589777af047c77]]]
Former-commit-id: dee10b3f6f
Former-commit-id: 0b7f2e3dd7 [formerly 7f3230cab2]
Former-commit-id: 4b2580bacc
|
2015-01-26 19:04:54 +00:00 |
|
Ana Rivera
|
aa04bff454
|
Merge branch 'master_14.4.1' into emc_14.4.1
Conflicts:
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
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 654d08a588 [formerly 98ac97e397] [formerly 654d08a588 [formerly 98ac97e397] [formerly 7c25945fd9 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]]
Former-commit-id: 7c25945fd9
Former-commit-id: d6630d8f35 [formerly eae1bd317d]
Former-commit-id: cd2841195b
|
2015-01-26 18:45:26 +00:00 |
|
Shawn.Hooper
|
a5b70920fd
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e6c4f29036 [formerly 568b7c801a] [formerly e6c4f29036 [formerly 568b7c801a] [formerly e84a037b2e [formerly 95cdc2d817eac840017fc14746c2ada498f1a716]]]
Former-commit-id: e84a037b2e
Former-commit-id: 9cc09ab18e [formerly 735893aab0]
Former-commit-id: bbaebe4fc0
|
2015-01-26 11:22:49 -05:00 |
|
Nate Jensen
|
df3d12c6c4
|
Omaha #3952 remove custom gzip handling since it is by default enabled
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: 7e8d355f62 [formerly 63189329a1] [formerly 7e8d355f62 [formerly 63189329a1] [formerly c4598baf19 [formerly 4f67ebeb092d182ec0a4e5078e668313d8cc6a57]]]
Former-commit-id: c4598baf19
Former-commit-id: 4672329a75 [formerly dead055dca]
Former-commit-id: 4d96b2a212
|
2015-01-26 09:10:36 -06:00 |
|
steve.naples
|
5734b0f998
|
ASM #17051 MPE: Daily QC will not display Points+Grids together.
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a
Former-commit-id: 6811eb83a7 [formerly 6488242165] [formerly 6811eb83a7 [formerly 6488242165] [formerly 540ea64498 [formerly 8db85622ff4d0f7202c4d2c2e6eefeefe2ef39c3]]]
Former-commit-id: 540ea64498
Former-commit-id: 7287103c0d [formerly b2b9d3905d]
Former-commit-id: df1504f781
|
2015-01-23 20:40:48 +00:00 |
|
Nate Jensen
|
5db9791b67
|
Omaha #3952 disable cairo in alertviz for safety
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f
Former-commit-id: dddc6c2cd4 [formerly 415e2d4035] [formerly dddc6c2cd4 [formerly 415e2d4035] [formerly 7c7c2e3a38 [formerly 640cf4816e4c0cdd0e39b374b8ed02669e8170be]]]
Former-commit-id: 7c7c2e3a38
Former-commit-id: 60227bcce2 [formerly c991d85bfd]
Former-commit-id: 9f82d7af10
|
2015-01-23 12:57:24 -06:00 |
|
Steve Harris
|
fcdd2faaf1
|
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: 8cd9e2e92f [formerly 158fa16376] [formerly 8cd9e2e92f [formerly 158fa16376] [formerly 0f05c53a53 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]]
Former-commit-id: 0f05c53a53
Former-commit-id: 5fda208a17 [formerly 033d0fc742]
Former-commit-id: c3d3d5f424
|
2015-01-23 09:08:06 -06:00 |
|
Ana Rivera
|
c3ce42f75b
|
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: de1b989253 [formerly 705f02f2be] [formerly de1b989253 [formerly 705f02f2be] [formerly 44fa40c0cc [formerly 653472d785f4af6fef8f2edd93c2e538806096ab]]]
Former-commit-id: 44fa40c0cc
Former-commit-id: 87f986052e [formerly d8f7ae400c]
Former-commit-id: f254d7d626
|
2015-01-23 14:21:22 +00:00 |
|
Mark Peters
|
841bf0150c
|
Omaha #3768 Add localization to build.properties
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: 30229a25f2 [formerly db69f5a0bc] [formerly 30229a25f2 [formerly db69f5a0bc] [formerly 7a69f354d9 [formerly a6cafa7a07d33376cda3cc3a69437e45b6e0330f]]]
Former-commit-id: 7a69f354d9
Former-commit-id: a176434c41 [formerly 32dbdc345f]
Former-commit-id: c6fd704642
|
2015-01-22 18:05:40 -06:00 |
|
Shawn.Hooper
|
c1555d3133
|
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 7839dab5e6 [formerly 0bc501bd4c] [formerly 7839dab5e6 [formerly 0bc501bd4c] [formerly a757b55446 [formerly d53c809149da23fcae51138cc45c57aecd641794]]]
Former-commit-id: a757b55446
Former-commit-id: e110ee143a [formerly 6cf71bae0e]
Former-commit-id: 953b71a3f8
|
2015-01-22 16:05:41 -05:00 |
|
Shawn.Hooper
|
0a224087c8
|
ASM #17054 - Disable MRMS Menu in 14.3.1
Change-Id: I071606c7c14ed0332b3c714a67cebab29bfc67f0
Former-commit-id: 9e83601505 [formerly bd5dfed072] [formerly 9e83601505 [formerly bd5dfed072] [formerly d0b7b06d97 [formerly 7f6638dd595b99d6592c58af42f898e0f1b2a02a]]]
Former-commit-id: d0b7b06d97
Former-commit-id: 6f389bd80c [formerly dcf95652a7]
Former-commit-id: ac799987e3
|
2015-01-21 12:44:47 -05:00 |
|
Nate Jensen
|
1915c27938
|
ensure PGEN appears in thinclient D2D Tools menu
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: 7a10bd5620 [formerly bfcb36eeac] [formerly 7a10bd5620 [formerly bfcb36eeac] [formerly ac9d787a26 [formerly 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a]]]
Former-commit-id: ac9d787a26
Former-commit-id: 74e207f306 [formerly 0b9a5965a0]
Former-commit-id: 86868080c3
|
2015-01-20 11:52:37 -06:00 |
|
Michael Gamazaychikov
|
7a28ba150f
|
ASM #17035 - TextWS locks up when running spell checker.
Change-Id: I7dd263367723f37e0ff3d368edcaca11d982a6b3
Former-commit-id: 3465706d3b [formerly a0ad2f7136] [formerly 3465706d3b [formerly a0ad2f7136] [formerly 544437c762 [formerly 1843d3a64ff42d0533016fd4bb126dd0c86f3f22]]]
Former-commit-id: 544437c762
Former-commit-id: e92486e70a [formerly 3947479184]
Former-commit-id: 96f46b2770
|
2015-01-15 16:18:10 -05:00 |
|
Nate Jensen
|
84379b24e2
|
Merge "Omaha #3993 ensure important dataplugin utility folders are included in viz builds" into omaha_14.4.1
Former-commit-id: 0d1414e56b [formerly 16d862700a] [formerly 0d1414e56b [formerly 16d862700a] [formerly 865852c20c [formerly 6557237cd4cea3300292e1612622547c23bdde2c]]]
Former-commit-id: 865852c20c
Former-commit-id: 99dae46c58 [formerly c06e1c0adb]
Former-commit-id: 95bdbef8c4
|
2015-01-15 13:07:10 -06:00 |
|