Richard Peter
|
0bcf000a31
|
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 93c776022a [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]]
Former-commit-id: 93c776022a
Former-commit-id: aec254aac0 [formerly c97efbf656] [formerly 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4 [formerly 520dd57f02]]
Former-commit-id: 8eb1848d92c6225ecf7e4aff08b65f9f7fc71abe [formerly 910464ea6a]
Former-commit-id: 94e0faa6c6
|
2013-11-07 14:25:45 -06:00 |
|
Greg Armendariz
|
bbb5440109
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: b9a8dfd99f [formerly 805783d8da] [formerly da16b623e1] [formerly b9a8dfd99f [formerly 805783d8da] [formerly da16b623e1] [formerly 6456b3a17b [formerly da16b623e1 [formerly d12afc98a3fda9c186e87368c53ddc100d4bf2c1]]]]
Former-commit-id: 6456b3a17b
Former-commit-id: 409990c09b [formerly 88ec9027bc] [formerly ece4acb7d4c6e6c8bc0fa11c3b4893ee1529b1dc [formerly 009c5771fd]]
Former-commit-id: e59edb73dcfbdf8ec67c3727427ad1aaf61b7e80 [formerly 390d3b57e1]
Former-commit-id: 35e634b5fa
|
2013-11-07 12:25:24 -06:00 |
|
Nate Jensen
|
d6a8baf2a9
|
Issue #2361 speed up map initialization by moving field queries off UI
thread
Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5
Former-commit-id: f1c965dde8 [formerly a52e7b677f] [formerly d4b6ad1eee] [formerly f1c965dde8 [formerly a52e7b677f] [formerly d4b6ad1eee] [formerly cc2998b487 [formerly d4b6ad1eee [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]]]
Former-commit-id: cc2998b487
Former-commit-id: 18e78887eb [formerly 286c7a8b1c] [formerly e9d19e83f112f896de07de1942d732fe53f9487d [formerly ce583a88fb]]
Former-commit-id: 82fc251ad0fbe29a980c82772d008c107d18cf35 [formerly 57f237693e]
Former-commit-id: 03911b4ce8
|
2013-11-07 11:44:07 -06:00 |
|
David Gillingham
|
d918c5e1fa
|
Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67
Former-commit-id: 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 0e74638eb2 [formerly e1df69e312 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]]]
Former-commit-id: 0e74638eb2
Former-commit-id: 2cd30bab98 [formerly 1ed80f471c] [formerly 90a0e1bc7e0ea65d26c6784350bcc46d6a2824c9 [formerly d0b188d577]]
Former-commit-id: 253f6827d6bd7e24ee2c90bede0d9493ee7db128 [formerly 50f9ad420b]
Former-commit-id: be9ed341f5
|
2013-11-07 11:36:49 -06:00 |
|
Nate Jensen
|
723a53858c
|
Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development
Former-commit-id: 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly f5feb9330f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 794d57fe7b [formerly c27c435cea] [formerly 6bfd1d4e327eb46835ec16594b542ffb4c74bf7e [formerly 1b7ac545f8]]
Former-commit-id: ac8b2a6231c9af1c1a85121d551f6695b476f896 [formerly acec588299]
Former-commit-id: acccf2c827
|
2013-11-07 10:21:42 -06:00 |
|
Steve Harris
|
b05c9a6aa2
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 626b91c9c7 [formerly 2a8e926976] [formerly 108a4d908d] [formerly 626b91c9c7 [formerly 2a8e926976] [formerly 108a4d908d] [formerly 1b3d4c8f67 [formerly 108a4d908d [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: b3f0cc869f [formerly a6ae5f9c2f] [formerly 8546b81d3f134c79637c6f5400cc76bdbfb21abe [formerly 50d60d8101]]
Former-commit-id: d0d675db0d0de1c4bbc79b22fb517649fb9235ae [formerly 930b6ddb77]
Former-commit-id: eec64a2dbc
|
2013-11-06 18:31:05 -06:00 |
|
Bryan Kowal
|
408ea758c0
|
13.5.3 build "fix"
Former-commit-id: b94071a58b [formerly 503762af19] [formerly 6692b985f3] [formerly b94071a58b [formerly 503762af19] [formerly 6692b985f3] [formerly a28133117c [formerly 6692b985f3 [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]]]
Former-commit-id: a28133117c
Former-commit-id: a18f2109cf [formerly cdf643510a] [formerly 120324fb9c6e8815d7af7c3a1fc21863b808696c [formerly ce6d80409d]]
Former-commit-id: 6c29059a60fba8e9efc87bc58e54da72abb857db [formerly b04aa07437]
Former-commit-id: 8fb72374e9
|
2013-11-06 18:25:10 -06:00 |
|
Nate Jensen
|
dcbee2bb80
|
Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 0f4ba6f90e [formerly 2c506552014e60344c5b2014bed32edab2630f47]]]]
Former-commit-id: 1da0e31b88
Former-commit-id: d2bb313a16 [formerly 048d52722f] [formerly 60a2289740b7f6e8da01f653e591eb2ce94a6c58 [formerly aef895c447]]
Former-commit-id: 5e1c394f1e0afad2bb68c0406f91df8e82544280 [formerly 0ae0e070c9]
Former-commit-id: f9be4065ec
|
2013-11-06 17:07:10 -06:00 |
|
Bryan Kowal
|
1ba0d971d1
|
Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 21df98b0bc [formerly 0f104b0365] [formerly 4f1c083032] [formerly 21df98b0bc [formerly 0f104b0365] [formerly 4f1c083032] [formerly bb15605aa2 [formerly 4f1c083032 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]]]
Former-commit-id: bb15605aa2
Former-commit-id: 4d95bba61e [formerly 0b006511dc] [formerly 0befac69bd8c3c5e0fa05e61b8473d5f24fccdaf [formerly 0bc8cdc9be]]
Former-commit-id: edff81ecd29901669108323c8ac182f45413fdbf [formerly 46616c32eb]
Former-commit-id: bdc76d27b2
|
2013-11-06 15:57:14 -06:00 |
|
Lee Venable
|
51842a1676
|
Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 20726d4e7c [formerly 8585080cd1 [formerly 13672783e6a5e452cb4105669a98708329b35541]]]]
Former-commit-id: 20726d4e7c
Former-commit-id: a6557a089e [formerly 9a8a813cf8] [formerly 907b407668322fa5a6d3d3f60d0cc9f6969d6ada [formerly 0c4566c411]]
Former-commit-id: 17cb4eac030cecf14dfda06979b1f5d64d077baf [formerly 5627ef0cc8]
Former-commit-id: 3cc206a34f
|
2013-11-06 15:42:40 -06:00 |
|
Max Schenkelberg
|
fe791cc7f7
|
Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
Amend: Fixed precision issue with float comparison, made factory better synchronized.
Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2
Former-commit-id: 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly c28fd2b38d [formerly 3369fbec2d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]]
Former-commit-id: c28fd2b38d
Former-commit-id: f88d913d31 [formerly e4b7f3618c] [formerly aa835a1580556a0e2e44448d20c96e5e1b78baed [formerly d53db3ddb6]]
Former-commit-id: 2e6b0a3f93931cd0f795d381bd6ddbc9268e4f25 [formerly 751b8f2315]
Former-commit-id: 53363b9bf7
|
2013-11-06 15:07:18 -06:00 |
|
Richard Peter
|
796bf9ff56
|
Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: 7d6785bd2d [formerly b4a0f11c66] [formerly 27aa0dd6ba] [formerly 7d6785bd2d [formerly b4a0f11c66] [formerly 27aa0dd6ba] [formerly 6ccb444219 [formerly 27aa0dd6ba [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]]]
Former-commit-id: 6ccb444219
Former-commit-id: db1def7540 [formerly 6b8bea4af5] [formerly 4b2de4194c997d5f3e973c7bdd1eeaca08c1345f [formerly f4bdb0caea]]
Former-commit-id: 0636b67d16f31ddc34f0ddaf9f6885cf8474beca [formerly b52c9482ea]
Former-commit-id: f39e0c68c0
|
2013-11-06 13:44:11 -06:00 |
|
Ben Steffensmeier
|
235cea183a
|
Issue #2493 remove mesowest.
Former-commit-id: c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly 36916fedcd [formerly d0b7966458 [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]]
Former-commit-id: 36916fedcd
Former-commit-id: 726d1728fd [formerly 5d31aad5c2] [formerly 80b4ead107b43174bee5092e0af3bc24e421205f [formerly baebe37ba6]]
Former-commit-id: 855d5e9d4e64a0a70aaec8f5743dc44310b552bb [formerly afe014af99]
Former-commit-id: 925d8bca38
|
2013-11-06 13:42:38 -06:00 |
|
Slav Korolev
|
67bcc06687
|
Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: ff13287f05 [formerly cc90a7af4b] [formerly 076865bb61] [formerly ff13287f05 [formerly cc90a7af4b] [formerly 076865bb61] [formerly c25204d75b [formerly 076865bb61 [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]]]
Former-commit-id: c25204d75b
Former-commit-id: 5cd1d585b1 [formerly 8fbf625667] [formerly 2d965e7d5b9ce80b4a1638b7546c6d8d63a4d209 [formerly 3223cd19cd]]
Former-commit-id: 101603d2c5fe98d981f819cb5aec1f27534314e0 [formerly b8ebc9ac63]
Former-commit-id: a2e60dbe60
|
2013-11-06 14:38:55 -05:00 |
|
Steve Harris
|
2608595d90
|
14.1.1-7 baseline
Former-commit-id: 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]]
Former-commit-id: 4fff87723f
Former-commit-id: 4d2f53ebc6 [formerly b694612fe0] [formerly d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653]]
Former-commit-id: 39afc27726ae906146c56faa8073b17caaeb711d [formerly 647b908fed]
Former-commit-id: cfb3194426
|
2013-11-06 14:16:14 -05:00 |
|
Roger Ferrel
|
cc2399d328
|
Issue #2478 Add debug infromation.
Change-Id: I830a760e2505a744da4962299bf97f46462f4784
Former-commit-id: 89645eca10 [formerly f198c27f3f] [formerly 07a7dd63c3] [formerly 89645eca10 [formerly f198c27f3f] [formerly 07a7dd63c3] [formerly e01b524542 [formerly 07a7dd63c3 [formerly db0434a66ca415554d1ab0c90586dc7358fd730d]]]]
Former-commit-id: e01b524542
Former-commit-id: f583a4cef6 [formerly d10ffdcca7] [formerly 228271710b56b51b9c4e8ee70ffda8ab1200c391 [formerly 274d52a694]]
Former-commit-id: 4f3f3e9f57c7e8fbbb9d46166143f836524eaef3 [formerly df1dc51d0d]
Former-commit-id: 8533c6e67c
|
2013-11-06 13:13:02 -06:00 |
|
Richard Peter
|
d2801eadb5
|
Issue #2499: Fix build
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c
Former-commit-id: 10764ed800 [formerly 15fd2f7a55] [formerly f3d8768b94] [formerly 10764ed800 [formerly 15fd2f7a55] [formerly f3d8768b94] [formerly c09f68615c [formerly f3d8768b94 [formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]]]
Former-commit-id: c09f68615c
Former-commit-id: 40066061ee [formerly 1b65a09a52] [formerly 2caca803544425b06082edf14d9c7fc48db84b66 [formerly a653f9625a]]
Former-commit-id: 1de821a71696b088539e4b3859b53d3eda3667d4 [formerly 3c129fb138]
Former-commit-id: 463f09984a
|
2013-11-06 13:09:32 -06:00 |
|
Steve Harris
|
24ec3c5993
|
14.1.1-6 baseline
Former-commit-id: f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly 6067af4252 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]]
Former-commit-id: 6067af4252
Former-commit-id: 2a5f4c26d6 [formerly e86a0aa489] [formerly 70967acd51143f4f43cec1322c400d567f95c3ce [formerly 26da1ce793]]
Former-commit-id: 30c24036c09dc21bf6f32deefe9a7a44f35d8005 [formerly 270c5f1a2d]
Former-commit-id: 0aa90a7855
|
2013-11-06 14:08:33 -05:00 |
|
Mike Duff
|
0280c05aa7
|
Issue #2358 - Move config file management code to the subscription manager dialog.
Change-Id: I61b8093b1306404006c5d01b73874997054c4f2f
Former-commit-id: e8a14d975d [formerly 65f9da04a9] [formerly e1180868e7] [formerly e8a14d975d [formerly 65f9da04a9] [formerly e1180868e7] [formerly 35c4911e7e [formerly e1180868e7 [formerly 100fe3e61e5156dba32419005da4473bcd6d1e8b]]]]
Former-commit-id: 35c4911e7e
Former-commit-id: 89c7970f8b [formerly e1b9c9daa8] [formerly 046ac466943d54b80185d43c7b3cbf79bd485473 [formerly 7e28ffcaad]]
Former-commit-id: 61abd603abd41c6ab9bfa16115d3995c7257e435 [formerly 39dda9d18c]
Former-commit-id: 4cede401ec
|
2013-11-06 12:00:04 -06:00 |
|
Bryan Kowal
|
19a648092a
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
rpms/awips2.core/Installer.tools/component.spec
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh
Former-commit-id: 7f9f20c8a8 [formerly d73aaf9753] [formerly 4bad21e6cd] [formerly 7f9f20c8a8 [formerly d73aaf9753] [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4bad21e6cd [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]]
Former-commit-id: 3255bf3861
Former-commit-id: b85c53c8b0 [formerly 400b4a1328] [formerly fda65eb7f8713472578cb95e718895ab10e4b197 [formerly 76726372e5]]
Former-commit-id: 5afe499eab30a20cc0a548514e8ce73b292bc5ca [formerly 748ab480fb]
Former-commit-id: 2c31c6f4ab
|
2013-11-05 19:03:22 -06:00 |
|
Ben Steffensmeier
|
74a25404a0
|
Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64
Former-commit-id: 3273b6fc5f [formerly 4639cd69f4] [formerly 5b53cb4c98] [formerly 3273b6fc5f [formerly 4639cd69f4] [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 5b53cb4c98 [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]]
Former-commit-id: 1d35086e8d
Former-commit-id: 41a54ad666 [formerly b64221f27b] [formerly 5548cad8f6d7873bdd2beafefec42e2d00821e99 [formerly 8aefe5ff02]]
Former-commit-id: ba475ead914b07016d89a22aaa936b7307336535 [formerly a97ec9b8e5]
Former-commit-id: 5cf9a6ed01
|
2013-11-05 17:33:41 -06:00 |
|
Steve Harris
|
77ce162114
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 354a736ed5 [formerly 1a9ff8df10] [formerly 2e0db025f3] [formerly 354a736ed5 [formerly 1a9ff8df10] [formerly 2e0db025f3] [formerly a956fd7f4d [formerly 2e0db025f3 [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]]]
Former-commit-id: a956fd7f4d
Former-commit-id: 89bf1adcf5 [formerly 02907147b6] [formerly ab6310aa243dfb8185d05a0491fd0532879e343a [formerly 6d20cd89ff]]
Former-commit-id: 606add2f1c8ffb454a9b5974ada8971cbce12c65 [formerly 999fd5433c]
Former-commit-id: 280de5fb9e
|
2013-11-04 20:29:07 -06:00 |
|
Nate Jensen
|
ec5482009d
|
Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141
Former-commit-id: 16074e6a14 [formerly 27f09b8096] [formerly 6064000389] [formerly 16074e6a14 [formerly 27f09b8096] [formerly 6064000389] [formerly b36d28c9fd [formerly 6064000389 [formerly 2626a79c976ac016352a091bdf66890e929edc85]]]]
Former-commit-id: b36d28c9fd
Former-commit-id: 3cfb49215f [formerly 5d2ec98600] [formerly e86e430428d15356370e7a0929a62a10de34aaa1 [formerly 3e3400dc7c]]
Former-commit-id: 2c3aadd73710a197c7d25f5c10c535419d7755b1 [formerly 27b1f123f0]
Former-commit-id: f15331607d
|
2013-11-04 14:30:00 -06:00 |
|
Ben Steffensmeier
|
4dfe17eca2
|
Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly ff5f08d23a [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: dd2bb59742 [formerly d38879158d] [formerly c694721b6dae8a56fdf9390a3bc7d8934e8b3711 [formerly 08e73de883]]
Former-commit-id: 6bf4ce1b85d10c2151244620ecdee96d3fb2244e [formerly a0f4c08cfd]
Former-commit-id: dacf863d66
|
2013-11-04 13:01:49 -06:00 |
|
Lee Venable
|
df31e0e089
|
Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: 04c2b7d6a8 [formerly bfc83fa74e] [formerly 0b3346d699] [formerly 04c2b7d6a8 [formerly bfc83fa74e] [formerly 0b3346d699] [formerly 3e7b7cec8f [formerly 0b3346d699 [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: 07e89ee05d [formerly c7d03bf267] [formerly 608f6b9d8262abfc44e2d399f8c52580ba4437af [formerly f6f1b16c0c]]
Former-commit-id: 0c17348ed817ee9581a108ac2cd15b5da9890b49 [formerly 52da34fc55]
Former-commit-id: ade7b14670
|
2013-11-02 10:43:48 -05:00 |
|
Slav Korolev
|
ca6efe6484
|
Issue #2431. Changed labels on the table.
Former-commit-id: 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 0801f8dedd [formerly dd1ff63737 [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]]]
Former-commit-id: 0801f8dedd
Former-commit-id: 4b225552e2 [formerly 6b3481ca26] [formerly 77ecd7c42b3304b4ff77b15d1213ecb427f5661a [formerly 7d0198b356]]
Former-commit-id: 5146d816bee2418137c01850b925e11cdce09d47 [formerly f8e429a1b9]
Former-commit-id: e4a2b6d619
|
2013-11-01 15:06:19 -04:00 |
|
Steve Harris
|
c3ac33582f
|
13.5.3-4 baseline
Former-commit-id: 667ec69fbc [formerly 0ee69293ec] [formerly 8aeae1c481] [formerly 667ec69fbc [formerly 0ee69293ec] [formerly 8aeae1c481] [formerly da7d1ce05e [formerly 8aeae1c481 [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]]]
Former-commit-id: da7d1ce05e
Former-commit-id: a4cc3f0bf6 [formerly 7454b37d59] [formerly 7369078223f22949c985fdf82f677dcb829640f5 [formerly b8d3fd62d0]]
Former-commit-id: 0df02f675ff87a29fb8942ecbcc9ef833301020e [formerly 8f9b121f90]
Former-commit-id: 90f27a16c9
|
2013-11-01 14:20:00 -04:00 |
|
Ron Anderson
|
a9c8950fe6
|
Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]]
Former-commit-id: cc991ed528
Former-commit-id: a0f67a006f [formerly f453d92818] [formerly c1140f67ed8f586264c71a61de18f87988cedd70 [formerly deb89a88f5]]
Former-commit-id: b4e8d1a865f6177e1d0672dcd506844aafc34864 [formerly 84adff8e96]
Former-commit-id: 638b57e188
|
2013-11-01 11:07:39 -05:00 |
|
Slav Korolev
|
50d1a73c83
|
Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly f7d1939b36 [formerly 7ca47690af [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]]]
Former-commit-id: f7d1939b36
Former-commit-id: 9c8b7d1e96 [formerly fcbe5d09da] [formerly 3a1615d06dc67187bd2ec2e01aff550ea0b6e6b1 [formerly 386db59985]]
Former-commit-id: f9f5e3df75e6feba297093a0bd714b22f8fc7384 [formerly 57fc9a2183]
Former-commit-id: 884ca2167c
|
2013-11-01 11:03:06 -04:00 |
|
Nate Jensen
|
3efcc68e75
|
Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly 0270e6bde3 [formerly 43b2f50a0a [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 685c6034b2 [formerly 6ed6df6ed0] [formerly 1d11102b6e40b4f27646f1cf7aba32281be912e3 [formerly 47fc100053]]
Former-commit-id: 3b5342860c273add5e1cf001ce17db765d7f54d6 [formerly 6164feb2da]
Former-commit-id: 3858434dc3
|
2013-10-31 18:11:13 -05:00 |
|
Bryan Kowal
|
7cd17382dc
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Former-commit-id: fd5a5096de [formerly 04bcd7e6dc] [formerly 49422aea62] [formerly fd5a5096de [formerly 04bcd7e6dc] [formerly 49422aea62] [formerly d08a652e23 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]]
Former-commit-id: d08a652e23
Former-commit-id: 874bd8aa36 [formerly d53ec9c750] [formerly 2f7241bd44af27a962760419963b91198396fa99 [formerly adb62df96a]]
Former-commit-id: 7bb259e517c1ed9b9182d1d9842aa0cc9ad29f26 [formerly 70d4374ce8]
Former-commit-id: 0d8ab84604
|
2013-10-31 15:43:29 -05:00 |
|
Bryan Kowal
|
6a0ddf11e4
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f [formerly f02d4b7a0b] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c]
Former-commit-id: f5bb76a01e
|
2013-10-31 15:34:46 -05:00 |
|
David Gillingham
|
dc6a531641
|
Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af
Former-commit-id: 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly c4f5cc53bb [formerly 6e1cca2966 [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 82721bfe07 [formerly 3776f258a3] [formerly 345b0c83f25f83ef27ba6cbf8e70827c774b053d [formerly 3bac577a31]]
Former-commit-id: 5b6106d6a9109e95e2fa9e2742d6f3022a33ac54 [formerly 5df42898ad]
Former-commit-id: 4862c1d171
|
2013-10-31 14:07:20 -05:00 |
|
Ben Steffensmeier
|
a15afe6f6c
|
Issue #2491 Fix collaboration Xml.
Former-commit-id: 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]]
Former-commit-id: fdeff81da2
Former-commit-id: d27369f59b [formerly 89c999410e] [formerly 6d36de8b83b8bd6d75e28507dfdb4314d2a89f81 [formerly 49ffb7e92c]]
Former-commit-id: 8474d807f157d7a0e7fc99090b358e9a371bb8fe [formerly a0e805ded6]
Former-commit-id: a92af46f59
|
2013-10-31 14:06:37 -05:00 |
|
Ron Anderson
|
2b4809ead7
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly 42e924e021 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]]
Former-commit-id: 42e924e021
Former-commit-id: dd1b50d116 [formerly 2f23072e41] [formerly e573e83de25a263065e03ab739ab5d58c0ca7fb1 [formerly eef9d2dfb0]]
Former-commit-id: 6420457c498cf2f6184538b3831ba133f0623c15 [formerly e3a0440825]
Former-commit-id: 49ea9c0444
|
2013-10-31 14:04:55 -05:00 |
|
Nate Jensen
|
b7c11ac174
|
Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: 7648e116ad [formerly b17891ba0e] [formerly ccf3d5b1e9] [formerly 7648e116ad [formerly b17891ba0e] [formerly ccf3d5b1e9] [formerly de50a9214b [formerly ccf3d5b1e9 [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]]
Former-commit-id: de50a9214b
Former-commit-id: 2aa3471a8a [formerly c9d9070600] [formerly c89ecfda3d23b19bae8caa3e9277339aa3c12a03 [formerly d6fcc98e76]]
Former-commit-id: ae9c745301a10896244f2d9c9846983381ddd2ac [formerly c24d8c63cd]
Former-commit-id: 3c1f343be5
|
2013-10-31 12:24:23 -05:00 |
|
Steve Harris
|
4d2a15c959
|
13.5.3-3 baseline
Former-commit-id: 8df88e1b77 [formerly 883ad32443] [formerly baa036cd62] [formerly 8df88e1b77 [formerly 883ad32443] [formerly baa036cd62] [formerly 1503847a4b [formerly baa036cd62 [formerly c261e0753eb106a2912314056a1b4903695750c5]]]]
Former-commit-id: 1503847a4b
Former-commit-id: 3a5911368f [formerly a58b825dde] [formerly e27f6359a046d1d0047ec0fc1c24c9d171c5bf82 [formerly 6b879b2465]]
Former-commit-id: 00b390ce880010abcc3167a5427b564527ba940c [formerly 5be6e21405]
Former-commit-id: ef72863e6f
|
2013-10-31 12:52:07 -04:00 |
|
Richard Peter
|
2baf599758
|
Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly b482eb2b48 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]]
Former-commit-id: b482eb2b48
Former-commit-id: 7b0ad6bacc [formerly fca3d73aa7] [formerly f7dbb5f3661236898b603e2fdf7604e44f42274a [formerly 73462fa134]]
Former-commit-id: 1019515624c081b6c221e0d3722489ce94b4ad06 [formerly 300f907c46]
Former-commit-id: ab890140fb
|
2013-10-31 11:46:25 -05:00 |
|
Mike Duff
|
e48beadbc6
|
Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly 3fc811102e [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]]
Former-commit-id: 3fc811102e
Former-commit-id: ce2afdf1b3 [formerly b0c54d7c17] [formerly ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461]]
Former-commit-id: ece01cf9cf7d6b3d925c922f4d1d6fe84edf0f17 [formerly 26ca1b4d72]
Former-commit-id: 5ff3fe2791
|
2013-10-31 09:22:50 -05:00 |
|
Steve Harris
|
e979d6caa1
|
13.5.3-2 baseline
Former-commit-id: 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 6d85d944a6 [formerly 055783655b [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]]
Former-commit-id: 6d85d944a6
Former-commit-id: fef629ce26 [formerly 0c17777164] [formerly 08cfc6740d0a1f987b0743cf3f07ab435cbb6ddc [formerly aef0e828d2]]
Former-commit-id: 33aa78b83a8657172de9ca0d0ef491a27006efe6 [formerly 1cc13c9992]
Former-commit-id: e90722d781
|
2013-10-30 12:53:25 -04:00 |
|
David Gillingham
|
c7e966b43e
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 2ddacaea30 [formerly 68b0b2e3db] [formerly 0f0aefb2c1b9d5dfbee8cd33020b863e61f2b01f [formerly 996817f124]]
Former-commit-id: 88b3c16c68fc66755ed20e6b4157548ca26d3124 [formerly eef2c93d6c]
Former-commit-id: 75acd532a1
|
2013-10-30 11:34:46 -05:00 |
|
Ben Steffensmeier
|
e193ba7f0f
|
Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6
Former-commit-id: a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly 27a392f90e [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]]
Former-commit-id: 27a392f90e
Former-commit-id: 8ec09e8f61 [formerly 78efdb7572] [formerly 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567]]
Former-commit-id: a33b0178c5a7309ae9c12ac4f7b2267997da8f07 [formerly 9d87eb50e2]
Former-commit-id: 02b9133d50
|
2013-10-29 17:35:55 -05:00 |
|
Nate Jensen
|
89b3b81ab3
|
Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: dced4c4d11 [formerly 19043faeaa] [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]]
Former-commit-id: 15fd50423e5c76bf2d7d7f54653759492ef97c8d [formerly e8c199f108]
Former-commit-id: f2184b9379
|
2013-10-29 14:33:53 -05:00 |
|
Mike Duff
|
589da45d3f
|
Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5
Former-commit-id: cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly 25e4a4741c [formerly 6d5f697300 [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]]]
Former-commit-id: 25e4a4741c
Former-commit-id: 3f502364c9 [formerly 4beb79d5a7] [formerly 1328f5fc6ad281525c7abd057dcd30572f31ff3d [formerly 73ecb9af6b]]
Former-commit-id: ae4c63d618c1eb58242c2ffdaf294d319749571c [formerly 2c7dbda379]
Former-commit-id: 26941f1033
|
2013-10-29 13:49:47 -05:00 |
|
Ben Steffensmeier
|
9c4692235f
|
Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly 204b47c67d [formerly a4174430f7 [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]]]
Former-commit-id: 204b47c67d
Former-commit-id: 7e0cb095c2 [formerly 09347cdd5a] [formerly 479b38fd22c3992c7e8afaec4ff032e7fa45f9d9 [formerly 9540b309b3]]
Former-commit-id: 4bf44aa82f7b082680aa650f926af4dfec1c5040 [formerly fd931a3e64]
Former-commit-id: c57dc46dfc
|
2013-10-29 12:28:07 -05:00 |
|
Nate Jensen
|
553475c0a2
|
Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly f62f7dc851 [formerly ac65672cb2 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]]
Former-commit-id: f62f7dc851
Former-commit-id: 7ac7a7ce3d [formerly 9dc4378fc4] [formerly 236fe4b18811523bce5e5090bd5f361fa56869a5 [formerly 87917f3548]]
Former-commit-id: 0e9c2c54cf24b0469949784c3ccb934967d72820 [formerly 98118ccced]
Former-commit-id: b2072949f9
|
2013-10-28 13:27:17 -05:00 |
|
Ben Steffensmeier
|
d74e82bcc5
|
Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07
Former-commit-id: 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 5b439696df [formerly 65522e83c9 [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]]
Former-commit-id: 5b439696df
Former-commit-id: 285a0af019 [formerly 54a39977f5] [formerly ae5d9cd5f9d93524f8b356e1b865d0b7966eab25 [formerly 6866344496]]
Former-commit-id: a70f5f2f9ec94543623b1366018f66b21d4873b5 [formerly e3e621660f]
Former-commit-id: c0ba7d0acc
|
2013-10-28 13:16:23 -05:00 |
|
Ron Anderson
|
b0f0709755
|
Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 306a5d72f4 [formerly 3575496955] [formerly 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]]
Former-commit-id: 53c38fe54d2869c9707556e4244b69af6f55a908 [formerly 1daa0f8649]
Former-commit-id: 643624f1a9
|
2013-10-28 12:59:44 -05:00 |
|
Ben Steffensmeier
|
5ac77f7f76
|
Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]]
Former-commit-id: 44a6f05986
Former-commit-id: 2400380daf [formerly 0e3cf8b47f] [formerly 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]]
Former-commit-id: d4c767bc5d9a92f47044beb03900b35fdf1a24a2 [formerly 0c3bb6ef3e]
Former-commit-id: 47d3fb8249
|
2013-10-28 10:14:08 -05:00 |
|
Steve Harris
|
cbf859daf6
|
14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
|
2013-10-28 10:55:16 -04:00 |
|