Mike Duff
6ad3953d46
Issue #2856 - Implement Redbook CPC ndm menus
...
Change-Id: I1ef4007b9f7147a9640754aaf8846028a40d0693
Former-commit-id: 40319e5fcf25c8a0a8aa25c8a0a8aacdee2df27f
2014-03-20 11:16:35 -05:00
Richard Peter
3e666a910f
Merge "Issue #2859 - Implement redbook MPC NDM menus" into development
...
Former-commit-id: 14bed8a1df7070313c0b7070313c0b734eeedd36
2014-03-20 11:01:08 -05:00
Lee Venable
570ef5f109
Merge "Issue #2929 - the pure Python Override now recognizes REGION as a valid localization level" into development
...
Former-commit-id: 47f5ec513965335c255d65335c255dfae5d96361
2014-03-20 10:38:17 -05:00
David Gillingham
de6c0c6b23
Issue #2882 : Allow null values to be passed back in parameter values for DefaultGeometryData.
...
Change-Id: I258d247476cf280e107d386b903e9764a492d4f4
Former-commit-id: 0407f5b2e5d58bb87ee6d58bb87ee6e34f698b1d
2014-03-19 17:28:03 -05:00
Mike Duff
f49bb3b30c
Issue #2859 - Implement redbook MPC NDM menus
...
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e
Former-commit-id: e479bd7055059ac9c52a059ac9c52a4be30fdc5b
2014-03-19 14:40:00 -05:00
Bryan Kowal
e4d263daee
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: 4e320a35a3316f9b4747316f9b4747e7c80e9bfd
2014-03-19 14:07:03 -05:00
Lee Venable
b94ed41ba2
Merge "Issue #2433 - Implement view by priority check box menus review comments" into development
...
Former-commit-id: ab3de987b496ea26a9a296ea26a9a212aa173989
2014-03-19 08:54:39 -05:00
Nate Jensen
5cabc0fae4
Merge "Issue #2895 fixed telestration when leadership returns to a previous leader" into development
...
Former-commit-id: d44fee05883ee42187e63ee42187e6bc9f494604
2014-03-18 17:01:44 -05:00
Mike Duff
ff60e94886
Issue #2433 - Implement view by priority check box menus
...
review comments
Change-Id: I63c984c328336ebe9d6d06dbc48780051e3ea2e7
Former-commit-id: 202a822384a7e568e799a7e568e7999d24291927
2014-03-18 16:42:58 -05:00
Nate Jensen
350786f305
Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development
...
Former-commit-id: 7e7745cd7b85e3ac041a85e3ac041a61c5a25407
2014-03-18 13:13:53 -05:00
Nate Jensen
1447abe995
Issue #2895 fixed telestration when leadership returns to a previous
...
leader
Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033
Former-commit-id: 2fc1030fade75d3dfb7ce75d3dfb7c68b60eba47
2014-03-18 12:52:01 -05:00
Nate Jensen
5cc3fd4451
Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development
...
Former-commit-id: e9be36b08c5f79ece0065f79ece006b5f2064207
2014-03-18 12:38:48 -05:00
Mike Duff
3d62505600
Issue #2798 - Fix issue with color not changing for existing user changing site.
...
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57
Former-commit-id: 7bdef60a553d102600653d10260065ac65a87fe5
2014-03-18 11:55:00 -05:00
Mike Duff
d757b01edd
Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common.
...
Peer review comments
Change-Id: Ie27e8f93d976dcc0573631472986898b3ad8c9ef
Former-commit-id: cb6a3e2cf5105a11d8f9105a11d8f926866f4d73
2014-03-18 11:32:28 -05:00
Nate Jensen
10f1070f26
Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development
...
Former-commit-id: 6148c00ed26ddf9a2ee76ddf9a2ee73d7de2ad9a
2014-03-18 09:20:16 -05:00
Nate Jensen
68b9ca0d49
Merge "Issue #2904 Nullpointer potential in MesoTabular product." into development
...
Former-commit-id: 5b948e7214a09714792ea09714792e8b83cd83bf
2014-03-18 09:14:17 -05:00
Steve Harris
1dd9192564
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
...
Former-commit-id: 0c2c5ad4bdd0aeb854f5d0aeb854f55efb16fa8b
2014-03-17 15:55:41 -05:00
Dave Hladky
515d58dec7
Issue #2904 Nullpointer potential in MesoTabular product.
...
Former-commit-id: 373f052de873d861883373d8618833b43bd1f861
2014-03-17 15:22:42 -05:00
Nate Jensen
5f8e5a3331
Issue #2908 attempt to fix build
...
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480
Former-commit-id: 9cf43e7de678afc6040c78afc6040cb5f3aee368
2014-03-14 14:14:37 -05:00
Brian.Dyke
e85e3c2e70
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: 9c412e444ed23acbdd48d23acbdd489f332e938c
2014-03-14 11:13:30 -04:00
Ron Anderson
aa3418a8ae
Issue #2824 Fix possible null pointer when site is deactivated and active table sharing was not enabled.
...
Change-Id: I2e741e603ade6bbb69ca103006bbcdc213f8acfc
Former-commit-id: 6e6570fd5a883cf26c5f883cf26c5fdcc068132a
2014-03-14 10:11:00 -05:00
Brian.Dyke
670c673e8a
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 30084d7f84030a18f804030a18f80424a63fb05a
2014-03-14 10:15:53 -04:00
Brian.Dyke
a68bda6858
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: f999e48df0d4b6d22ae2d4b6d22ae24e3096631d
2014-03-14 08:44:39 -04:00
Brian.Dyke
b24e7a66d8
OB_14.1.1-23 baseline
...
Former-commit-id: bc6a7bf946dcc2e4fd61dcc2e4fd6155918ee421
2014-03-14 08:18:16 -04:00
Ron Anderson
3ac978316a
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: 107daf22ae0a6630a84d0a6630a84def8a3b2581
2014-03-13 18:01:22 -05:00
Bryan Kowal
0e4fbed3ef
Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit
...
Former-commit-id: 6ba13b2b449b2af366c19b2af366c13e90c26b14
2014-03-13 17:39:32 -05:00
Kevin P. Johnson
c791f55d02
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: 4c833d3389b2797a0788b2797a0788e3a951da78
2014-03-13 20:42:12 +00:00
Nate Jensen
06fa63341d
Merge "Issue #2718 Fix org.geotools version in common.base.feature/feature.xml" into development
...
Former-commit-id: 42649882fa620d9cf832620d9cf832727457dd9d
2014-03-13 12:58:10 -05:00
Ron Anderson
5bd859c9d3
Issue #2718 Fix org.geotools version in common.base.feature/feature.xml
...
Change-Id: I2e435e5cc7e3a65c116b3ca3ba3bd4f6c736082d
Former-commit-id: dcb7b9c88ffc7a19bdf6fc7a19bdf66061100cb0
2014-03-13 12:54:44 -05:00
Nate Jensen
57ba744427
Merge "Issue #2909 Remove useLegacyMergeSort java parameter" into development
...
Former-commit-id: befff7be3aa2a46becc8a2a46becc857faf2b7b1
2014-03-13 12:41:14 -05:00
Nate Jensen
0597c51f2e
Issue #2907 split edex.redbook plugin into common and edex redbook plugins
...
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe
Former-commit-id: cc1cb28eed087307a781087307a781692ec623b2
2014-03-13 12:23:35 -05:00
Ron Anderson
010666a971
Issue #2909 Remove useLegacyMergeSort java parameter
...
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a
Former-commit-id: dd8bfdf941d1b36c4a72d1b36c4a72f921b5c83b
2014-03-13 11:54:15 -05:00
Nate Jensen
a45175cbc9
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: 27625eb93a540d0f2e1d540d0f2e1da9381c505e
2014-03-13 11:16:00 -05:00
Ron Anderson
d752e068c7
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: bcfaf40ebf1c727465ee1c727465eeab69d3e318
2014-03-13 11:11:53 -05:00
Nate Jensen
baead24016
Merge "Issue #2898 Fix recycling of best res resource." into development
...
Former-commit-id: 8ac509f37fc662bfb938c662bfb93895fe9da5e2
2014-03-13 10:14:58 -05:00
Ben Steffensmeier
3efcf94ac6
Issue #2898 Fix recycling of best res resource.
...
Former-commit-id: d115db1a6690e464ad0b90e464ad0b477b2b604a
2014-03-12 18:05:10 -05:00
Nate Jensen
84d698b111
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: f8180587d482778ad21b82778ad21b0e39a89ea3
2014-03-12 16:05:19 -05:00
Nate Jensen
2c75a66182
Merge "Issue #2871 Clean up ECMWF bundles." into development
...
Former-commit-id: 3dd9c9bffb253d19af73253d19af73185684ce9b
2014-03-12 15:35:21 -05:00
Ben Steffensmeier
eb922ea2e2
Issue #2528 Fix satellite units/style.
...
Former-commit-id: 75120a09cd77041e5b1777041e5b17e6cd8b3167
2014-03-12 14:19:49 -05:00
Richard Peter
1e90648b68
Merge "Issue #2858 - Implement NDM menus for ncep/hydro SPC Peer review comments" into development
...
Former-commit-id: 6cf5eb346ab9ad595f15b9ad595f15e69e07ce82
2014-03-12 11:21:06 -05:00
Mike Duff
972c77589f
Issue #2858 - Implement NDM menus for ncep/hydro SPC
...
Peer review comments
Change-Id: Icbafa1e08ea9bc564c3f302715f527b92a5a55e5
Former-commit-id: b434ab5bb39aa0b40ed59aa0b40ed5865ef97108
2014-03-12 11:19:18 -05:00
Ben Steffensmeier
3408bd4398
Issue #2871 Clean up ECMWF bundles.
...
Former-commit-id: fe55c4937317a940b6ce17a940b6ce4953b487cd
2014-03-12 11:16:42 -05:00
Nate Jensen
9f1d557bc6
Merge "Issue #2827 fixed collab dataserver returning empty body with 200" into development
...
Former-commit-id: 10a2e5c6029a36f5470b9a36f5470b1a3d8a69d4
2014-03-12 10:59:42 -05:00
Mike Duff
bb2b251cd0
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: e01c5c35348068c9aa838068c9aa836444131768
2014-03-12 10:52:18 -05:00
Nate Jensen
7a8cddff16
Merge "Issue #2702 Updated openfire version in component spec." into development
...
Former-commit-id: c5647be7e035f778f5b935f778f5b9d8100732d6
2014-03-12 10:02:42 -05:00
Richard Peter
751b37616e
Merge branch 'omaha_14.2.1' (14.2.1-11) into development
...
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1
Former-commit-id: 7ebbc0cf787af0cfaf387af0cfaf38042468f761
2014-03-12 09:47:29 -05:00
Brad Gonzales
57b81b8031
Issue #2702 Updated openfire version in component spec.
...
Change-Id: I604d64003c74efe71782daf55e3bda9cbebb9498
Former-commit-id: bf0d052043ccb312d46fccb312d46fc7d06ff946
2014-03-12 08:48:36 -05:00
Brian Clements
2aa9dcb248
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: d44c55e976bfde9c37cebfde9c37cece1038723d
2014-03-12 08:27:22 -05:00
Greg Armendariz
015bf62723
Merge "Issue #2851 - initial 64-bit build of the bignsharp DLL" into development
...
Former-commit-id: 6acf5fefccda34c3d2dada34c3d2da195383130c
2014-03-11 19:56:55 -05:00
Lee Venable
6380c83d55
Merge "Issue #2865 - added more null and dispose checks" into development
...
Former-commit-id: 36f72f23dcae63879ddfae63879ddf6d02134d89
2014-03-11 17:43:48 -05:00
