Mike Duff
bb07c57f3e
Issue #2859 - Implement redbook MPC NDM menus
...
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e
Former-commit-id: 059ac9c52ae479bd7055
2014-03-19 14:40:00 -05:00
Lee Venable
9784b3737e
Merge "Issue #2433 - Implement view by priority check box menus review comments" into development
...
Former-commit-id: 96ea26a9a2ab3de987b4
2014-03-19 08:54:39 -05:00
Nate Jensen
99643d9545
Merge "Issue #2895 fixed telestration when leadership returns to a previous leader" into development
...
Former-commit-id: 3ee42187e6d44fee0588
2014-03-18 17:01:44 -05:00
Mike Duff
980e398584
Issue #2433 - Implement view by priority check box menus
...
review comments
Change-Id: I63c984c328336ebe9d6d06dbc48780051e3ea2e7
Former-commit-id: a7e568e799202a822384
2014-03-18 16:42:58 -05:00
Nate Jensen
3e32812f13
Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development
...
Former-commit-id: 85e3ac041a7e7745cd7b
2014-03-18 13:13:53 -05:00
Nate Jensen
ca1ec93450
Issue #2895 fixed telestration when leadership returns to a previous
...
leader
Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033
Former-commit-id: e75d3dfb7c2fc1030fad
2014-03-18 12:52:01 -05:00
Nate Jensen
a4728542c5
Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development
...
Former-commit-id: 5f79ece006e9be36b08c
2014-03-18 12:38:48 -05:00
Mike Duff
5bbe504f82
Issue #2798 - Fix issue with color not changing for existing user changing site.
...
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57
Former-commit-id: 3d102600657bdef60a55
2014-03-18 11:55:00 -05:00
Mike Duff
d98f4b2ab0
Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common.
...
Peer review comments
Change-Id: Ie27e8f93d976dcc0573631472986898b3ad8c9ef
Former-commit-id: 105a11d8f9cb6a3e2cf5
2014-03-18 11:32:28 -05:00
Nate Jensen
e77738ef65
Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development
...
Former-commit-id: 6ddf9a2ee76148c00ed2
2014-03-18 09:20:16 -05:00
Nate Jensen
23d3d331a3
Merge "Issue #2904 Nullpointer potential in MesoTabular product." into development
...
Former-commit-id: a09714792e5b948e7214
2014-03-18 09:14:17 -05:00
Steve Harris
b5a2d2237f
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
...
Former-commit-id: d0aeb854f50c2c5ad4bd
2014-03-17 15:55:41 -05:00
Dave Hladky
4c2bbde8f1
Issue #2904 Nullpointer potential in MesoTabular product.
...
Former-commit-id: 73d8618833373f052de8
2014-03-17 15:22:42 -05:00
Nate Jensen
d4596770ee
Issue #2908 attempt to fix build
...
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480
Former-commit-id: 78afc6040c9cf43e7de6
2014-03-14 14:14:37 -05:00
Brian.Dyke
88efccf309
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: d23acbdd489c412e444e
2014-03-14 11:13:30 -04:00
Ron Anderson
f93a657fb4
Issue #2824 Fix possible null pointer when site is deactivated and active table sharing was not enabled.
...
Change-Id: I2e741e603ade6bbb69ca103006bbcdc213f8acfc
Former-commit-id: 883cf26c5f6e6570fd5a
2014-03-14 10:11:00 -05:00
Brian.Dyke
2109409b24
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 030a18f80430084d7f84
2014-03-14 10:15:53 -04:00
Brian.Dyke
3ab2df3507
Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: d4b6d22ae2f999e48df0
2014-03-14 08:44:39 -04:00
Brian.Dyke
8f72db144b
OB_14.1.1-23 baseline
...
Former-commit-id: dcc2e4fd61bc6a7bf946
2014-03-14 08:18:16 -04:00
Ron Anderson
211e0427e4
Issue #2908 Update org.apache.commons.pool to 1.5.4. Change GeoTools to use the separate org.apache.commons projects that are in the baseline.
...
Change-Id: I05de2eaadc2766a8a0deee6ac816f29119800774
Former-commit-id: 0a6630a84d107daf22ae
2014-03-13 18:01:22 -05:00
Bryan Kowal
2b053a3bc8
Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit
...
Former-commit-id: 9b2af366c16ba13b2b44
2014-03-13 17:39:32 -05:00
Kevin P. Johnson
17a4229072
ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
...
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67
Former-commit-id: b2797a07884c833d3389
2014-03-13 20:42:12 +00:00
Nate Jensen
38752f1e3c
Merge "Issue #2718 Fix org.geotools version in common.base.feature/feature.xml" into development
...
Former-commit-id: 620d9cf83242649882fa
2014-03-13 12:58:10 -05:00
Ron Anderson
c2cadc6f93
Issue #2718 Fix org.geotools version in common.base.feature/feature.xml
...
Change-Id: I2e435e5cc7e3a65c116b3ca3ba3bd4f6c736082d
Former-commit-id: fc7a19bdf6dcb7b9c88f
2014-03-13 12:54:44 -05:00
Nate Jensen
3f2ff13d14
Merge "Issue #2909 Remove useLegacyMergeSort java parameter" into development
...
Former-commit-id: a2a46becc8befff7be3a
2014-03-13 12:41:14 -05:00
Nate Jensen
daf6997a59
Issue #2907 split edex.redbook plugin into common and edex redbook plugins
...
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe
Former-commit-id: 087307a781cc1cb28eed
2014-03-13 12:23:35 -05:00
Ron Anderson
b82cf065b5
Issue #2909 Remove useLegacyMergeSort java parameter
...
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a
Former-commit-id: d1b36c4a72dd8bfdf941
2014-03-13 11:54:15 -05:00
Nate Jensen
d8edb8e91b
Merge "Issue #2718 Update to GeoTools 10.5 Undo reformatting of ncep code Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util" into development
...
Former-commit-id: 540d0f2e1d27625eb93a
2014-03-13 11:16:00 -05:00
Ron Anderson
4b2a388628
Issue #2718 Update to GeoTools 10.5
...
Undo reformatting of ncep code
Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util
Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a
Former-commit-id: 1c727465eebcfaf40ebf
2014-03-13 11:11:53 -05:00
Nate Jensen
42e2f15293
Merge "Issue #2898 Fix recycling of best res resource." into development
...
Former-commit-id: c662bfb9388ac509f37f
2014-03-13 10:14:58 -05:00
Ben Steffensmeier
e4d861fc69
Issue #2898 Fix recycling of best res resource.
...
Former-commit-id: 90e464ad0bd115db1a66
2014-03-12 18:05:10 -05:00
Nate Jensen
34c5d1de25
Merge "Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean." into development
...
Former-commit-id: 82778ad21bf8180587d4
2014-03-12 16:05:19 -05:00
Nate Jensen
f5ca0cacc9
Merge "Issue #2871 Clean up ECMWF bundles." into development
...
Former-commit-id: 253d19af733dd9c9bffb
2014-03-12 15:35:21 -05:00
Ben Steffensmeier
d29daf8ede
Issue #2528 Fix satellite units/style.
...
Former-commit-id: 77041e5b1775120a09cd
2014-03-12 14:19:49 -05:00
Richard Peter
4b0379de16
Merge "Issue #2858 - Implement NDM menus for ncep/hydro SPC Peer review comments" into development
...
Former-commit-id: b9ad595f156cf5eb346a
2014-03-12 11:21:06 -05:00
Mike Duff
693793eb92
Issue #2858 - Implement NDM menus for ncep/hydro SPC
...
Peer review comments
Change-Id: Icbafa1e08ea9bc564c3f302715f527b92a5a55e5
Former-commit-id: 9aa0b40ed5b434ab5bb3
2014-03-12 11:19:18 -05:00
Ben Steffensmeier
be4ec3d266
Issue #2871 Clean up ECMWF bundles.
...
Former-commit-id: 17a940b6cefe55c49373
2014-03-12 11:16:42 -05:00
Nate Jensen
a05addf1c6
Merge "Issue #2827 fixed collab dataserver returning empty body with 200" into development
...
Former-commit-id: 9a36f5470b10a2e5c602
2014-03-12 10:59:42 -05:00
Mike Duff
832dd498fc
Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean.
...
Change-Id: I533e0831529038cb4205e38e706369ca74f4f824
Former-commit-id: 8068c9aa83e01c5c3534
2014-03-12 10:52:18 -05:00
Nate Jensen
f430ddc5d9
Merge "Issue #2702 Updated openfire version in component spec." into development
...
Former-commit-id: 35f778f5b9c5647be7e0
2014-03-12 10:02:42 -05:00
Richard Peter
e8ea7b80e6
Merge branch 'omaha_14.2.1' (14.2.1-11) into development
...
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1
Former-commit-id: 7af0cfaf387ebbc0cf78
2014-03-12 09:47:29 -05:00
Brad Gonzales
dae0963531
Issue #2702 Updated openfire version in component spec.
...
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498
Former-commit-id: ccb312d46fbf0d052043
2014-03-12 08:48:36 -05:00
Brian Clements
d693c07bb4
Issue #2827 fixed collab dataserver returning empty body with 200
...
we check if a file exists in and out of the lock when reading
if the file is deleted between checks, the inner check attempts to return an error
we had already access the output stream from the response object so it is committed to 200
fixed by waiting to get the output stream until after the second check
Former-commit-id: bfde9c37ced44c55e976
2014-03-12 08:27:22 -05:00
Greg Armendariz
2aa74592d7
Merge "Issue #2851 - initial 64-bit build of the bignsharp DLL" into development
...
Former-commit-id: da34c3d2da6acf5fefcc
2014-03-11 19:56:55 -05:00
Lee Venable
d7fc7f791d
Merge "Issue #2865 - added more null and dispose checks" into development
...
Former-commit-id: ae63879ddf36f72f23dc
2014-03-11 17:43:48 -05:00
Nate Jensen
266e87f935
Merge "Issue #2791 Fix fill value filter." into development
...
Former-commit-id: 80a2807ce4249d0f3ded
2014-03-11 17:33:54 -05:00
Ben Steffensmeier
c754db3ae3
Issue #2791 Fix fill value filter.
...
Former-commit-id: 4eb2d74e1c1a45efe2a5
2014-03-11 17:27:26 -05:00
Bryan Kowal
9ec8e864a7
Issue #2851 - initial 64-bit build of the bignsharp DLL
...
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll: PE32 executable for MS Windows (DLL) (console) Intel 80386 32-bit
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll: PE32+ executable for MS Windows (DLL) (console) Mono/.Net assembly
Amend: update Java version and Plugin version
Change-Id: I377e8b51eb9d7fd9964092040d1bcde3f9bcfd27
Former-commit-id: cac6709da8438e594868
2014-03-11 16:47:11 -05:00
Richard Peter
76f15c73dd
Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
...
Former-commit-id: 18234c5d73f59d1433db
2014-03-11 16:43:37 -05:00
Lee Venable
46fa017e1b
Issue #2865 - added more null and dispose checks
...
Former-commit-id: df65d7c7ce1f9d1af221
2014-03-11 16:30:33 -05:00
