Commit graph

3301 commits

Author SHA1 Message Date
Richard Peter
08f6dae69f Merge "Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes." into development
Former-commit-id: d0746350d7 [formerly 1a4c887b6f] [formerly 42248850a6] [formerly 6223ee42de [formerly 42248850a6 [formerly d85dd6c0b1c657bc2ff23c461370fbc480656229]]]
Former-commit-id: 6223ee42de
Former-commit-id: 64a9689355af15f6e09574ae0fe2b065b687f3bb [formerly eb0e4c9a70]
Former-commit-id: 5b3944835a
2013-07-31 13:40:49 -05:00
Richard Peter
7f46fbf78f Merge branch 'omaha_13.5.1' (13.5.1-8) into development
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: e439ecafe6 [formerly 464352f731] [formerly 26df62db53] [formerly f97a27796d [formerly 26df62db53 [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]
Former-commit-id: f97a27796d
Former-commit-id: ea1df038b44fa6b4c0db240a0fb0b45969d773c0 [formerly 3f1e17765a]
Former-commit-id: a67f0bf2da
2013-07-31 12:54:12 -05:00
Richard Peter
79f686a303 Merge "Issue #2180 encrypt credential storage" into development
Former-commit-id: 0c1b56e59c [formerly 9a7d566375] [formerly d97920b3dd] [formerly 85e1ff2f90 [formerly d97920b3dd [formerly ff2282377e18aee855e3029c82c6653cf3f4c9e5]]]
Former-commit-id: 85e1ff2f90
Former-commit-id: 964a0a8c2be8bab43e777cb05c0ab7790260aaa8 [formerly 8e14c9cd78]
Former-commit-id: c0f4788d5a
2013-07-31 11:40:22 -05:00
Bryan Kowal
4f9752d0ca Issue #2164 - fix 32-bit edex_com, edex_notify build
Change-Id: I04251c30fdba10d81940364056ba0f5478a56d30

Former-commit-id: 8570281fdf [formerly 420ffa0afd] [formerly 7aba70031d] [formerly 9b3f7977e5 [formerly 7aba70031d [formerly a170ba8c71f1713f801ee663baf59ea4bd206afe]]]
Former-commit-id: 9b3f7977e5
Former-commit-id: 852b7a810a929b5e6a8a0e3ec1975bcd75498da5 [formerly f1445e37a2]
Former-commit-id: ece1adb977
2013-07-31 11:34:00 -05:00
Richard Peter
a38aa583f3 Merge "Issue #1051 Upgrade script for bufrmos invalid locations. Change-Id: I78b29e173654d0066852b650d4d791920fc07977" into development
Former-commit-id: 158fcae8e4 [formerly 6a6474c924] [formerly f2b63d24b1] [formerly 317f1bc568 [formerly f2b63d24b1 [formerly f19ce489e7a0f3b671cb8a85cc445d48c6fc5f91]]]
Former-commit-id: 317f1bc568
Former-commit-id: 4959c07585e8b777d751949d81900f5d72a3d9e7 [formerly f154dc9f2a]
Former-commit-id: be227df0b7
2013-07-30 21:34:54 -05:00
Richard Peter
625349673d Merge changes Ibb67b53b,I376f2970,Ie4dee73b into development
* changes:
  Issue #2227 Fix issue with swapping of melting layer product.
  Issue #1726 add swt to unit tests project for use when we need it
  Issue #2148 moved all registering of radar products to spring files instead of static methods in Java classes


Former-commit-id: 49d4df407c [formerly d5e0eadb2a] [formerly 57a57ad677] [formerly 618fabe94f [formerly 57a57ad677 [formerly a454e0e19a3f4eca2c6b0a797de0aacb3d2934c8]]]
Former-commit-id: 618fabe94f
Former-commit-id: 6e4d3a6ae05aa613e1b182e6a074108fda083abc [formerly 4a668cf47d]
Former-commit-id: e82bec7b87
2013-07-30 21:32:42 -05:00
Ben Steffensmeier
c7a54bed9d Issue #1051 Upgrade script for bufrmos invalid locations.
Change-Id: I78b29e173654d0066852b650d4d791920fc07977

Former-commit-id: e58bdcc85e [formerly ce726f0b0d] [formerly db8989822e] [formerly 0a8543b6fa [formerly db8989822e [formerly ec3d2599a9c792be08ffdb67cb0de9330b37b04a]]]
Former-commit-id: 0a8543b6fa
Former-commit-id: 54d479ac9d7276f257ed7bcafc4efb81dc0fa597 [formerly 313d8554cc]
Former-commit-id: e8dabda2ba
2013-07-30 17:08:28 -05:00
Bryan Kowal
5f6998ef39 Issue #2164 - re-enable the build of awips2-notification
Former-commit-id: 367905865a [formerly a04b44aee8] [formerly 2ce33f335a] [formerly 894aeda688 [formerly 2ce33f335a [formerly 0c8b0a5d178b798b788a602b4053a864fa2f2286]]]
Former-commit-id: 894aeda688
Former-commit-id: 4aece8aaf272cb9ed69af798ef1f86fb8dfe8e91 [formerly 96f0a6fb87]
Former-commit-id: b77b97d083
2013-07-30 13:04:54 -05:00
Matt Nash
529e15bf44 Issue #2227 Fix issue with swapping of melting layer product.
Change-Id: Ibb67b53ba29f5a24714e2852602fd0b54d811b6d

Former-commit-id: 411bb7bef9 [formerly 3c0eb24d51] [formerly 91afb50333] [formerly b308e86105 [formerly 91afb50333 [formerly fc6ff0d7e60d82c8ca0d67cf96f26cde23ad0f02]]]
Former-commit-id: b308e86105
Former-commit-id: 253e6c7e43e23ad4a1926485184a895f118c99ca [formerly 855671b490]
Former-commit-id: 1acd38ced6
2013-07-30 10:47:37 -05:00
Matt Nash
360ac2c558 Issue #1726 add swt to unit tests project for use when we need it
Change-Id: I376f297094b21613c32fdb20e751f6c14198188b

Former-commit-id: dff255b412 [formerly 2272ef743f] [formerly 6f2c706149] [formerly 74faace462 [formerly 6f2c706149 [formerly f58406d3f62a7aa2f3e7769662391590ee0de0ef]]]
Former-commit-id: 74faace462
Former-commit-id: 0939e9e9c416097506802947ffbd23b703fda720 [formerly 10472db383]
Former-commit-id: b0fbab6d1d
2013-07-30 09:13:18 -05:00
Matt Nash
d52d3050f4 Issue #2148 moved all registering of radar products to spring files instead of static methods in Java classes
Change-Id: Ie4dee73bdf63712f372b3067e59e0dbb499d6d5c

Former-commit-id: 1ddd6bac8f [formerly d29749fc55] [formerly d74c69a12e] [formerly 8588f67264 [formerly d74c69a12e [formerly 518a93ba1830230e504b576ad35ffb9453a1817c]]]
Former-commit-id: 8588f67264
Former-commit-id: 9f21b626b2e73128e1287fcc74f96d1fad125c5d [formerly 04ad305b94]
Former-commit-id: f52266b45a
2013-07-30 09:05:31 -05:00
Ron Anderson
b407c24483 Merge "Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay." into development
Former-commit-id: a5b4564bf4 [formerly d569641f3e] [formerly ca94d4ffac] [formerly 43b5d2193b [formerly ca94d4ffac [formerly b286c654293e9b7bc11930953118b1d86da946dc]]]
Former-commit-id: 43b5d2193b
Former-commit-id: 9325a6cfb92f4c6f3ed0e145dbd8e2e7fb061d80 [formerly 8b1eb58de9]
Former-commit-id: 129040ce9b
2013-07-30 08:35:06 -05:00
Dave Hladky
4fc764ca3c Issue #2180 encrypt credential storage
Change-Id: If617535df024216c8d089a67c326c098e906724e

Former-commit-id: 3c5ed94610 [formerly a9b8cad721] [formerly a2260ac6d3] [formerly adf02a83c0 [formerly a2260ac6d3 [formerly f912ce7c2806abdce17c2b994d9226cdacf1ff34]]]
Former-commit-id: adf02a83c0
Former-commit-id: e0dae0061e18dad377413d63990d4054adbe3d1b [formerly 703614af1d]
Former-commit-id: ac3b701421
2013-07-30 08:33:59 -05:00
Richard Peter
f0c2d69bc3 Merge "Issue #2215 - Updates to edex_com and edex_notify for the thrift 0.9.0 upgrade." into development
Former-commit-id: 4a255b9953 [formerly 2a413e902e] [formerly 6ac17c924d] [formerly ac59471b45 [formerly 6ac17c924d [formerly 1982de77f9dc752a442e4e82e84a958fef79d19d]]]
Former-commit-id: ac59471b45
Former-commit-id: 3aaad48ac057f784bb8cd4fc2e7a967ca35e1482 [formerly 8cbdb50b77]
Former-commit-id: 0505da7b4f
2013-07-29 22:12:50 -05:00
Ron Anderson
8302ca2e4c Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay.
Change-Id: I3d2541a057440a3813837a91bef4e86172d73e4c

Former-commit-id: 7cbf6290b7 [formerly a5da46c360] [formerly ebdfbebcfc] [formerly 4aceedceb5 [formerly ebdfbebcfc [formerly 0f490c934d197bc45fea1fad2c034c47a2556988]]]
Former-commit-id: 4aceedceb5
Former-commit-id: 74a9faa9f68a1d5677b8f681b73ca7605d1907ac [formerly b4de3f23a6]
Former-commit-id: ddecdbf0b8
2013-07-29 18:12:24 -05:00
Ron Anderson
8c8be0441e Merge "Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped" into development
Former-commit-id: 1d834d8d2f [formerly 9574e1237e] [formerly 35f5b04522] [formerly fd43f74212 [formerly 35f5b04522 [formerly 5188a208a6b66eb024db64efeb8a6409c57d4a64]]]
Former-commit-id: fd43f74212
Former-commit-id: 32ddad57d2fb004dabb2608d41dde4b5a0348dd6 [formerly 890bb4d832]
Former-commit-id: 972f1b02fc
2013-07-29 18:11:30 -05:00
Ron Anderson
a6b9fbb808 Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped
Change-Id: I8700442003c686916a926509b76ca9dd96d42b1b

Former-commit-id: 681492f139 [formerly 19d38c48c5] [formerly f028f111b0] [formerly f3a8ccf158 [formerly f028f111b0 [formerly 7a9efa6a0b9ca848a9f8445f1aeef9a278c09ee7]]]
Former-commit-id: f3a8ccf158
Former-commit-id: c81dcca785585c8d2a5eca4e0c836bcfe52ee5f2 [formerly 3841c55a28]
Former-commit-id: 1de5b051e2
2013-07-29 17:19:07 -05:00
Bryan Kowal
be6c3ef08b Issue #2164 - remove unnecessary junit dependency
Former-commit-id: 45b945e3be [formerly 204fa65c8f] [formerly a0f1944796] [formerly 77473d75b5 [formerly a0f1944796 [formerly 8e7229a41ec6b5816a27f86a37e5d183cd0d1925]]]
Former-commit-id: 77473d75b5
Former-commit-id: fe8947abdbbfbad364cff667293097397b9f31fa [formerly 686affce01]
Former-commit-id: 02bba2ae9c
2013-07-29 16:31:15 -05:00
Lee Venable
300fec364a Merge "Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical" into development
Former-commit-id: 85997c99ec [formerly c59237a292] [formerly f246c961a2] [formerly 80a147990e [formerly f246c961a2 [formerly 1f7a3d63a890934875a59a454e910bac94cdc671]]]
Former-commit-id: 80a147990e
Former-commit-id: 55a8a98aca4bdb2abe9c662cd9400379e4187e45 [formerly c78a13d744]
Former-commit-id: 8dcbc5d137
2013-07-29 15:06:42 -05:00
Matt Nash
799c643595 Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical
Change-Id: I37269b4dd9e09ea6f4a8ad5c95f1620a462f3f5d

Former-commit-id: c04dfe7490 [formerly 8e75837289] [formerly 74ccbf163d] [formerly 0c98b5e9de [formerly 74ccbf163d [formerly 06fe93289dd6832fe7b2b78e6d15f15f229c2532]]]
Former-commit-id: 0c98b5e9de
Former-commit-id: 410563425e46c9739e4ae4400673f00e318d3e9a [formerly e7fddc8df0]
Former-commit-id: 65c3bb4ba4
2013-07-29 14:47:19 -05:00
Bryan Kowal
66dc4ed288 Issue #2215 - Updates to edex_com and edex_notify for the thrift 0.9.0 upgrade.
- Amend: fix data types in GridDataRequestMessage

Change-Id: I7f7abd36b3c3f94c24ee0381115c5643aae39f22

Former-commit-id: c7ca10997a [formerly 8ac250ca02] [formerly c5c9f4d30b] [formerly a44a5d16e7 [formerly c5c9f4d30b [formerly e317a0d7101182ad351f604cfc04ad0292773161]]]
Former-commit-id: a44a5d16e7
Former-commit-id: 10142f3033966b2e09e7acab2313f01e6daa1ff0 [formerly 3fadaf976c]
Former-commit-id: 3c1a1d7d9d
2013-07-29 13:50:33 -05:00
Brad Gonzales
645d36f98f Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes.
Change-Id: I3239daa25a4bc2116ff3423bfa71afe3947faff0

Former-commit-id: 7ad2b1c953 [formerly a053fc85f7] [formerly 8a6ab05561] [formerly 18201a0153 [formerly 8a6ab05561 [formerly 9bea23cc83e7262721efa4fef9b573d4dd540502]]]
Former-commit-id: 18201a0153
Former-commit-id: df7ab4ff8c4d4e0fc3ec4b4ec3223eb60f7bf884 [formerly 22c62b6982]
Former-commit-id: 02bb327341
2013-07-29 11:56:10 -05:00
Lee Venable
d340bb792b Merge "Issue #2232 - Fix index out of bounds exception in Sub Manager Table" into development
Former-commit-id: 6698d5d65f [formerly 5d32fd30df] [formerly a42d4bb0cc] [formerly 30baa25afa [formerly a42d4bb0cc [formerly d49617f4acec37ddbaa0ec1d91306687a35531b0]]]
Former-commit-id: 30baa25afa
Former-commit-id: 04d138d3d113b1e2230601f125d0cb7b9687aa4a [formerly 2af73d09f9]
Former-commit-id: 8f3b40e732
2013-07-29 11:52:16 -05:00
Lee Venable
4d36f90396 Merge "Issue #2217 - Added better error handling" into development
Former-commit-id: c71c388b1c [formerly d97698519d] [formerly f3c4306987] [formerly ccf6962224 [formerly f3c4306987 [formerly 880308a45215aba37e9f6fa367f0848cdbb0da51]]]
Former-commit-id: ccf6962224
Former-commit-id: df76bd2f6d088b036ea13625efcf10dec752bfc4 [formerly e2002c1d7e]
Former-commit-id: 824b855490
2013-07-29 11:44:59 -05:00
Richard Peter
13532b004b Merge "Issue #1051 Discard bufrmos data with invalid location." into development
Former-commit-id: 68b984fdf6 [formerly a75ada03f9] [formerly ff13fdaf20] [formerly 450af19c9c [formerly ff13fdaf20 [formerly 15e7809ca7503415ba0603cc39e7f0543d1e5af1]]]
Former-commit-id: 450af19c9c
Former-commit-id: e26acaa0a5fad18af89f10a819a2673923d93588 [formerly d76d407ca5]
Former-commit-id: d924e6e0c4
2013-07-29 11:12:19 -05:00
Richard Peter
c40ba8d0f0 Merge "Issue #2231 Make edex startup more configurable" into development
Former-commit-id: 0943bb51fc [formerly 49b9422554] [formerly cd8535f182] [formerly 736c88ae6c [formerly cd8535f182 [formerly da8f06eeb0bb2b68047896547d0181bdb0e82928]]]
Former-commit-id: 736c88ae6c
Former-commit-id: 707a7144d0b8d6053bc190ab8b34968976144409 [formerly 635a54caf9]
Former-commit-id: 78ed556f82
2013-07-29 10:14:58 -05:00
Mike Duff
180e113d2d Issue #2232 - Fix index out of bounds exception in Sub Manager Table
Change-Id: Id61f6c2ddccb965a236bf9a99412e6f6cca8cae0

Former-commit-id: 46a39fd7bb [formerly 83c79750af] [formerly 974d5a05b2] [formerly 3ab275aea4 [formerly 974d5a05b2 [formerly baa8d402efb4aeff839e06fd180a73a857fd0766]]]
Former-commit-id: 3ab275aea4
Former-commit-id: 9c0ed0e446be1daad57db09fc0150b4cdaca314f [formerly 579daeaebb]
Former-commit-id: df83cf2ffe
2013-07-29 09:55:51 -05:00
Ben Steffensmeier
8cfdc7b3d6 Issue #1051 Discard bufrmos data with invalid location.
Former-commit-id: e516491b26 [formerly 239033f268] [formerly 7ee9aee40a] [formerly a5112b6e19 [formerly 7ee9aee40a [formerly 17c5060c2cb1101d93550904fec3f59704838ff1]]]
Former-commit-id: a5112b6e19
Former-commit-id: f2ed00bfbb3b1d6abc50f94be2ad8467b495f25f [formerly cfcdc38fe7]
Former-commit-id: 661fa14886
2013-07-26 17:42:06 -05:00
Richard Peter
85884ccfd1 Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: a3d9294d13 [formerly bf99d8fd4d] [formerly 359ee5d1af] [formerly 8ba840f1d9 [formerly 359ee5d1af [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]]
Former-commit-id: 8ba840f1d9
Former-commit-id: 0dc19249f2e6c34a8ed77014c3334f26ca6a83c9 [formerly 16e182d70b]
Former-commit-id: 43453bcbff
2013-07-26 14:36:46 -05:00
Richard Peter
b40512d805 Merge "Issue #2189 Set size properly on GLFont" into development
Former-commit-id: fc5c8fe510 [formerly 951484545a] [formerly 30c92f3fc7] [formerly 196f5f4a5d [formerly 30c92f3fc7 [formerly 7f7762b889e7b86231f22abb89dd94d630c0d291]]]
Former-commit-id: 196f5f4a5d
Former-commit-id: 435dcb24e4fa3b4b4a8e2c90d6f0485a3757375d [formerly 8ba5944134]
Former-commit-id: 44bcd7145d
2013-07-26 14:34:46 -05:00
Max Schenkelberg
f3f82761a0 Issue #2189 Set size properly on GLFont
Change-Id: Ib7321dfada582f4cbb05416428bd0c9639a905f7

Former-commit-id: dcd0242c3a [formerly 1e4fe87002] [formerly 970f2c1373] [formerly 564d6ee664 [formerly 970f2c1373 [formerly 77d6ace9b601558ece1bf5ea724ef2f08df0112a]]]
Former-commit-id: 564d6ee664
Former-commit-id: 0dccb9e07f90ef5a8f408098b1747f15fc92c249 [formerly ef01f6db81]
Former-commit-id: e1c5959762
2013-07-26 13:14:48 -05:00
Richard Peter
426003a524 Merge "Issue #2112 Fix volume browser sounding errors." into development
Former-commit-id: 22b017edfa [formerly 008f2f98ad] [formerly 8a4506e794] [formerly c57aa39ddd [formerly 8a4506e794 [formerly 019b1d63f11c9d1d57593e26f939d6b089730693]]]
Former-commit-id: c57aa39ddd
Former-commit-id: fd60a0ca22c8a42ac41c45ecab3700ce2597539c [formerly 5d53ab253d]
Former-commit-id: 5c59b1257c
2013-07-26 10:23:08 -05:00
Greg Armendariz
a8fdc30fd7 Issue #2207 - fix build issues with ncep unit-test directories
Former-commit-id: 3655c16d39 [formerly 777fe464d0] [formerly 031a78ed9d855f46df5db87bfcf16c99fc1ebcb4 [formerly db65f0c206]] [formerly 17b8376a72 [formerly db65f0c206 [formerly 766c2983afc0aac22143f86afa0c5eca500d1941]]]
Former-commit-id: 17b8376a72
Former-commit-id: 7b3cc0e3d1258a1d7f3a2b1c069695d57255f0a1 [formerly dc0e4e4728]
Former-commit-id: 2ba99579ca
2013-07-26 09:48:44 -05:00
Greg Armendariz
f6794acf79 Issue #2207 - Additional test fixes
Former-commit-id: 76b0a2da3d [formerly 0f4595d842] [formerly afe9191fea] [formerly b5d509fc4a [formerly afe9191fea [formerly 38531ca3d8336801663d7d664d0578497dff8911]]]
Former-commit-id: b5d509fc4a
Former-commit-id: ec0c985279a053426670da8dd11bade116fad500 [formerly 56881355ed]
Former-commit-id: 599458dbb5
2013-07-26 09:24:43 -05:00
Greg Armendariz
344ee588b3 Merge "Issue #2207 - Remove reference to missing tests directory" into development
Former-commit-id: 1762662c99 [formerly d83157b9d1] [formerly 69b346a195] [formerly 66caca12a4 [formerly 69b346a195 [formerly 3cf75f2b1a2fe5c2b94fcabf0b54038fccfa1724]]]
Former-commit-id: 66caca12a4
Former-commit-id: 12218db6b46469b81fc6897d0641bccf755a679c [formerly 8a5d9e4c70]
Former-commit-id: c232be59ff
2013-07-26 09:05:53 -05:00
Greg Armendariz
6232c7ea05 Issue #2207 - Remove reference to missing tests directory
Former-commit-id: f69ecb69f0 [formerly 7861a026b2] [formerly 8be27acdf2] [formerly f3d82d8e82 [formerly 8be27acdf2 [formerly 2f7e8e5d498fd96f60ddf3ae192cadc705abaf5c]]]
Former-commit-id: f3d82d8e82
Former-commit-id: 6fb040e680da0c52a9b6f09d40a36ce982300998 [formerly fedae5495f]
Former-commit-id: a8ed77b11a
2013-07-26 08:59:41 -05:00
Lee Venable
21d13f942a Merge "Issue #2218 - improve error handling and performance in SCANMonitor" into development
Former-commit-id: f1df84fe95 [formerly 877730ad19] [formerly 48a1404221] [formerly 4635a88d54 [formerly 48a1404221 [formerly bfbe879b22697ca7c8558ee94c49137a7787cfc9]]]
Former-commit-id: 4635a88d54
Former-commit-id: c50c94098d568e993c9762b97dd6420c536de33c [formerly 2357c7725a]
Former-commit-id: 995175c247
2013-07-26 08:48:56 -05:00
Greg Armendariz
617f671ec4 Issue #2207 - Fix build
Former-commit-id: 95c6f59fbc [formerly 5185e13a33] [formerly 818a8a35d3] [formerly 578c307d40 [formerly 818a8a35d3 [formerly 86ca9354e8800acd2f15633e0f44980627a0359f]]]
Former-commit-id: 578c307d40
Former-commit-id: d28c58d094c6c2c69006ead370ae2971afa2b779 [formerly 2411fbf362]
Former-commit-id: b6d33739cf
2013-07-26 08:44:52 -05:00
Nate Jensen
e60e5dba08 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 68fbcf5bb2 [formerly 7fc047102b] [formerly 5e29be3d1f] [formerly 1c765670ea [formerly 5e29be3d1f [formerly 49299504331c730ffe8a94f490f88337baf12233]]]
Former-commit-id: 1c765670ea
Former-commit-id: 293b692d6b0250e935d8663ee184a7d26bdf62fd [formerly 97c71fc9dc]
Former-commit-id: 5cc5818af7
2013-07-26 08:43:29 -05:00
Steve Harris
d2f1179995 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 5b142d82f5 [formerly 5697c124b7] [formerly caee8e354d] [formerly 804270e3a2 [formerly caee8e354d [formerly 5fca4065166ffd0e1d7a21f8463abd30657307b9]]]
Former-commit-id: 804270e3a2
Former-commit-id: d658701a2fdde3a1dd32da88e66fdd3f14ead065 [formerly 31ab02f0d4]
Former-commit-id: 92a27a07bb
2013-07-26 08:28:54 -05:00
Steve Harris
340e7bab60 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]
Former-commit-id: a7d4c6274e
2013-07-26 09:02:34 -04:00
Ron Anderson
7216cc451e Merge "Issue #2044 Fix topo retrieval in ifpnetCDF" into development
Former-commit-id: d03977c8be [formerly f0b278ad16] [formerly f3138d7bd9] [formerly 668cbd0c87 [formerly f3138d7bd9 [formerly 50129c57d6cc798da0dcf6b5f9b84811af5f6fa1]]]
Former-commit-id: 668cbd0c87
Former-commit-id: a34f34558a475b7d104e70954a47c3c1c7f1904b [formerly 28863afe77]
Former-commit-id: 3221f96696
2013-07-25 18:17:08 -05:00
Ron Anderson
72f4e4f14f Issue #2044 Fix topo retrieval in ifpnetCDF
Change-Id: I3e15f9ed8a5e7577332fade9cfabeb9734fd1d20

Former-commit-id: 2ec3c5eb95 [formerly d850a79cbd] [formerly 807b4ee431] [formerly f6f19065e6 [formerly 807b4ee431 [formerly 9bacbf50094476cfb01be5b9ae1f535ca4afd1c9]]]
Former-commit-id: f6f19065e6
Former-commit-id: efa321e63a18527d354b11a2b5486ade82a7fce3 [formerly e5551d529a]
Former-commit-id: 754e521085
2013-07-25 18:14:38 -05:00
Ben Steffensmeier
615b2bde63 Issue #2112 Fix volume browser sounding errors.
Former-commit-id: 4c2abb67c6 [formerly 08f6b60d23] [formerly c4cb6d24ba6a319ec7be0f585a21825b237271e1 [formerly 74f854634f]] [formerly 2680d6ddbc [formerly 74f854634f [formerly f2999e84c430e98a4f1a4a1808b61d6810dac463]]]
Former-commit-id: 2680d6ddbc
Former-commit-id: d61ac4495d4b09d455c3bd553486b3f02b4add0e [formerly 5e39fce827]
Former-commit-id: 7db3d4722c
2013-07-25 17:58:49 -05:00
Nate Jensen
1f3f5ace25 Issue #2207 removing custom org.junit
Change-Id: I6b65719c0b48a3430b9318aa6dbbf4718f98df7b

Former-commit-id: b429fdd192 [formerly fd14405886] [formerly 185296c67d] [formerly 4ccfc5be82 [formerly 185296c67d [formerly ae869b69c5a648205d4d0cd7275b4a6c1e82054d]]]
Former-commit-id: 4ccfc5be82
Former-commit-id: 732c085e88be485c5665de3436f4d63820939a50 [formerly a3fd5fa3ee]
Former-commit-id: 93976753df
2013-07-25 16:48:18 -05:00
Nate Jensen
202540928f Merge "Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing" into development
Former-commit-id: 213de77806 [formerly 3958edbdae] [formerly b7c4087765] [formerly 88c0b989ef [formerly b7c4087765 [formerly 6db335a5fda51c1d501e7a5d6b1fc58eba77160a]]]
Former-commit-id: 88c0b989ef
Former-commit-id: 745f9b39418c3db9493696dfb639abab24c1fee3 [formerly a7cadf0388]
Former-commit-id: 38501a83d5
2013-07-25 16:04:22 -05:00
Nate Jensen
44795095a4 Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing
Change-Id: I49467fe6e9425a73985f729bc1ea4b10eb139c16

Former-commit-id: 37b332864d [formerly 25b78917ff] [formerly cf656dddc6] [formerly d364cfe32e [formerly cf656dddc6 [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]]
Former-commit-id: d364cfe32e
Former-commit-id: c3a9606c2218691935816ad67207a547e1d9ab53 [formerly dc7c2fd063]
Former-commit-id: f110fe5f6f
2013-07-25 14:59:01 -05:00
Ron Anderson
8f1392adb2 Merge "Issue #2044 Refactor of GFE Server code" into development
Former-commit-id: d31300ae2d [formerly b3619c1ba4] [formerly 604cfd2070] [formerly 0428b8fb7b [formerly 604cfd2070 [formerly 3720bf498346073343d0dff7a6949d3f7f0d5f62]]]
Former-commit-id: 0428b8fb7b
Former-commit-id: fdede04caaf020efc425615ddb25f1baf3096304 [formerly b084626454]
Former-commit-id: 9e10143fb2
2013-07-25 13:59:17 -05:00
Richard Peter
8072d130ec Merge "Issue #2176 Implemented emergency warning products." into development
Former-commit-id: 111c060d8d [formerly f031871351] [formerly 5d192e263f] [formerly 89823b3681 [formerly 5d192e263f [formerly 717a1f81ecc323e4e1cc10e923956befb99e3e04]]]
Former-commit-id: 89823b3681
Former-commit-id: 02d3965a7c379b1cddac22a76c18e4d0f63b2604 [formerly d98c33cfbc]
Former-commit-id: ac030d4e71
2013-07-25 13:54:48 -05:00
Jonathan Sanchez
04db8f74f2 Issue #2176 Implemented emergency warning products.
Change-Id: Icde169adbcfc5c409319649d63d222044a35dae2

Former-commit-id: 46d5bd4f0a [formerly c62de0d75f] [formerly 7d74ba5ee1] [formerly 67ce90c14a [formerly 7d74ba5ee1 [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]]
Former-commit-id: 67ce90c14a
Former-commit-id: 5fed586cc6728d3bc60caa721d6692540f8131c5 [formerly 4b38e3786d]
Former-commit-id: a9fccb3e9d
2013-07-25 13:47:44 -05:00