Commit graph

7655 commits

Author SHA1 Message Date
Greg Armendariz
e753638fcb Omaha #3299 - Update buid.xml to work with nightly build and development workstation
Former-commit-id: c8d4fb79dd [formerly ca6440c80e] [formerly c8d4fb79dd [formerly ca6440c80e] [formerly 5685c69da3 [formerly ab3ed9118dfd90ea929e450d991d882312f4a520]]]
Former-commit-id: 5685c69da3
Former-commit-id: 3db1e79370 [formerly 2161f229e2]
Former-commit-id: 04bcd53329
2015-02-09 14:57:22 -06:00
Greg Armendariz
97cc17408b Merge "Omaha #3299 - Fix collaboration RPM build issue" into omaha_14.4.1
Former-commit-id: a1ee800641 [formerly 40e2f812cc] [formerly a1ee800641 [formerly 40e2f812cc] [formerly 3b596f12d8 [formerly da49b73121818f3022f71deee8a2a57230b2a227]]]
Former-commit-id: 3b596f12d8
Former-commit-id: a2cd0b9879 [formerly 9d07126719]
Former-commit-id: 573b3d77db
2015-02-09 10:09:20 -06:00
Nate Jensen
431a1a0ed8 Merge "Omaha #3299 - Modify RCM deploy script" into omaha_14.4.1
Former-commit-id: 66c3ef37ca [formerly 35295b401c] [formerly 66c3ef37ca [formerly 35295b401c] [formerly 2bd03ecec0 [formerly 24849a362531a27a789ef3ea512bed87d7159af8]]]
Former-commit-id: 2bd03ecec0
Former-commit-id: a8ae15a20c [formerly 771ff3f4c8]
Former-commit-id: da95c68b42
2015-02-09 09:19:45 -06:00
Greg Armendariz
2f8b5d32eb Omaha #3299 - Fix collaboration RPM build issue
Former-commit-id: 6fed5e21e7 [formerly b88c8da164] [formerly 6fed5e21e7 [formerly b88c8da164] [formerly af72fd3775 [formerly 9132eff524289c5df48c682cd3ff226fe14cdf1b]]]
Former-commit-id: af72fd3775
Former-commit-id: d27e4b416e [formerly 483ed63a57]
Former-commit-id: 3463c00928
2015-02-06 11:37:47 -06:00
Greg Armendariz
6a33eca154 Omaha #3299 - Modify RCM deploy script
Change-Id: I420acc08705ebc2f52cd52ab7954b4d8c16fef15

Former-commit-id: 61bd37895f [formerly 2a554c5498] [formerly 61bd37895f [formerly 2a554c5498] [formerly d3658d0f28 [formerly 97c6bded155fc58e59beecdb33016e5286e622c1]]]
Former-commit-id: d3658d0f28
Former-commit-id: 13bb984db1 [formerly 7a2ab677d1]
Former-commit-id: 9b7823cf31
2015-02-06 11:20:43 -06: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
Greg Armendariz
6a9cabee18 Merge "Omaha #3839 - Add script to /awips2/edex/bin/" into omaha_14.4.1
Former-commit-id: c39decf0af [formerly cc49405b55] [formerly c39decf0af [formerly cc49405b55] [formerly 9adbeabfca [formerly ad84dfc315b8a5af393dbcf358622c54830faea0]]]
Former-commit-id: 9adbeabfca
Former-commit-id: 63e1f2bead [formerly 0daeb043e9]
Former-commit-id: ab49a59cf0
2015-02-04 12:16:32 -06:00
Greg Armendariz
b0121df3bc Omaha #3839 - Add script to /awips2/edex/bin/
Former-commit-id: efbdfa504b [formerly 25cb96ec19] [formerly efbdfa504b [formerly 25cb96ec19] [formerly bb8a61a996 [formerly c215890342be6fed80d614e0a5853e8ce816a7f2]]]
Former-commit-id: bb8a61a996
Former-commit-id: c3b4d790a3 [formerly d405e4bfe1]
Former-commit-id: 956a8fd092
2015-02-04 09:59:06 -06: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
Greg Armendariz
e09375ffce Merge "Omaha #4065 - Update EDEX RPM install to modify date stamp" into omaha_14.4.1
Former-commit-id: bdcb5067d4 [formerly e87f8c0c5f] [formerly bdcb5067d4 [formerly e87f8c0c5f] [formerly e004e0881f [formerly ddf9b7d0a97ffda6e79688d7c35c828fb7fc1d91]]]
Former-commit-id: e004e0881f
Former-commit-id: 24d9da8c2c [formerly 48afd5b062]
Former-commit-id: 86a6f08f80
2015-02-03 11:35:26 -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
Greg Armendariz
e3f22bed4c Omaha #4065 - Update EDEX RPM install to modify date stamp
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0

Former-commit-id: 19d79f71d3 [formerly 8c38289cf7] [formerly 19d79f71d3 [formerly 8c38289cf7] [formerly fbadd1deb1 [formerly 83243af002e8ddfd15f899ff1ab3e511cf5a0af4]]]
Former-commit-id: fbadd1deb1
Former-commit-id: 6a7891d660 [formerly a3d4342498]
Former-commit-id: fdf1408c06
2015-02-03 10:12:54 -06: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
Richard Peter
4593d63c34 Merge "Omaha #4031 Implement preferrred AFOS first letter." into omaha_14.4.1
Former-commit-id: a63c9099c8 [formerly 166bf912bd] [formerly a63c9099c8 [formerly 166bf912bd] [formerly a3a4c9b0b7 [formerly 28d8103fc3287f27edccc6187ca3df5d72726d97]]]
Former-commit-id: a3a4c9b0b7
Former-commit-id: f5b835a71c [formerly 8bd257fa31]
Former-commit-id: 87a5d55d91
2015-02-02 12:49:01 -06: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
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
Roger Ferrel
101817c3df Omaha #4031 Implement preferrred AFOS first letter.
Change-Id: I1c011beaf078d08c79c02863ac8afd01c7318645

Former-commit-id: fca30b70f5 [formerly 28f435a27f] [formerly fca30b70f5 [formerly 28f435a27f] [formerly 61ab864445 [formerly 776989760fa936913006924efb1e84832ffec31f]]]
Former-commit-id: 61ab864445
Former-commit-id: f94ff0543f [formerly 522b08564d]
Former-commit-id: c88bb9e085
2015-01-30 13:01:01 -06: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
Evan Polster
bae778834e VLab Issue #6222. Ensemble Tool Feature: 14.4.1 cosmetic and bug fix; fixes #6222
Change-Id: I0af8db16244969e80ed81b82e83544bb94188387

Former-commit-id: 252765c247 [formerly 0235002dc0] [formerly 252765c247 [formerly 0235002dc0] [formerly 026366fc59 [formerly 24dee8480063cf90e5c261e848d9cbcddf6b9459]]]
Former-commit-id: 026366fc59
Former-commit-id: 0043f67642 [formerly 7530746a7b]
Former-commit-id: 7923db8640
2015-01-29 19:14:08 +00: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 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
Ron Anderson
8ce529bb2d Merge "Omaha #4033 Fix logging in configureTextProducts" into omaha_14.4.1
Former-commit-id: 178ad50f20 [formerly d97b54018c] [formerly 178ad50f20 [formerly d97b54018c] [formerly 3a804c4be7 [formerly aa7900e79f0ce9074c32ad0785dd9d0ccbfa64ba]]]
Former-commit-id: 3a804c4be7
Former-commit-id: c6d1067f5e [formerly db93685468]
Former-commit-id: f4727858a3
2015-01-27 08:59:12 -06:00
Ron Anderson
2fb19954c4 Omaha #4033 Fix logging in configureTextProducts
Change-Id: I1d2de04b532a3d543418d42c76e499cde2c04030

Former-commit-id: 0dc17a57a2 [formerly 13bfa6e362] [formerly 0dc17a57a2 [formerly 13bfa6e362] [formerly 29930e52b3 [formerly 1c1fefe7cc5cf26abf7c60254132ddeb22585b26]]]
Former-commit-id: 29930e52b3
Former-commit-id: 9fd0055fff [formerly 738c7462c8]
Former-commit-id: 658c547dca
2015-01-26 17:50:28 -06: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
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
Richard Peter
c9f7f32c39 Merge "Omaha #3918 Central registry web interface broken by DPA fix." into omaha_14.4.1
Former-commit-id: 4e80bdbd9e [formerly cc69519ce9] [formerly 4e80bdbd9e [formerly cc69519ce9] [formerly d7f79b859b [formerly 7591f6aa787a52c4fd2d6f9cb9917a1c62380fb5]]]
Former-commit-id: d7f79b859b
Former-commit-id: dcf2085324 [formerly 9d1f4ee011]
Former-commit-id: 85aa9fb637
2015-01-22 19:13:09 -06: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
eefc3bd57d Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 095a22f5e3 [formerly 314a8497f8] [formerly 095a22f5e3 [formerly 314a8497f8] [formerly 37c89530a6 [formerly 60d478ab66ac20c8434b9eb9e4d9f029390f0ba6]]]
Former-commit-id: 37c89530a6
Former-commit-id: dfd04fec4a [formerly c012f464c9]
Former-commit-id: 03fd6d11c5
2015-01-22 16:05:52 -05: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
Dave Hladky
9af205777f Omaha #3918 Central registry web interface broken by DPA fix.
Former-commit-id: 5fd928ec4c [formerly c1127b066f] [formerly 5fd928ec4c [formerly c1127b066f] [formerly a15e67385a [formerly 5aa305adb5fd16c72ce557309cab28fd287379d9]]]
Former-commit-id: a15e67385a
Former-commit-id: f3f75d02dc [formerly 92fbbea65a]
Former-commit-id: 60efde53e6
2015-01-22 13:22:18 -06:00
Ana Rivera
77a8e4a612 VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f

Former-commit-id: 4f8900fd23 [formerly 7b47ffe362] [formerly 4f8900fd23 [formerly 7b47ffe362] [formerly 18b9d5d163 [formerly 8a66266d3ffa236343f14089d7e7b32c1060f9ea]]]
Former-commit-id: 18b9d5d163
Former-commit-id: fc805be80c [formerly fd0aa2624d]
Former-commit-id: c63a8aa667
2015-01-22 16:11:44 +00: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
Evan Polster
0e16f1df15 VLab Issue #5963. Ensemble Tool Feature; fixes #5963
Change-Id: I9f3c44fd80990b2ec60556d55fabade01eb4512f

Former-commit-id: e99c17a46a [formerly f361182baa] [formerly e99c17a46a [formerly f361182baa] [formerly 0d40df0d52 [formerly 28d2f4220fa6ef06f4fd1b729607c14b5d9534ac]]]
Former-commit-id: 0d40df0d52
Former-commit-id: 3d7a989840 [formerly 3d1ffb059a]
Former-commit-id: bb72452645
2015-01-15 18:52:41 +00:00
David Lovely
62425dfbb3 Omaha #3957 Removed trailing slash in Spec for QPID.
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5

Former-commit-id: 1f59c0cd21 [formerly 1cfc27241f] [formerly 1f59c0cd21 [formerly 1cfc27241f] [formerly cf4077e8cd [formerly 5fe598aef48f91e57d8f233872ccd0bab395164e]]]
Former-commit-id: cf4077e8cd
Former-commit-id: af5df71b4c [formerly f7565da27d]
Former-commit-id: 3babe6269f
2015-01-15 08:16:18 -06:00
David Lovely
55fbb2ad86 Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac

Former-commit-id: 2771afe7f4 [formerly 63c3631559] [formerly 2771afe7f4 [formerly 63c3631559] [formerly 0b7ee2dc08 [formerly 8107830bf2fa384c3bbe9472801c89a2a43990a3]]]
Former-commit-id: 0b7ee2dc08
Former-commit-id: 0fa33b0e84 [formerly f75e17f79e]
Former-commit-id: 49e435ede3
2015-01-14 14:40:36 -06:00
Nate Jensen
b86874003f Merge "Omaha #3709 unify collaboration color management" into omaha_14.4.1
Former-commit-id: 956845266c [formerly bdb58ec755] [formerly 956845266c [formerly bdb58ec755] [formerly 7c61d2c06d [formerly fa93fe561ae1ad49979ab657b4a537dc7731af8e]]]
Former-commit-id: 7c61d2c06d
Former-commit-id: fa79e80782 [formerly 4abf2a8a6c]
Former-commit-id: 4837ead714
2015-01-14 14:05:18 -06:00
Brian Clements
0f521bee60 Omaha #3709 unify collaboration color management
group chat session colors controlled by session color manager
color config persistence moved to utility
shared display uses same action to change colors as other sessions

Change-Id: I8ba4a3fb4842e3f96f05ee6d16b7e81e9567f6d7

Former-commit-id: 17ccb3ab66 [formerly 1c2d8e01d0] [formerly 17ccb3ab66 [formerly 1c2d8e01d0] [formerly 8cc1aa9f33 [formerly c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec]]]
Former-commit-id: 8cc1aa9f33
Former-commit-id: ba13ccb6f0 [formerly 9a87cf77c5]
Former-commit-id: 61b3b6389e
2015-01-14 13:00:25 -06:00