Mike Duff
25c8a0a8aa
Issue #2856 - Implement Redbook CPC ndm menus
...
Change-Id: I1ef4007b9f7147a9640754aaf8846028a40d0693
Former-commit-id: 8d9935cbee365c4a8537da610c2aff4d95c50f40
2014-03-20 11:16:35 -05:00
Richard Peter
7070313c0b
Merge "Issue #2859 - Implement redbook MPC NDM menus" into development
...
Former-commit-id: dc3a698f046599a19beed986c2424c1b8796927e
2014-03-20 11:01:08 -05:00
Lee Venable
65335c255d
Merge "Issue #2929 - the pure Python Override now recognizes REGION as a valid localization level" into development
...
Former-commit-id: a5ba903c1500f5e989d9ab6aa80f2521d0653a42
2014-03-20 10:38:17 -05:00
David Gillingham
d58bb87ee6
Issue #2882 : Allow null values to be passed back in parameter values for DefaultGeometryData.
...
Change-Id: I258d247476cf280e107d386b903e9764a492d4f4
Former-commit-id: 0e583860b64e9ca856152affe70f62d5f866af4f
2014-03-19 17:28:03 -05:00
Mike Duff
059ac9c52a
Issue #2859 - Implement redbook MPC NDM menus
...
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e
Former-commit-id: 619efadc2230af13707f124534d3caf2fdfaba68
2014-03-19 14:40:00 -05:00
Bryan Kowal
316f9b4747
Issue #2929 - the pure Python Override now recognizes REGION as a valid localization level
...
Amend: use baseline Redmine number
Change-Id: I765c1199e9d8b639e3c87afec41798459f0f92e4
Former-commit-id: b48eb97e9d270ad49d93f2ca85ceae48da9b9269
2014-03-19 14:07:03 -05:00
Lee Venable
96ea26a9a2
Merge "Issue #2433 - Implement view by priority check box menus review comments" into development
...
Former-commit-id: 27cb84fc6629e94927a4e80cba9586df20805b0a
2014-03-19 08:54:39 -05:00
Nate Jensen
3ee42187e6
Merge "Issue #2895 fixed telestration when leadership returns to a previous leader" into development
...
Former-commit-id: ad4deae1563ea5f311c3428cefb82bf156392310
2014-03-18 17:01:44 -05:00
Mike Duff
a7e568e799
Issue #2433 - Implement view by priority check box menus
...
review comments
Change-Id: I63c984c328336ebe9d6d06dbc48780051e3ea2e7
Former-commit-id: ca228b57089101c61f9d3f76d7edc4ba96c41b61
2014-03-18 16:42:58 -05:00
Nate Jensen
85e3ac041a
Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development
...
Former-commit-id: 5e03b83061e1cd7f1a15e939c2bc98d3b99cf393
2014-03-18 13:13:53 -05:00
Nate Jensen
e75d3dfb7c
Issue #2895 fixed telestration when leadership returns to a previous
...
leader
Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033
Former-commit-id: 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0
2014-03-18 12:52:01 -05:00
Nate Jensen
5f79ece006
Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development
...
Former-commit-id: 1c87269eac595b61cc54c1e39ec8624ba55fd6d8
2014-03-18 12:38:48 -05:00
Mike Duff
3d10260065
Issue #2798 - Fix issue with color not changing for existing user changing site.
...
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57
Former-commit-id: 8c82d25f6197e838bbd6119003d589bf4fa266ee
2014-03-18 11:55:00 -05:00
Mike Duff
105a11d8f9
Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common.
...
Peer review comments
Change-Id: Ie27e8f93d976dcc0573631472986898b3ad8c9ef
Former-commit-id: 29a88687a788305be537ef97cce13e3f45338205
2014-03-18 11:32:28 -05:00
Nate Jensen
6ddf9a2ee7
Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development
...
Former-commit-id: 5b287c87e27e77b07b2f72030bf9e23c72e50912
2014-03-18 09:20:16 -05:00
Nate Jensen
a09714792e
Merge "Issue #2904 Nullpointer potential in MesoTabular product." into development
...
Former-commit-id: 196894dd57fa63f4a6a9dea97fb5fa9f09750a5f
2014-03-18 09:14:17 -05:00
Steve Harris
d0aeb854f5
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
...
Former-commit-id: a2318f04eea89a258400dea526daa4fe67b69271
2014-03-17 15:55:41 -05:00
Dave Hladky
73d8618833
Issue #2904 Nullpointer potential in MesoTabular product.
...
Former-commit-id: e3139396104ee0d4ffc1dea7fd20782d00eb5ade
2014-03-17 15:22:42 -05:00
Nate Jensen
78afc6040c
Issue #2908 attempt to fix build
...
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480
Former-commit-id: 131d45e260ab446e9764d0fcc1f542ef012ff352
2014-03-14 14:14:37 -05:00
Brian.Dyke
d23acbdd48
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: 0ea874227f20f9f7fe19fc8371e10711023c3f53
2014-03-14 11:13:30 -04:00
Ron Anderson
883cf26c5f
Issue #2824 Fix possible null pointer when site is deactivated and active table sharing was not enabled.
...
Change-Id: I2e741e603ade6bbb69ca103006bbcdc213f8acfc
Former-commit-id: efc59e6541342bfc3e826934e4a9a5d85dc2801b
2014-03-14 10:11:00 -05:00
Brian.Dyke
030a18f804
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 39f4506422c590b7520957923a5b00fd16aa19d0
2014-03-14 10:15:53 -04:00
Brian.Dyke
d4b6d22ae2
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: 3605f0373a6ce7b417d942991e50029c2d0c964b
2014-03-14 08:44:39 -04:00
Brian.Dyke
dcc2e4fd61
OB_14.1.1-23 baseline
...
Former-commit-id: b3292d88eee345fca27d9ca645ec2686d0114e5c
2014-03-14 08:18:16 -04:00
Ron Anderson
0a6630a84d
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: 60ace911a0b1496d3bb74a85ff3c6b89ca70c267
2014-03-13 18:01:22 -05:00
Bryan Kowal
9b2af366c1
Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit
...
Former-commit-id: 5f0d983aa7cd428d532aa3b418eaddf21e31718a
2014-03-13 17:39:32 -05:00
Kevin P. Johnson
b2797a0788
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: fad7cf2e6661aa0bcc9c37499e0560b708f192f0
2014-03-13 20:42:12 +00:00
Nate Jensen
620d9cf832
Merge "Issue #2718 Fix org.geotools version in common.base.feature/feature.xml" into development
...
Former-commit-id: 63bab83be86d4ad70569187e7948c230819f8b7d
2014-03-13 12:58:10 -05:00
Ron Anderson
fc7a19bdf6
Issue #2718 Fix org.geotools version in common.base.feature/feature.xml
...
Change-Id: I2e435e5cc7e3a65c116b3ca3ba3bd4f6c736082d
Former-commit-id: 98ca1d990e02bd70dacca7c951bf0212f93bdccc
2014-03-13 12:54:44 -05:00
Nate Jensen
a2a46becc8
Merge "Issue #2909 Remove useLegacyMergeSort java parameter" into development
...
Former-commit-id: a221c18b0195cb5b8dd284c4f3ef1266a8efd999
2014-03-13 12:41:14 -05:00
Nate Jensen
087307a781
Issue #2907 split edex.redbook plugin into common and edex redbook plugins
...
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe
Former-commit-id: 62923fbae80131fab6256923bc32bc46e46940ba
2014-03-13 12:23:35 -05:00
Ron Anderson
d1b36c4a72
Issue #2909 Remove useLegacyMergeSort java parameter
...
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a
Former-commit-id: 3aeb50672f8de7b973f234e0ab351416cbf7670b
2014-03-13 11:54:15 -05:00
Nate Jensen
540d0f2e1d
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: ee5c599bf4822f73e488e42240c5794189e2d70f
2014-03-13 11:16:00 -05:00
Ron Anderson
1c727465ee
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: efc65ad66fc4df90319f821f289e13dc9dbeb3a0
2014-03-13 11:11:53 -05:00
Nate Jensen
c662bfb938
Merge "Issue #2898 Fix recycling of best res resource." into development
...
Former-commit-id: 274b83f84f4bdda381c450b0853711564cae65a6
2014-03-13 10:14:58 -05:00
Ben Steffensmeier
90e464ad0b
Issue #2898 Fix recycling of best res resource.
...
Former-commit-id: 1693e5e369a199dd2a824815e0c3e638fc7b0be3
2014-03-12 18:05:10 -05:00
Nate Jensen
82778ad21b
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: b723095f6d5d59b67370c7292f88f339d349993a
2014-03-12 16:05:19 -05:00
Nate Jensen
253d19af73
Merge "Issue #2871 Clean up ECMWF bundles." into development
...
Former-commit-id: 86e55d14186870cc44f7d0a81e56f2175c66f1df
2014-03-12 15:35:21 -05:00
Ben Steffensmeier
77041e5b17
Issue #2528 Fix satellite units/style.
...
Former-commit-id: 7e38454a31aa55c606c155a108253c0433ecb517
2014-03-12 14:19:49 -05:00
Richard Peter
b9ad595f15
Merge "Issue #2858 - Implement NDM menus for ncep/hydro SPC Peer review comments" into development
...
Former-commit-id: 50e64a8948daed61e4c9422ef33732a018468e2a
2014-03-12 11:21:06 -05:00
Mike Duff
9aa0b40ed5
Issue #2858 - Implement NDM menus for ncep/hydro SPC
...
Peer review comments
Change-Id: Icbafa1e08ea9bc564c3f302715f527b92a5a55e5
Former-commit-id: a74573fef8cc09ed15341d9873ae1dd2ba561478
2014-03-12 11:19:18 -05:00
Ben Steffensmeier
17a940b6ce
Issue #2871 Clean up ECMWF bundles.
...
Former-commit-id: 5eb5f909c575205e3a261c3cce7ef7b05a57dd22
2014-03-12 11:16:42 -05:00
Nate Jensen
9a36f5470b
Merge "Issue #2827 fixed collab dataserver returning empty body with 200" into development
...
Former-commit-id: 190b1ef82b04ee7b0787f05fc4bb4a356b2a9903
2014-03-12 10:59:42 -05:00
Mike Duff
8068c9aa83
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: 13f134bafc5331939e23ce0e14d350593bb7c2e1
2014-03-12 10:52:18 -05:00
Nate Jensen
35f778f5b9
Merge "Issue #2702 Updated openfire version in component spec." into development
...
Former-commit-id: 2b8374ea8be4b36e3c6276ced6938a3e97c42201
2014-03-12 10:02:42 -05:00
Richard Peter
7af0cfaf38
Merge branch 'omaha_14.2.1' (14.2.1-11) into development
...
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1
Former-commit-id: 3f0cf9200a42adb2bd7dbd70e50642e940d6b822
2014-03-12 09:47:29 -05:00
Brad Gonzales
ccb312d46f
Issue #2702 Updated openfire version in component spec.
...
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498
Former-commit-id: 276c38754b7f917c229750ce06d387a8b63245d4
2014-03-12 08:48:36 -05:00
Brian Clements
bfde9c37ce
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: 31c42d161146b0367435c66535d4da700a572f24
2014-03-12 08:27:22 -05:00
Greg Armendariz
da34c3d2da
Merge "Issue #2851 - initial 64-bit build of the bignsharp DLL" into development
...
Former-commit-id: 5346beaf24ad66cfffab9e115c8d22b4c2fe2f95
2014-03-11 19:56:55 -05:00
Lee Venable
ae63879ddf
Merge "Issue #2865 - added more null and dispose checks" into development
...
Former-commit-id: 5c21cbb43cda9274a77b2358749ba53b397ef0e1
2014-03-11 17:43:48 -05:00
