Ron Anderson
|
292c9777a4
|
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
Former-commit-id: 933590f36a [formerly f280c0ab2e [formerly 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c]]
Former-commit-id: f280c0ab2e
Former-commit-id: 8c6c42fe43
|
2015-02-02 15:04:51 -06:00 |
|
Ron Anderson
|
72fa5331da
|
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
Former-commit-id: 292c9777a4 [formerly 8c6c42fe43] [formerly f280c0ab2e] [formerly 292c9777a4 [formerly 8c6c42fe43] [formerly f280c0ab2e] [formerly 933590f36a [formerly f280c0ab2e [formerly 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c]]]]
Former-commit-id: 933590f36a
Former-commit-id: 5a873f87d5 [formerly cc882eae28] [formerly ef204f25ac9dde9f0e1bedc81cb36de22a062b37 [formerly 074512f362]]
Former-commit-id: e0a40872c1ee10521c91a39a50f26b152adfe7b1 [formerly fa9890db7a]
Former-commit-id: a3bfe3b090
|
2015-02-02 15:04:51 -06:00 |
|
Bradley Mabe
|
94094f2600
|
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: 8f0fb81e42 [formerly e8dc39ee79] [formerly 847c663329] [formerly 8f0fb81e42 [formerly e8dc39ee79] [formerly 847c663329] [formerly de986a26ed [formerly 847c663329 [formerly a71f38e658319ac1109de6c73dfa29db35535f96]]]]
Former-commit-id: de986a26ed
Former-commit-id: 50b7386177 [formerly 165e747e6e] [formerly 83fcd3c9dae87c83c35abcb5f46acf7fe196b097 [formerly eebc4f4232]]
Former-commit-id: 00b56cb62b9053f8d57fdb81ccaf384e92462158 [formerly d86ae801fb]
Former-commit-id: 1911c68fb3
|
2015-02-02 15:49:14 -05:00 |
|
Bradley Mabe
|
8f0fb81e42
|
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: de986a26ed [formerly 847c663329 [formerly a71f38e658319ac1109de6c73dfa29db35535f96]]
Former-commit-id: 847c663329
Former-commit-id: e8dc39ee79
|
2015-02-02 15:49:14 -05:00 |
|
Ron Anderson
|
f9c31d4237
|
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: 346ea417ea [formerly bdc365d9c9 [formerly 9d2f64b08acbec0567c7f29871480827ff0f6de7]]
Former-commit-id: bdc365d9c9
Former-commit-id: 67443be919
|
2015-02-02 11:26:59 -06:00 |
|
Ron Anderson
|
eb7f457ff9
|
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: f9c31d4237 [formerly 67443be919] [formerly bdc365d9c9] [formerly f9c31d4237 [formerly 67443be919] [formerly bdc365d9c9] [formerly 346ea417ea [formerly bdc365d9c9 [formerly 9d2f64b08acbec0567c7f29871480827ff0f6de7]]]]
Former-commit-id: 346ea417ea
Former-commit-id: e5cd3a264a [formerly d3bce10b61] [formerly 3c9e861b0a7046daf174da682957bacc3fc53825 [formerly 48c2f0e843]]
Former-commit-id: c05eab7f23451112b73da73fa553ce8d7c9a5fc5 [formerly 30824e2e86]
Former-commit-id: 07ac450c18
|
2015-02-02 11:26:59 -06:00 |
|
Fay.Liang
|
a601a2c9f7
|
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: 15f28c0245 [formerly 4ddd4cec81 [formerly 307e986b8e9ce89ad1eb7b28f88afe82c2596f30]]
Former-commit-id: 4ddd4cec81
Former-commit-id: 99b1511120
|
2015-02-02 10:06:58 -05:00 |
|
Fay.Liang
|
e8753ba168
|
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: a601a2c9f7 [formerly 99b1511120] [formerly 4ddd4cec81] [formerly a601a2c9f7 [formerly 99b1511120] [formerly 4ddd4cec81] [formerly 15f28c0245 [formerly 4ddd4cec81 [formerly 307e986b8e9ce89ad1eb7b28f88afe82c2596f30]]]]
Former-commit-id: 15f28c0245
Former-commit-id: 3a39f4bc15 [formerly 4d1427b012] [formerly 4b2572a25fe5c79c86188f2479711145f792b619 [formerly 5b1b9cff50]]
Former-commit-id: fe1692f3f9b0488d105c3cf468babe911a43bc0f [formerly 92f0a1bfb1]
Former-commit-id: 614d6f9c9e
|
2015-02-02 10:06:58 -05:00 |
|
Ana Rivera
|
2be03903bc
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: 070f0136ec [formerly ea92049aac [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]
Former-commit-id: ea92049aac
Former-commit-id: ccd0a40621
|
2015-01-30 19:29:29 +00:00 |
|
Ana Rivera
|
24e1be0580
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: 2be03903bc [formerly ccd0a40621] [formerly ea92049aac] [formerly 2be03903bc [formerly ccd0a40621] [formerly ea92049aac] [formerly 070f0136ec [formerly ea92049aac [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]]
Former-commit-id: 070f0136ec
Former-commit-id: c5182d351e [formerly e358377ca7] [formerly 83f5ea939fdc2f3bd6430413f7c32ec2de4681c6 [formerly 1bbb9bad78]]
Former-commit-id: 5a5444cf3e777acf29e90a268647565f4755def7 [formerly 0715e923df]
Former-commit-id: 7cea67cfc6
|
2015-01-30 19:29:29 +00:00 |
|
Ron Anderson
|
2c626b6534
|
Merge "Issue #4062 Fix AlertViz errors on some custom map scales." into omaha_14.3.1
Former-commit-id: 5ae603146b [formerly b00ed924ba [formerly a235391aaccc074f020464c97b0a245cabac933b]]
Former-commit-id: b00ed924ba
Former-commit-id: a88399ac98
|
2015-01-30 10:51:37 -06:00 |
|
Ron Anderson
|
abe3518cfb
|
Issue #4062 Fix AlertViz errors on some custom map scales.
Change-Id: Id9facb0ba799c4a6272f57ffdc85e32699982b9c
Former-commit-id: 80ecb8b27a [formerly df90d1160d [formerly 4826b2a664ade311e29c36fb43a2fca71a795343]]
Former-commit-id: df90d1160d
Former-commit-id: 4d71c4d07d
|
2015-01-30 09:25:55 -06:00 |
|
Slav Korolev
|
e44794e98b
|
Omaha #3220 - Performance - Safe Seas, Snow, Fog.
Former-commit-id: 9e076f7970 [formerly 2bb8bc22a6 [formerly f8ee84a324b3653a75aa3c63a793eca412e1bd81]]
Former-commit-id: 2bb8bc22a6
Former-commit-id: efee22d0fb
|
2015-01-29 14:50:02 -05:00 |
|
Slav Korolev
|
cdd6a67b67
|
Omaha #3220 - Performance - Safe Seas, Snow, Fog.
Former-commit-id: e44794e98b [formerly efee22d0fb] [formerly 2bb8bc22a6] [formerly e44794e98b [formerly efee22d0fb] [formerly 2bb8bc22a6] [formerly 9e076f7970 [formerly 2bb8bc22a6 [formerly f8ee84a324b3653a75aa3c63a793eca412e1bd81]]]]
Former-commit-id: 9e076f7970
Former-commit-id: ade0c32d93 [formerly c52914126d] [formerly 91ba04da12c4b66c017ff1c9e1e3d091dff69d06 [formerly 13397de60b]]
Former-commit-id: a26cdf00c18722d6cc203a1a98843cb7e8cc0f11 [formerly dd20df78ee]
Former-commit-id: 5246a9025d
|
2015-01-29 14:50:02 -05:00 |
|
Steve Harris
|
94c54c32b1
|
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
14.4.1-5
Former-commit-id: bc3f196d48 [formerly 9927bac8ed [formerly 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021]]
Former-commit-id: 9927bac8ed
Former-commit-id: 1cce5ed9ef
|
2015-01-28 12:57:55 -06:00 |
|
Steve Harris
|
0e92ae6b98
|
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
14.4.1-5
Former-commit-id: 94c54c32b1 [formerly 1cce5ed9ef] [formerly 9927bac8ed] [formerly 94c54c32b1 [formerly 1cce5ed9ef] [formerly 9927bac8ed] [formerly bc3f196d48 [formerly 9927bac8ed [formerly 6f10c0ebeb8956fd0d12f424ddd9b09bdc4b4021]]]]
Former-commit-id: bc3f196d48
Former-commit-id: 2af61518e0 [formerly 8eadb10d1d] [formerly e6704952115602df0a1c863411cd291fdbec8386 [formerly 690c18ae04]]
Former-commit-id: be8f3a2b2daa7a8bb5b089477096277faad8e57c [formerly e1df0f4767]
Former-commit-id: be1e949e33
|
2015-01-28 12:57:55 -06:00 |
|
Ana Rivera
|
ed61c52ee3
|
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: 20ad0a65f3 [formerly 8bfa7c4087 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]
Former-commit-id: 8bfa7c4087
Former-commit-id: 4071b58b85
|
2015-01-27 22:05:59 +00:00 |
|
Ana Rivera
|
8ab81cc28a
|
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: ed61c52ee3 [formerly 4071b58b85] [formerly 8bfa7c4087] [formerly ed61c52ee3 [formerly 4071b58b85] [formerly 8bfa7c4087] [formerly 20ad0a65f3 [formerly 8bfa7c4087 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]]]
Former-commit-id: 20ad0a65f3
Former-commit-id: f92cfb0f40 [formerly de74e8a90d] [formerly 442a60d056ccadc0eef6f172e33926ab71037b10 [formerly 3696a3a1d1]]
Former-commit-id: dbb1d85007537eb63770397a06174c0f4b1b1206 [formerly 0af5d55eb6]
Former-commit-id: cf29758096
|
2015-01-27 22:05:59 +00:00 |
|
Ron Anderson
|
ef1afbaa0c
|
Omaha #4018 Formatted all formatter launcher code to make later code reviews easier
Change-Id: Iaf415b8bdd3e8fdc46b8ea66e066b9c2ce3b6f7a
Former-commit-id: 8a86832fb2 [formerly 5c08543da0 [formerly 99ae51d268e784461c0686a9d86d512049a501ac]]
Former-commit-id: 5c08543da0
Former-commit-id: a7ab638203
|
2015-01-27 13:43:44 -06:00 |
|
Ron Anderson
|
022afe7518
|
Omaha #4018 Formatted all formatter launcher code to make later code reviews easier
Change-Id: Iaf415b8bdd3e8fdc46b8ea66e066b9c2ce3b6f7a
Former-commit-id: ef1afbaa0c [formerly a7ab638203] [formerly 5c08543da0] [formerly ef1afbaa0c [formerly a7ab638203] [formerly 5c08543da0] [formerly 8a86832fb2 [formerly 5c08543da0 [formerly 99ae51d268e784461c0686a9d86d512049a501ac]]]]
Former-commit-id: 8a86832fb2
Former-commit-id: 6e7d00e190 [formerly a4c15c7bea] [formerly ff05c9f6924076e0f72cb56db3be2828275d381d [formerly a00e04a8d7]]
Former-commit-id: 1976e5f71abf4a24d0b6a62adb37f72e1cfd1bce [formerly 6d25f74625]
Former-commit-id: 7ab27329ff
|
2015-01-27 13:43:44 -06:00 |
|
steve.naples
|
00b3fb4c42
|
ASM #283 - MPE GroupEditPrecipStns updated to fix issue with selecting gages when filtered out with Reverse Point slider.
Change-Id: I9743b37adfb8658d40458c00204ad87c50c10528
Former-commit-id: 0260da784d [formerly d960e4bba1 [formerly b10de7db401a9d4199c9eed98e41913a87b4b64a]]
Former-commit-id: d960e4bba1
Former-commit-id: 86b4054251
|
2015-01-27 18:36:49 +00:00 |
|
steve.naples
|
2661d40e59
|
ASM #283 - MPE GroupEditPrecipStns updated to fix issue with selecting gages when filtered out with Reverse Point slider.
Change-Id: I9743b37adfb8658d40458c00204ad87c50c10528
Former-commit-id: 00b3fb4c42 [formerly 86b4054251] [formerly d960e4bba1] [formerly 00b3fb4c42 [formerly 86b4054251] [formerly d960e4bba1] [formerly 0260da784d [formerly d960e4bba1 [formerly b10de7db401a9d4199c9eed98e41913a87b4b64a]]]]
Former-commit-id: 0260da784d
Former-commit-id: c24217ff0e [formerly 3c53be0a28] [formerly 99a093ac1fddb033378e291a879ba19f680c6a0f [formerly 88dcd9b784]]
Former-commit-id: 3b383b82ad81bfd8d0cf64f93df9e47810c2a238 [formerly 6ddc4a0a1a]
Former-commit-id: 1baaa49edf
|
2015-01-27 18:36:49 +00:00 |
|
steve.naples
|
eedecf76d0
|
ASM #559 - Updated PostAnalysisManager and SummedHourlyMpeDlg to fix issue when opening PostAnalysis.
Change-Id: I9c2dcfd6af891b9ce0b60443a46e5cf9f3c7e99a
Former-commit-id: 565c4d69da [formerly 349ff47f53 [formerly fe5c51f43047d77202e6d5056d7d8be1736562bd]]
Former-commit-id: 349ff47f53
Former-commit-id: ffb1fbe0e6
|
2015-01-27 18:36:07 +00:00 |
|
steve.naples
|
3c5b5e475c
|
ASM #559 - Updated PostAnalysisManager and SummedHourlyMpeDlg to fix issue when opening PostAnalysis.
Change-Id: I9c2dcfd6af891b9ce0b60443a46e5cf9f3c7e99a
Former-commit-id: eedecf76d0 [formerly ffb1fbe0e6] [formerly 349ff47f53] [formerly eedecf76d0 [formerly ffb1fbe0e6] [formerly 349ff47f53] [formerly 565c4d69da [formerly 349ff47f53 [formerly fe5c51f43047d77202e6d5056d7d8be1736562bd]]]]
Former-commit-id: 565c4d69da
Former-commit-id: 98edc2db58 [formerly 2d1e742a7b] [formerly 134ebd983a368ffd7a3b003163e80e544b23982d [formerly 19e9977a61]]
Former-commit-id: 46a10b7fd641faab8930cf246bd47c780ddce651 [formerly 9d178a199f]
Former-commit-id: bfa932f1e9
|
2015-01-27 18:36:07 +00:00 |
|
Steve Harris
|
70b40e76fb
|
Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
Former-commit-id: 82f2a146da [formerly 1891ed5e5b [formerly cfd0a31a17fc4a92af6db3f034d46b01996d2cc0]]
Former-commit-id: 1891ed5e5b
Former-commit-id: 0ac687b980
|
2015-01-27 11:34:06 -06:00 |
|
Steve Harris
|
13a33f9b3e
|
Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
Former-commit-id: 70b40e76fb [formerly 0ac687b980] [formerly 1891ed5e5b] [formerly 70b40e76fb [formerly 0ac687b980] [formerly 1891ed5e5b] [formerly 82f2a146da [formerly 1891ed5e5b [formerly cfd0a31a17fc4a92af6db3f034d46b01996d2cc0]]]]
Former-commit-id: 82f2a146da
Former-commit-id: 0e805888ee [formerly 9f0e63961f] [formerly 345c46c6377f759a853827c13d522d612702ae2a [formerly fbc5eabb4f]]
Former-commit-id: 53eea3060db58e0a6f6df304734f1a98bccf14eb [formerly 73c5d6e51c]
Former-commit-id: fcf2003d09
|
2015-01-27 11:34:06 -06:00 |
|
Fay.Liang
|
b4e5582b9f
|
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 745ddd63c0 [formerly 65d91d9113] [formerly d29d86ad05] [formerly 745ddd63c0 [formerly 65d91d9113] [formerly d29d86ad05] [formerly 7bc10075e5 [formerly d29d86ad05 [formerly 6ad30059fa7249aba100a39c7c39215212a929cc]]]]
Former-commit-id: 7bc10075e5
Former-commit-id: 42b2d29c8f [formerly 86a40666bd] [formerly 49badeac1d1c1ed599a7b856f6d190fc2dda1d18 [formerly 5e75c0c5aa]]
Former-commit-id: 4b6da8ecfe7643feb6e5fe822396f1c1414ae2bf [formerly f0713c1934]
Former-commit-id: 5ef24fe432
|
2015-01-27 12:08:28 -05:00 |
|
Fay.Liang
|
745ddd63c0
|
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 7bc10075e5 [formerly d29d86ad05 [formerly 6ad30059fa7249aba100a39c7c39215212a929cc]]
Former-commit-id: d29d86ad05
Former-commit-id: 65d91d9113
|
2015-01-27 12:08:28 -05:00 |
|
Ana Rivera
|
dd232580d0
|
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: 327945af8b [formerly 7c5fc26537 [formerly 889608360567b829f81ed6392c64c669798f34a9]]
Former-commit-id: 7c5fc26537
Former-commit-id: 62094315d2
|
2015-01-27 16:28:42 +00:00 |
|
Ana Rivera
|
d87f6071d6
|
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: dd232580d0 [formerly 62094315d2] [formerly 7c5fc26537] [formerly dd232580d0 [formerly 62094315d2] [formerly 7c5fc26537] [formerly 327945af8b [formerly 7c5fc26537 [formerly 889608360567b829f81ed6392c64c669798f34a9]]]]
Former-commit-id: 327945af8b
Former-commit-id: 11426c1e60 [formerly a84f43a8c6] [formerly e41d85a493744309b4e1cd1f506bbd5cb6613c13 [formerly 5e97e24201]]
Former-commit-id: 89cb464614c3ae953a939f0b777e03f7ef4daf11 [formerly ef4ca10b8a]
Former-commit-id: d4e36fe496
|
2015-01-27 16:28:42 +00:00 |
|
Ana Rivera
|
44072b0866
|
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
Former-commit-id: 7fede56575 [formerly f565ef4315] [formerly 171a38175c] [formerly 7fede56575 [formerly f565ef4315] [formerly 171a38175c] [formerly dee10b3f6f [formerly 171a38175c [formerly 6c72e1864ad5843c4ac42a558b589777af047c77]]]]
Former-commit-id: dee10b3f6f
Former-commit-id: b981134585 [formerly 0b7f2e3dd7] [formerly 73d372382464f0d95ca76f6725272dcc04255859 [formerly 7f3230cab2]]
Former-commit-id: 9984a75c46df5d906292ef893c7c7a38eac6de4b [formerly 4b2580bacc]
Former-commit-id: be37ebdc3e
|
2015-01-26 19:04:54 +00:00 |
|
Ana Rivera
|
7fede56575
|
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
Former-commit-id: dee10b3f6f [formerly 171a38175c [formerly 6c72e1864ad5843c4ac42a558b589777af047c77]]
Former-commit-id: 171a38175c
Former-commit-id: f565ef4315
|
2015-01-26 19:04:54 +00:00 |
|
Ana Rivera
|
854a203107
|
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: 48cb3fd143 [formerly 654d08a588] [formerly 98ac97e397] [formerly 48cb3fd143 [formerly 654d08a588] [formerly 98ac97e397] [formerly 7c25945fd9 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]]]
Former-commit-id: 7c25945fd9
Former-commit-id: cecf9e2ef6 [formerly d6630d8f35] [formerly 0612a8075112c53ca561737244fdc42031bbb44c [formerly eae1bd317d]]
Former-commit-id: bb15a8f43d38e1956b090806df98b75978f14292 [formerly cd2841195b]
Former-commit-id: aa04bff454
|
2015-01-26 18:45:26 +00:00 |
|
Ana Rivera
|
48cb3fd143
|
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: 7c25945fd9 [formerly 98ac97e397 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]
Former-commit-id: 98ac97e397
Former-commit-id: 654d08a588
|
2015-01-26 18:45:26 +00:00 |
|
Shawn.Hooper
|
ee48ce9e68
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: e84a037b2e [formerly 568b7c801a [formerly 95cdc2d817eac840017fc14746c2ada498f1a716]]
Former-commit-id: 568b7c801a
Former-commit-id: e6c4f29036
|
2015-01-26 11:22:49 -05:00 |
|
Shawn.Hooper
|
4669314ed9
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: ee48ce9e68 [formerly e6c4f29036] [formerly 568b7c801a] [formerly ee48ce9e68 [formerly e6c4f29036] [formerly 568b7c801a] [formerly e84a037b2e [formerly 568b7c801a [formerly 95cdc2d817eac840017fc14746c2ada498f1a716]]]]
Former-commit-id: e84a037b2e
Former-commit-id: 7b6c631780 [formerly 9cc09ab18e] [formerly 0a8001cae9c65d8820ca558d173024196b8d92be [formerly 735893aab0]]
Former-commit-id: 5f80eb11138952b36683d3184c8f43ef25421f01 [formerly bbaebe4fc0]
Former-commit-id: a5b70920fd
|
2015-01-26 11:22:49 -05:00 |
|
Nate Jensen
|
6de7f4d2c8
|
Omaha #3952 remove custom gzip handling since it is by default enabled
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: c4598baf19 [formerly 63189329a1 [formerly 4f67ebeb092d182ec0a4e5078e668313d8cc6a57]]
Former-commit-id: 63189329a1
Former-commit-id: 7e8d355f62
|
2015-01-26 09:10:36 -06:00 |
|
Nate Jensen
|
2e2869bf7b
|
Omaha #3952 remove custom gzip handling since it is by default enabled
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: 6de7f4d2c8 [formerly 7e8d355f62] [formerly 63189329a1] [formerly 6de7f4d2c8 [formerly 7e8d355f62] [formerly 63189329a1] [formerly c4598baf19 [formerly 63189329a1 [formerly 4f67ebeb092d182ec0a4e5078e668313d8cc6a57]]]]
Former-commit-id: c4598baf19
Former-commit-id: 7c77a1877e [formerly 4672329a75] [formerly 4cd9a8b2e97217fb2f5ad101996cb66bf394e504 [formerly dead055dca]]
Former-commit-id: 37411debd3ddda5a3b867db46ce99859bbea3cad [formerly 4d96b2a212]
Former-commit-id: df3d12c6c4
|
2015-01-26 09:10:36 -06:00 |
|
steve.naples
|
8d7fdfae67
|
ASM #17051 MPE: Daily QC will not display Points+Grids together.
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a
Former-commit-id: 540ea64498 [formerly 6488242165 [formerly 8db85622ff4d0f7202c4d2c2e6eefeefe2ef39c3]]
Former-commit-id: 6488242165
Former-commit-id: 6811eb83a7
|
2015-01-23 20:40:48 +00:00 |
|
steve.naples
|
16afd1cbfd
|
ASM #17051 MPE: Daily QC will not display Points+Grids together.
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a
Former-commit-id: 8d7fdfae67 [formerly 6811eb83a7] [formerly 6488242165] [formerly 8d7fdfae67 [formerly 6811eb83a7] [formerly 6488242165] [formerly 540ea64498 [formerly 6488242165 [formerly 8db85622ff4d0f7202c4d2c2e6eefeefe2ef39c3]]]]
Former-commit-id: 540ea64498
Former-commit-id: cd5a0b8843 [formerly 7287103c0d] [formerly 6c3edfceb91b218447b84c049d8cf0c0e0d47e2e [formerly b2b9d3905d]]
Former-commit-id: 1a5cda28c5d25a3b402a8593b82f6fe749b9470b [formerly df1504f781]
Former-commit-id: 5734b0f998
|
2015-01-23 20:40:48 +00:00 |
|
Nate Jensen
|
8d5b4d5eb9
|
Omaha #3952 disable cairo in alertviz for safety
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f
Former-commit-id: 7c7c2e3a38 [formerly 415e2d4035 [formerly 640cf4816e4c0cdd0e39b374b8ed02669e8170be]]
Former-commit-id: 415e2d4035
Former-commit-id: dddc6c2cd4
|
2015-01-23 12:57:24 -06:00 |
|
Nate Jensen
|
6b23bfa212
|
Omaha #3952 disable cairo in alertviz for safety
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f
Former-commit-id: 8d5b4d5eb9 [formerly dddc6c2cd4] [formerly 415e2d4035] [formerly 8d5b4d5eb9 [formerly dddc6c2cd4] [formerly 415e2d4035] [formerly 7c7c2e3a38 [formerly 415e2d4035 [formerly 640cf4816e4c0cdd0e39b374b8ed02669e8170be]]]]
Former-commit-id: 7c7c2e3a38
Former-commit-id: f620816ff6 [formerly 60227bcce2] [formerly fa9b8bec1651fe83a3d02c9e7afad132bb18e9fd [formerly c991d85bfd]]
Former-commit-id: c508c91675b2a9810f26c1958ae01de48b1b1c59 [formerly 9f82d7af10]
Former-commit-id: 5db9791b67
|
2015-01-23 12:57:24 -06:00 |
|
Steve Harris
|
ea3465f55a
|
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: 0f05c53a53 [formerly 158fa16376 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]
Former-commit-id: 158fa16376
Former-commit-id: 8cd9e2e92f
|
2015-01-23 09:08:06 -06:00 |
|
Steve Harris
|
936834331d
|
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: ea3465f55a [formerly 8cd9e2e92f] [formerly 158fa16376] [formerly ea3465f55a [formerly 8cd9e2e92f] [formerly 158fa16376] [formerly 0f05c53a53 [formerly 158fa16376 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]]]
Former-commit-id: 0f05c53a53
Former-commit-id: c6bb3f9f17 [formerly 5fda208a17] [formerly fd646e3ab88985355fb86128bc69473ecf242072 [formerly 033d0fc742]]
Former-commit-id: 10bac022834ddaeda42626dd3c8c191014cda5e8 [formerly c3d3d5f424]
Former-commit-id: fcdd2faaf1
|
2015-01-23 09:08:06 -06:00 |
|
Ana Rivera
|
5c27319de8
|
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 5cde6832a1 [formerly de1b989253] [formerly 705f02f2be] [formerly 5cde6832a1 [formerly de1b989253] [formerly 705f02f2be] [formerly 44fa40c0cc [formerly 705f02f2be [formerly 653472d785f4af6fef8f2edd93c2e538806096ab]]]]
Former-commit-id: 44fa40c0cc
Former-commit-id: 275832ced4 [formerly 87f986052e] [formerly e4fe3b35e0ee2240d735a1102d99f91917fd313f [formerly d8f7ae400c]]
Former-commit-id: b7f388c6dd53acf218a640b10e856104eced3381 [formerly f254d7d626]
Former-commit-id: c3ce42f75b
|
2015-01-23 14:21:22 +00:00 |
|
Ana Rivera
|
5cde6832a1
|
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 44fa40c0cc [formerly 705f02f2be [formerly 653472d785f4af6fef8f2edd93c2e538806096ab]]
Former-commit-id: 705f02f2be
Former-commit-id: de1b989253
|
2015-01-23 14:21:22 +00:00 |
|
Mark Peters
|
e668bf77ff
|
Omaha #3768 Add localization to build.properties
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: 7a69f354d9 [formerly db69f5a0bc [formerly a6cafa7a07d33376cda3cc3a69437e45b6e0330f]]
Former-commit-id: db69f5a0bc
Former-commit-id: 30229a25f2
|
2015-01-22 18:05:40 -06:00 |
|
Mark Peters
|
eaabf1281f
|
Omaha #3768 Add localization to build.properties
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: e668bf77ff [formerly 30229a25f2] [formerly db69f5a0bc] [formerly e668bf77ff [formerly 30229a25f2] [formerly db69f5a0bc] [formerly 7a69f354d9 [formerly db69f5a0bc [formerly a6cafa7a07d33376cda3cc3a69437e45b6e0330f]]]]
Former-commit-id: 7a69f354d9
Former-commit-id: 5e30a9a2b6 [formerly a176434c41] [formerly 07d7a446e738af0ab58692a612f9120d7eb946e5 [formerly 32dbdc345f]]
Former-commit-id: 31efce86df88c8f1123b2acdeb12548a1dbbff0b [formerly c6fd704642]
Former-commit-id: 841bf0150c
|
2015-01-22 18:05:40 -06:00 |
|
Shawn.Hooper
|
eefaa49d44
|
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: a757b55446 [formerly 0bc501bd4c [formerly d53c809149da23fcae51138cc45c57aecd641794]]
Former-commit-id: 0bc501bd4c
Former-commit-id: 7839dab5e6
|
2015-01-22 16:05:41 -05:00 |
|
Shawn.Hooper
|
9f0698b631
|
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: eefaa49d44 [formerly 7839dab5e6] [formerly 0bc501bd4c] [formerly eefaa49d44 [formerly 7839dab5e6] [formerly 0bc501bd4c] [formerly a757b55446 [formerly 0bc501bd4c [formerly d53c809149da23fcae51138cc45c57aecd641794]]]]
Former-commit-id: a757b55446
Former-commit-id: ef1b152502 [formerly e110ee143a] [formerly 846a085e02ef123cf22a20cfcdcee3365bcca4dd [formerly 6cf71bae0e]]
Former-commit-id: 58d82a3f83ab66bcc80a9c33364bdb69623a3f39 [formerly 953b71a3f8]
Former-commit-id: c1555d3133
|
2015-01-22 16:05:41 -05:00 |
|