Commit graph

3469 commits

Author SHA1 Message Date
Bryan Kowal
ab7b25bd69 Issue #2252 - remove file accidentally re-added by the merge.
Former-commit-id: 09546736f2 [formerly 0ba5c54688] [formerly 3bdbf6d0cc] [formerly 09546736f2 [formerly 0ba5c54688] [formerly 3bdbf6d0cc] [formerly 5c6258e8c1 [formerly 3bdbf6d0cc [formerly 0462ccb18fdd17b2d25a2c22b547d052ffe33aca]]]]
Former-commit-id: 5c6258e8c1
Former-commit-id: 0d1cf60269 [formerly 4f0b9b4cf3] [formerly e0a4220ad22d5843e5444411defaa80103a9ae61 [formerly a35cbbf85c]]
Former-commit-id: 2b66ee842553f164c837f755752a8a1ecc75a155 [formerly e5727ed745]
Former-commit-id: 6a24eb7f9a
2013-08-08 18:38:21 -05:00
Bryan Kowal
c7161d8822 Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now
- Note: VizLauncher and AWIPSII.CAVE are NOT Eclipse projects.


Former-commit-id: 21b835c10b [formerly ff9dd063b9] [formerly b88d324aac] [formerly 21b835c10b [formerly ff9dd063b9] [formerly b88d324aac] [formerly 620fb06773 [formerly b88d324aac [formerly a29d3008676c2291c27ceed4e7aad10289a64569]]]]
Former-commit-id: 620fb06773
Former-commit-id: eb1e753dff [formerly 10af499f87] [formerly 43ba1fbf6a0c585906570bfbeac1fcd89f1ea393 [formerly 083ca82113]]
Former-commit-id: 6fd4741e79b2b0aa06d4558d3c527a5b96c6be7f [formerly 62fd3f947e]
Former-commit-id: d043d52eee
2013-08-08 17:45:58 -05:00
Lee Venable
90c1aec4ca Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: c314bf2092 [formerly ef5a7fb83a] [formerly 69dd7b66fa] [formerly c314bf2092 [formerly ef5a7fb83a] [formerly 69dd7b66fa] [formerly 69645f03dc [formerly 69dd7b66fa [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]]
Former-commit-id: 69645f03dc
Former-commit-id: b46745eebb [formerly 696ee07b3f] [formerly e115b93102485b11368b55772e8726745f744ad8 [formerly d9e82e20fd]]
Former-commit-id: eada16a20c494be474850c2dc84119382e3590d1 [formerly a0e0b81a81]
Former-commit-id: 33177a8711
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
231cedc656 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly dad0681ae0 [formerly 4711226b21 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]]
Former-commit-id: dad0681ae0
Former-commit-id: 1e64c5d491 [formerly b467d0fd66] [formerly 47e2f4c744287d8c0b4a9cc10d78ee81fa61534a [formerly d068b5d61f]]
Former-commit-id: 8a26fc85e651fdc70a339fe1b11109ae175e19ba [formerly 9be546dab8]
Former-commit-id: 21368ade28
2013-08-08 16:31:35 -05:00
Greg Armendariz
a118b8f70a Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: 154539a4fe [formerly 3cecb178cf] [formerly b08ce25ac8] [formerly 154539a4fe [formerly 3cecb178cf] [formerly b08ce25ac8] [formerly ffb2bea8ad [formerly b08ce25ac8 [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]]
Former-commit-id: ffb2bea8ad
Former-commit-id: d4840d3802 [formerly 24dc722be4] [formerly 86468f816c52e90d514c87d790110decf28213ac [formerly 566532c40d]]
Former-commit-id: 510970cf69f7524db648757a728ea8385ea55d47 [formerly 172bc300ca]
Former-commit-id: e51e51c625
2013-08-08 16:24:39 -05:00
Roger Ferrel
2f04e882a1 Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb

Former-commit-id: 33e860772d [formerly af8668a4c4] [formerly f167ec49cd] [formerly 33e860772d [formerly af8668a4c4] [formerly f167ec49cd] [formerly efed5777e9 [formerly f167ec49cd [formerly b49c3147991d87c32aba619521502438c11eb8f6]]]]
Former-commit-id: efed5777e9
Former-commit-id: e402e512c7 [formerly 2dc203ebdf] [formerly 02efe6e352bb2e5531596957581bbb2f825eb545 [formerly 96e6d1f7cc]]
Former-commit-id: 7fa49ce6d07a063864c9406805cfb284f0a053c9 [formerly 6a47c144c7]
Former-commit-id: f283f130ba
2013-08-08 16:15:34 -05:00
Greg Armendariz
b264a9d841 13.5.1-13 baseline
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]]
Former-commit-id: 5577e686c1
Former-commit-id: 076a0b08ac [formerly 9f2f62427b] [formerly 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]]
Former-commit-id: e2cd5730bab137f2b61daadd542fa1f16682d2c6 [formerly b66fcc40a5]
Former-commit-id: 0c61b62d24
2013-08-08 17:00:36 -04:00
Nate Jensen
8df28785b7 Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: 3b787e12df [formerly cce952c0bc] [formerly a919490d00] [formerly 3b787e12df [formerly cce952c0bc] [formerly a919490d00] [formerly a9f5465c99 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]]]
Former-commit-id: a9f5465c99
Former-commit-id: 5e3e8941ec [formerly 71a7b044ae] [formerly 30ae61555b26d85ada7506a3e461b768c8ce506c [formerly fe3adecbc2]]
Former-commit-id: 9c431ff615154e98cd93cec658459caab3db8cbd [formerly 440756a331]
Former-commit-id: 815087f84e
2013-08-08 14:46:52 -05:00
Greg Armendariz
d37c94464b 13.5.1-12 baseline
Former-commit-id: 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly fe51885ba7 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]]
Former-commit-id: fe51885ba7
Former-commit-id: 75d1e77f1b [formerly f777a744e5] [formerly cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262]]
Former-commit-id: c31f8384962ae36ae9a33ef84d46aea958522032 [formerly cbf9e42c21]
Former-commit-id: 244bc3ac37
2013-08-08 15:34:01 -04:00
Ron Anderson
1704fd60dc Merge "Issue #2027 upgrade version of derby" into development
Former-commit-id: 40af78db23 [formerly a85bfb298b] [formerly b43b05fced] [formerly 40af78db23 [formerly a85bfb298b] [formerly b43b05fced] [formerly 92741fe6dd [formerly b43b05fced [formerly d3867fbea055fa4b4fac77bc1524c2999db25c23]]]]
Former-commit-id: 92741fe6dd
Former-commit-id: 04f7c60a5f [formerly 6b3788382b] [formerly e19fa9210a5d5b214f8dcd6e1513c37b618ea6a5 [formerly 609a5c4a7c]]
Former-commit-id: 99dfdaa0d919bc72c91a9226767f55423eee3005 [formerly 15a3ac1082]
Former-commit-id: ac87ab52dc
2013-08-08 12:48:40 -05:00
Richard Peter
5c69d015eb Merge "Issue #2191 Addressing comments from previous change" into development
Former-commit-id: cf63f60a44 [formerly 2f6af1cf34] [formerly 95357f0b2c] [formerly cf63f60a44 [formerly 2f6af1cf34] [formerly 95357f0b2c] [formerly 40c4593896 [formerly 95357f0b2c [formerly 8a9557269526e7f8efd21a8c46d50f30fb9f7b6e]]]]
Former-commit-id: 40c4593896
Former-commit-id: b68ad082d2 [formerly a7ac9871bb] [formerly 75c5dc717c737dd1c66f1a0fc4de0deaebe2a03b [formerly 88768c369a]]
Former-commit-id: 7f214c00b3ac7878f0243b431c4a68d1f977e499 [formerly 72918d8f81]
Former-commit-id: 26601ba4b2
2013-08-08 09:58:18 -05:00
Benjamin Phillippe
783ff74ef3 Issue #2191 Addressing comments from previous change
Change-Id: Ib7e23bdfbecebe7141ef2d086d7b049530d11ce2

Former-commit-id: 00cb6b91da [formerly a7258dd8f6] [formerly 59a9aeabf0] [formerly 00cb6b91da [formerly a7258dd8f6] [formerly 59a9aeabf0] [formerly 3c7ad386ed [formerly 59a9aeabf0 [formerly c2d5beba2c9656d80851aee1a7beabe4807c14f6]]]]
Former-commit-id: 3c7ad386ed
Former-commit-id: f14971f554 [formerly 2c2ed655aa] [formerly 434e7062b12ec6246bd87fa9773f317f741ec433 [formerly dc2e0f6a7b]]
Former-commit-id: 23ffbac85fcf30a6f570f8b0177addb610f4ca63 [formerly 35ee48c73b]
Former-commit-id: 5700c52860
2013-08-08 09:56:35 -05:00
Richard Peter
afd5caa2d6 Merge "Issue #2077 Revise pixel size calculations. Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7" into development
Former-commit-id: 85e950e286 [formerly 88a9f32aab] [formerly e412320b39] [formerly 85e950e286 [formerly 88a9f32aab] [formerly e412320b39] [formerly f3ba33a84c [formerly e412320b39 [formerly ef55eddb22b9f50dc06496502e66ff170c603493]]]]
Former-commit-id: f3ba33a84c
Former-commit-id: c9e63f12ce [formerly 0b721ec758] [formerly 8cf8a793dfa267cd23180dc6915209e3881ba9d2 [formerly 22f9c92e4a]]
Former-commit-id: 3774f95add31745f7618b8a4f891858cc63653aa [formerly 191ba3bd98]
Former-commit-id: 78a0252dbd
2013-08-08 09:52:25 -05:00
David Gillingham
f5ed9fa3c6 Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: ec00fa0cf8 [formerly 6471edab78] [formerly 20e0f4b756] [formerly ec00fa0cf8 [formerly 6471edab78] [formerly 20e0f4b756] [formerly f839ef6f3b [formerly 20e0f4b756 [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]]]
Former-commit-id: f839ef6f3b
Former-commit-id: 3ec31afc5d [formerly 5f9352cb65] [formerly d665f9bc6ae29833ae4f277da48202baec858dd5 [formerly 616c023369]]
Former-commit-id: 18e571136ecc882716d7770817208f07ca118c73 [formerly 6b03403d65]
Former-commit-id: 651ed92403
2013-08-08 09:41:33 -05:00
Max Schenkelberg
1117e200ec Issue #2190 removed non-existent .so from meteolib build.properties
Change-Id: I40ff45473518215375ace9fbdcd9a8e416ddb438

Former-commit-id: e14aaef0e4 [formerly 48dd7a6ca7] [formerly f587206b84] [formerly e14aaef0e4 [formerly 48dd7a6ca7] [formerly f587206b84] [formerly 7ed0b6c5f8 [formerly f587206b84 [formerly 006ea8d18d40c8fb147e4970a1032f0f6efa3cfc]]]]
Former-commit-id: 7ed0b6c5f8
Former-commit-id: 89a9b608cb [formerly fbe0988682] [formerly 93c4c5a25448fbd11e50baf2f97f907e90a09659 [formerly 259f16578c]]
Former-commit-id: 7b05a8d682d9376d4f70a47a803b0b8c173a3619 [formerly 8157d99949]
Former-commit-id: 9edbaaf730
2013-08-08 09:15:05 -05:00
Ben Steffensmeier
24ec975f4b Issue #2077 Revise pixel size calculations.
Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7

Former-commit-id: fbb18fd8c0 [formerly 6e1c8c7208] [formerly 6c7d1d60a8] [formerly fbb18fd8c0 [formerly 6e1c8c7208] [formerly 6c7d1d60a8] [formerly 1bd7cc1097 [formerly 6c7d1d60a8 [formerly 99fa66319bfe07aa84276bd7f9f0817ed5868798]]]]
Former-commit-id: 1bd7cc1097
Former-commit-id: 0e1624674e [formerly ffe256a0eb] [formerly 07461a37261a2ba11cc43808c8bbec41bdc88ca8 [formerly 3071e53e45]]
Former-commit-id: 93580a81f12f05ab330768578ccb1b27af7ad60d [formerly 65e33fdae5]
Former-commit-id: 7762410fa0
2013-08-07 18:40:28 -05:00
Ben Steffensmeier
700a64106c Issue #2235 Fix the build, hopefully.
Change-Id: I09466023c4d15921bc9b86e2d6f0958c1ff83539

Former-commit-id: 49e1e56ec5 [formerly 49a2b27ab1] [formerly 95c4e2d65d] [formerly 49e1e56ec5 [formerly 49a2b27ab1] [formerly 95c4e2d65d] [formerly 4b705b1436 [formerly 95c4e2d65d [formerly 1545f57a99f47bd8dabb70235914bdaa14025b00]]]]
Former-commit-id: 4b705b1436
Former-commit-id: 4093a51085 [formerly 1de459b743] [formerly 2a94c93ceb85f295c20443cee1806295f3b7e104 [formerly cdddcac87b]]
Former-commit-id: 6fbce6893e721e8ef8186f8a00946a6f719a08a2 [formerly 2877836f4d]
Former-commit-id: 2056116c16
2013-08-07 17:15:06 -05:00
Nate Jensen
5d607d3cbf Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: 0aab8a628a [formerly 8968389383] [formerly ec01e6e872] [formerly 0aab8a628a [formerly 8968389383] [formerly ec01e6e872] [formerly be9315642b [formerly ec01e6e872 [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]]]
Former-commit-id: be9315642b
Former-commit-id: de5ac0756a [formerly 8cca3c32ac] [formerly 71058eb3f64680175103324660052217c65f2678 [formerly b0f3d536e4]]
Former-commit-id: b4837d2813879922805a2c09fd2460bdd91130d5 [formerly 9d4e00d5d1]
Former-commit-id: d6cbe9b4f5
2013-08-07 16:44:30 -05:00
Greg Armendariz
1a04182d44 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]]
Former-commit-id: 6b1989cb29
Former-commit-id: 65b70ce223 [formerly fc6195bbf6] [formerly 515c934b42be211ce5f92cab2acdd2eb519d3d9f [formerly c46f04dd72]]
Former-commit-id: a084eb93b668c3922297767a4872577df1c23840 [formerly 9a1b44efdc]
Former-commit-id: 4b29a16298
2013-08-07 14:46:30 -05:00
Greg Armendariz
58c11ec2ce Merge "Issue #2190 attempt to fix build" into development
Former-commit-id: cbd270b486 [formerly 430dd1bb43] [formerly 614a9a5ca0] [formerly cbd270b486 [formerly 430dd1bb43] [formerly 614a9a5ca0] [formerly c588a5ce7e [formerly 614a9a5ca0 [formerly 3cf79c8f9e9391b4bac3d6dba05570eb9a1cedfc]]]]
Former-commit-id: c588a5ce7e
Former-commit-id: 434c5fe208 [formerly 85b41d68d1] [formerly 83f5a45605cf9e00f0e0b71e61536e678ce5fb8b [formerly 8c8439446a]]
Former-commit-id: 17ec42475f76e1acec284c8e37eee13fe1321856 [formerly 7c87d81235]
Former-commit-id: 69c581a199
2013-08-07 14:41:37 -05:00
Nate Jensen
2f75cd2429 Issue #2190 attempt to fix build
Change-Id: I733289250b318c81134bacb676837b36b67fb6c6

Former-commit-id: 6cade095f9 [formerly 88cefe228a] [formerly f56bb10cb2] [formerly 6cade095f9 [formerly 88cefe228a] [formerly f56bb10cb2] [formerly d1e2274f46 [formerly f56bb10cb2 [formerly 9e6ca01815f880282ec87fdce72d108131039f2e]]]]
Former-commit-id: d1e2274f46
Former-commit-id: ae9d10af53 [formerly 2ceeb152ba] [formerly ebf4b1c6040bb679265b692cf1876a32c85b647d [formerly 8478d68a56]]
Former-commit-id: 0ff1f4f65e1e704ce672a38cf6ddbd3e72dd42a4 [formerly c69abb1d90]
Former-commit-id: 37ce13f591
2013-08-07 14:15:50 -05:00
Ron Anderson
80dd123de8 Merge "Issue #2235 Added Caching version of TopoQuery. Change-Id: I0e17028921faa40e85134c79074655900bd8358c" into development
Former-commit-id: 17ed074c5e [formerly 896b5333d1] [formerly 216b2a5c86] [formerly 17ed074c5e [formerly 896b5333d1] [formerly 216b2a5c86] [formerly 0a9068e6d3 [formerly 216b2a5c86 [formerly 4e9a02fcd4931d2a26b10b3e695a7fa99d1ef972]]]]
Former-commit-id: 0a9068e6d3
Former-commit-id: 441702e186 [formerly 44c10c798d] [formerly 72056a95440f5bfa6c34f417686f4cf38ac5b799 [formerly fcb78e78d3]]
Former-commit-id: a8dc90f1f49e2f344423d55c2c7a0344d1759878 [formerly f8ad742697]
Former-commit-id: ec60977418
2013-08-07 14:05:36 -05:00
Greg Armendariz
7fb928e967 13.5.1-11 baseline
Former-commit-id: 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 4ec04083bd [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 4c20fc4977 [formerly 75f9f8df3f] [formerly f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb]]
Former-commit-id: 4b97c9297a6132e1a64e7b28e4204a8cd32cdd79 [formerly f06ee47260]
Former-commit-id: 8bf2c1cc07
2013-08-07 14:34:27 -04:00
Greg Armendariz
0bb16ced54 13.5.1-10 baseline
Former-commit-id: 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly acf7ced37b [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]]
Former-commit-id: acf7ced37b
Former-commit-id: 690ea2e228 [formerly 9ddb32967c] [formerly 55e2845c864335ebeda69be5a21e4f9deaffd22e [formerly 05282eac88]]
Former-commit-id: f92c8134fca60f550bc93797091c6154015f9683 [formerly f37ef8c24e]
Former-commit-id: 5998f47f57
2013-08-07 14:14:46 -04:00
Nate Jensen
a622ae7987 Issue #1561 more efficient query of GFE files
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9

Former-commit-id: 86d32ce3e0 [formerly 04e78d5a64] [formerly cdfea29b16] [formerly 86d32ce3e0 [formerly 04e78d5a64] [formerly cdfea29b16] [formerly 5c7dc36583 [formerly cdfea29b16 [formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]]]
Former-commit-id: 5c7dc36583
Former-commit-id: 071380df2d [formerly e99fd427ec] [formerly c8ded44555418c15296b5bf17e62b4980ac6d12e [formerly d520081243]]
Former-commit-id: 07b9fe4aeb28740ffd1e7dc10cbe59d3487236df [formerly f8bd55d407]
Former-commit-id: 527da593d3
2013-08-07 13:12:48 -05:00
Ben Steffensmeier
a6a4075f13 Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: 42c551bb7a [formerly 74a5f09cd1] [formerly f0ceddacf1] [formerly 42c551bb7a [formerly 74a5f09cd1] [formerly f0ceddacf1] [formerly b06171b4f2 [formerly f0ceddacf1 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]]]
Former-commit-id: b06171b4f2
Former-commit-id: 6d60a18a2d [formerly 7de39a58bb] [formerly 638ab88007fb4ccfc259d1c8e3cfadd1bdb30ab1 [formerly 3eb869c65e]]
Former-commit-id: caeba084d0723bb0ee2b76813919bcea8b28e44d [formerly 7e3835fd0a]
Former-commit-id: 7a95a653aa
2013-08-07 12:08:13 -05:00
Ben Steffensmeier
ab72e2c8e6 Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c

Former-commit-id: fb3a11161a [formerly f9cd8457bc] [formerly 2ecba23bb9] [formerly fb3a11161a [formerly f9cd8457bc] [formerly 2ecba23bb9] [formerly 2a51ddd697 [formerly 2ecba23bb9 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]]]
Former-commit-id: 2a51ddd697
Former-commit-id: 4a92feba62 [formerly 794d41a8f7] [formerly 77c845fde31945d0fea149cfd3d18a9817475c57 [formerly 15ddd45995]]
Former-commit-id: e71b70c57b2cf0a04f5c2c818aac7f6dfc5e753c [formerly 16c0832b4f]
Former-commit-id: 7a597c7223
2013-08-06 18:27:21 -05:00
Nate Jensen
6747586438 Issue #2210 moved base cave_static colormaps to common_static and updated code
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 6d7d504f20 [formerly 960dc1e81e] [formerly a1a9a4751a] [formerly 6d7d504f20 [formerly 960dc1e81e] [formerly a1a9a4751a] [formerly 27dd27a73f [formerly a1a9a4751a [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]]
Former-commit-id: 27dd27a73f
Former-commit-id: 9c6c35e033 [formerly 04d55ac1c0] [formerly 5da0c0771f6b8cf3997cc0c8fb770658e04f2445 [formerly 15006517a2]]
Former-commit-id: 77dc1df5e9af04c402774c681981e485f8b8553d [formerly 22861240c8]
Former-commit-id: 077c619bbf
2013-08-06 17:17:53 -05:00
Richard Peter
b6d6d657ea Merge "Issue #2142 fix logback ingest config" into development
Former-commit-id: 47ccb5664c [formerly 91bef56489] [formerly a229fd3abb] [formerly 47ccb5664c [formerly 91bef56489] [formerly a229fd3abb] [formerly 883f450f28 [formerly a229fd3abb [formerly 3deb3b03c2ab71ce00b1bf465bae6139e462c39e]]]]
Former-commit-id: 883f450f28
Former-commit-id: 2d6d983e5e [formerly 52d44a496e] [formerly eb0599c9a3d5d84873578ef41866b54b2ea192d9 [formerly d75818c241]]
Former-commit-id: f895e42499162591fe33aa1b9ce6eaa61058626d [formerly d8ef36a6f3]
Former-commit-id: ca511021e3
2013-08-06 14:23:41 -05:00
Nate Jensen
ac58932a72 Issue #2142 fix logback ingest config
Change-Id: I7b50e76bea11eff68cc29930faa1cd1443558a70

Former-commit-id: 3cbbe0c45e [formerly 7aecba7abe] [formerly f756c0039a] [formerly 3cbbe0c45e [formerly 7aecba7abe] [formerly f756c0039a] [formerly ac3071cc0a [formerly f756c0039a [formerly f191176549581689ac20b62a2033c19264aaa8df]]]]
Former-commit-id: ac3071cc0a
Former-commit-id: d9c89f8bb9 [formerly 83e9df5281] [formerly d9c941a6af8ad27f53271c1a2f0680929ecfdfec [formerly b50304a16f]]
Former-commit-id: d89b1ab776c8fdf0b5b52eb5b522212e6471aa0f [formerly 97cf1bb5bb]
Former-commit-id: fc6a343ba5
2013-08-06 14:22:15 -05:00
Richard Peter
ef69ec1b94 Merge "Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup" into development
Former-commit-id: 4158d57607 [formerly d6ac029070] [formerly 6eb59502f8] [formerly 4158d57607 [formerly d6ac029070] [formerly 6eb59502f8] [formerly a91d535a99 [formerly 6eb59502f8 [formerly 14e07542613348b91e60baa914cdffe1b936d9d7]]]]
Former-commit-id: a91d535a99
Former-commit-id: 0a5d8013e1 [formerly 3e07f1af5a] [formerly 41f990e3501baf98e41534e615878951c611f1dd [formerly 6fb0e514f5]]
Former-commit-id: dc31874526e32c99c6ac7a3e4754326a63dfb0cd [formerly a082f83204]
Former-commit-id: 85b333758b
2013-08-06 14:21:53 -05:00
Nate Jensen
e5b50e9c0b Merge "Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage" into development
Former-commit-id: 746a96fd40 [formerly fb6b9a8b42] [formerly 0bf9eed643] [formerly 746a96fd40 [formerly fb6b9a8b42] [formerly 0bf9eed643] [formerly e7949c04ad [formerly 0bf9eed643 [formerly 311a4e792edd9c1a83fe2debfee1a00e43f12807]]]]
Former-commit-id: e7949c04ad
Former-commit-id: 4fe731ccdb [formerly a321310dd8] [formerly ff0fd5a9b04f0b8a202951409f834a7e581a8e3e [formerly 2bd358ff19]]
Former-commit-id: bcab5ba27caaadf0ca232a80e42f7fbc2e7c1aa1 [formerly 5c3310851b]
Former-commit-id: 94d44a672a
2013-08-06 14:14:27 -05:00
Richard Peter
75d0a7d7f8 Merge "Issue #2221 - Changes to have select configuration files for retention and case creation." into development
Former-commit-id: d6daa8baf3 [formerly 87ecd93a4b] [formerly d6041529db] [formerly d6daa8baf3 [formerly 87ecd93a4b] [formerly d6041529db] [formerly 301556213a [formerly d6041529db [formerly 99422acbda91c8f499af9c4ae57b136a1469fdfa]]]]
Former-commit-id: 301556213a
Former-commit-id: fda76ba0ee [formerly 9909443fdb] [formerly 1593a636ef6ed60894e574a47d06015f69c4d8a7 [formerly 5349f48a34]]
Former-commit-id: 6a96b3e9ef5e26f76fb3d46b23f816e28d1e7e03 [formerly cb58571e5f]
Former-commit-id: 3e7e16a995
2013-08-06 12:46:32 -05:00
Max Schenkelberg
17c77a8cdc Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage
Amend: Added jgerth comment history back in

Change-Id: I08733fcf46f9bdcded1f609bcdd26459652edaef

Former-commit-id: 9d590ce7f9 [formerly 7f4b63283d] [formerly dda69d36b7] [formerly 9d590ce7f9 [formerly 7f4b63283d] [formerly dda69d36b7] [formerly a18686135c [formerly dda69d36b7 [formerly 2e52921b21ecaeaa11be8277e264446686d65338]]]]
Former-commit-id: a18686135c
Former-commit-id: b5b121032d [formerly 23b6e68e14] [formerly 627430677d858453f22a1a0fc99838be1d3e97bc [formerly 75ae62fd9a]]
Former-commit-id: 9c925a779c5403a930ff676af34fb0919f7d79fd [formerly 3d5f35d792]
Former-commit-id: a691c86dc0
2013-08-06 12:37:52 -05:00
Nate Jensen
fcd5669325 Issue #2142 fix logback config
Change-Id: I6e708cb251f6e4564ede0ba90f2cd906eb16a998

Former-commit-id: 2c4734ce54 [formerly ef55df925d] [formerly 05eba98d50] [formerly 2c4734ce54 [formerly ef55df925d] [formerly 05eba98d50] [formerly 148153eddf [formerly 05eba98d50 [formerly a200e86f382e532c1b60c907b4a0b00d80688917]]]]
Former-commit-id: 148153eddf
Former-commit-id: 38bba7e251 [formerly 119368aec0] [formerly 80b6539a62386b3c8373852e2c99db585c1158d0 [formerly b04d075d18]]
Former-commit-id: cb8b9fe1a9021c3fc7500096a04a7214dac2442c [formerly bcb21350cf]
Former-commit-id: c5c37c9646
2013-08-06 11:39:34 -05:00
Benjamin Phillippe
77555b3be3 Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup
Change-Id: I0f4eafb3fa68f2d1eeade4f047c95d714502cf56

Former-commit-id: 065a80e21f [formerly 01466d0624] [formerly 73fd5ac852] [formerly 065a80e21f [formerly 01466d0624] [formerly 73fd5ac852] [formerly 5bd0d92363 [formerly 73fd5ac852 [formerly 2aa7bdc1a8a942eaa0589527e8987b6fc518479f]]]]
Former-commit-id: 5bd0d92363
Former-commit-id: a3b8e6ff24 [formerly 972d02114c] [formerly 797d497319dc73d802f575a9b6766863f551e648 [formerly 33f601b72e]]
Former-commit-id: ce480842c7a3a86dbe46e1d77d9978edd21f2a03 [formerly ce5cb744d8]
Former-commit-id: 70887ec713
2013-08-06 11:13:01 -05:00
Richard Peter
193b8d66de Merge "Issue #2228 use TMemoryInputTransport for slight efficiency improvement" into development
Former-commit-id: 329f6f394a [formerly fd739709d5] [formerly 7a1c02eac8] [formerly 329f6f394a [formerly fd739709d5] [formerly 7a1c02eac8] [formerly a6cccde03f [formerly 7a1c02eac8 [formerly 1fe04ca5037355f11d0deab7ebcc27b84e0a337b]]]]
Former-commit-id: a6cccde03f
Former-commit-id: e95db3f09a [formerly 4d11d1bed2] [formerly 31af48dbbdefe0626257ed97c479cdeb27b4b7ec [formerly fdcb9d2070]]
Former-commit-id: d5fbac6b603eb30685c620ca93a5378bf23d6e8d [formerly 6cf41de9f8]
Former-commit-id: c64797d099
2013-08-06 10:09:50 -05:00
Nate Jensen
c244f64b4a Merge "Issue #1726 change how swt is imported to tests" into development
Former-commit-id: c11be94cfd [formerly fe50df0d72] [formerly 35ec9bb413] [formerly c11be94cfd [formerly fe50df0d72] [formerly 35ec9bb413] [formerly 730f0d7f78 [formerly 35ec9bb413 [formerly 47f5fbe957aedbf7edbc9b45fd9774fb73fa1c9f]]]]
Former-commit-id: 730f0d7f78
Former-commit-id: 3f73444553 [formerly a23cc7344c] [formerly acad7c9e1eacf5c90be04cbb70e05399abf71dd9 [formerly 6f61e57845]]
Former-commit-id: 5a64b0aad518b9fa21a51030f8e3816af717f819 [formerly 884506cd70]
Former-commit-id: 88fb4ae098
2013-08-06 09:57:44 -05:00
Nate Jensen
15684e79a0 Issue #2228 use TMemoryInputTransport for slight efficiency improvement
Change-Id: I280dacdd48f5e092b312a80916db6202a1138ebf

Former-commit-id: 4285a532f2 [formerly 963119e0f3] [formerly d4590cbf5e] [formerly 4285a532f2 [formerly 963119e0f3] [formerly d4590cbf5e] [formerly 842f15ae12 [formerly d4590cbf5e [formerly 3f3afa1fe36da04ce47b9af1e8bd34746b75e68f]]]]
Former-commit-id: 842f15ae12
Former-commit-id: 3d38129cff [formerly 584a17828a] [formerly 7f5e7fbcbc7f70e4221c8002d8b026234f9f46b9 [formerly 7d17d965a3]]
Former-commit-id: 7dd2a02508e2776b9a76cff29cd1c400c61f07d0 [formerly 0abec57d0d]
Former-commit-id: 6585abee8e
2013-08-06 09:52:02 -05:00
Matt Nash
2d037e9de3 Issue #1726 change how swt is imported to tests
Change-Id: I72ad8b22c0f55eded1548dc664a6c8fe05ff11cc

Former-commit-id: a1e4191255 [formerly bf0fc07a89] [formerly 0e0504f9fe] [formerly a1e4191255 [formerly bf0fc07a89] [formerly 0e0504f9fe] [formerly 1e42d0b7a6 [formerly 0e0504f9fe [formerly 78606bdbbde14383b3b12e4d72772dc6a8d1a21b]]]]
Former-commit-id: 1e42d0b7a6
Former-commit-id: ff2e86df26 [formerly b1204865d2] [formerly 684cf762a7afeaa8e71ec291e6969f267747f4ae [formerly 80064a389f]]
Former-commit-id: be34f4933005cac89687172fff711541a143b109 [formerly 773393483a]
Former-commit-id: 3f9f14d4c4
2013-08-06 09:44:47 -05:00
Lee Venable
1fd7078aaa Merge "Issue #2143. Changes for non-blocking SCAN dialogs." into development
Former-commit-id: c0e389a4c4 [formerly 89e05a8de1] [formerly a2ae8fe5de] [formerly c0e389a4c4 [formerly 89e05a8de1] [formerly a2ae8fe5de] [formerly 2a74881571 [formerly a2ae8fe5de [formerly 8a893db2a506ade83e6cd22355893138c32cdfea]]]]
Former-commit-id: 2a74881571
Former-commit-id: 132a348b01 [formerly 3e098ce4f4] [formerly 4bb4be0c1640a38f3302cc6d5c848ed37cf6cfd9 [formerly 8f0fa192bb]]
Former-commit-id: bc0b8d458ee282ff72ce9cfb22b7bcc8468b718e [formerly f1b42ae10e]
Former-commit-id: 18dad40473
2013-08-06 09:32:21 -05:00
Nate Jensen
5bd7d9926a Merge "Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source." into development
Former-commit-id: 279472e0d7 [formerly 2319a713ce] [formerly fcb6f59a3f] [formerly 279472e0d7 [formerly 2319a713ce] [formerly fcb6f59a3f] [formerly 28ffe0f3f1 [formerly fcb6f59a3f [formerly 48e80dd9732e0b20f211fa456c8bec81b4495555]]]]
Former-commit-id: 28ffe0f3f1
Former-commit-id: 8c28596209 [formerly 5c078cd52b] [formerly 7511beab68aac9774e97faec81dcd3682d5dae36 [formerly 51ce39012d]]
Former-commit-id: 9132fdaf34e247be09d7ca7d9dd3afc8cbcd89e9 [formerly 7a045f1d12]
Former-commit-id: 8727d5190c
2013-08-06 08:35:50 -05:00
Max Schenkelberg
dcd752ef2a Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source.
Amend: Fixed println, added uncustomization of displays to interface, fixed font issue
Amend: Fixed comments and switched to TimeUtil for common constants for time

Change-Id: I92b49a59848ee4a8f61205ab21f5de2e0c260525

Former-commit-id: 7d88c2a719 [formerly 54fe14b06b] [formerly 474429aaee] [formerly 7d88c2a719 [formerly 54fe14b06b] [formerly 474429aaee] [formerly f08e2d5edc [formerly 474429aaee [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]]]
Former-commit-id: f08e2d5edc
Former-commit-id: ebafa449b2 [formerly 541c66a894] [formerly 2a67c02053abdfe27ab400dab9e694161c2fd5f6 [formerly fc60d55637]]
Former-commit-id: da853a3c36419f097b12fdd31666ec8568fe8198 [formerly 71ee818ed0]
Former-commit-id: 424f455607
2013-08-05 16:46:02 -05:00
Roger Ferrel
6440382fb1 Issue #2221 - Changes to have select configuration files for retention and case creation.
Change-Id: Ia24898f04c3a2a626ea0aeb04c2c302e406afa1f

Former-commit-id: 1b1f1e5fcd [formerly 7ec3980efb] [formerly 19d23ae929] [formerly 1b1f1e5fcd [formerly 7ec3980efb] [formerly 19d23ae929] [formerly b3f9ea79af [formerly 19d23ae929 [formerly 30f55459d26e3d1118610959e98e475ede0e9f47]]]]
Former-commit-id: b3f9ea79af
Former-commit-id: 7762c691f4 [formerly 1989010d06] [formerly dc9bcea79d50c494391552aab4788f40fc1d371c [formerly 2be8799f51]]
Former-commit-id: 1b09fd97c6b1243280d201160cdb152ccfbe869a [formerly 4a8ece9a15]
Former-commit-id: 7a264801f1
2013-08-05 16:20:46 -05:00
Richard Peter
5dcee45780 Merge "Issue #2220 Removed synchronized from most methods." into development
Former-commit-id: 89894b6f7d [formerly e0194aa022] [formerly d79c7c1b84] [formerly 89894b6f7d [formerly e0194aa022] [formerly d79c7c1b84] [formerly 084d39c6f3 [formerly d79c7c1b84 [formerly 5d93f17fc5fcb0cd98e5b4bf3681fc9bc244b993]]]]
Former-commit-id: 084d39c6f3
Former-commit-id: 858be1c9ac [formerly 05aac96abd] [formerly 7c8d8d740241500fd1596cf042c785f1d1a49abd [formerly b23a59a114]]
Former-commit-id: 4412bf954ff7b36ab4fa1cfedac405fd03980738 [formerly 8eada4e873]
Former-commit-id: 06eff13f05
2013-08-05 14:27:33 -05:00
Nate Jensen
c2477c82ff Merge "Issue #1726 change how swt is imported to tests, uncomment some tests that now work again" into development
Former-commit-id: 157edfcb76 [formerly 724db0f3ef] [formerly e1ef074936] [formerly 157edfcb76 [formerly 724db0f3ef] [formerly e1ef074936] [formerly d74a7639ba [formerly e1ef074936 [formerly c1b8ad9acaa8a5f5397c833a9edb5db23eaa5981]]]]
Former-commit-id: d74a7639ba
Former-commit-id: a0880acbcc [formerly 510b70744d] [formerly c5d4a8d0d894566ff80f64cd36737646d58888ff [formerly eb0ccfe92f]]
Former-commit-id: 98339e12518dbc6d619d1e6261a99c6ef9eadf74 [formerly 1fd6ef2d86]
Former-commit-id: ee0f192d96
2013-08-05 12:45:29 -05:00
Matt Nash
c32c51237d Issue #1726 change how swt is imported to tests, uncomment some tests that now work again
Change-Id: Ib671f3240660368631483713e9619c836599fec4

Former-commit-id: 472b1bf04f [formerly 14c32d882c] [formerly ca8fcf84e5] [formerly 472b1bf04f [formerly 14c32d882c] [formerly ca8fcf84e5] [formerly ba5cacb5e5 [formerly ca8fcf84e5 [formerly a69fe2bc71ea77e941c9e20bfbc01d9c74ba94c7]]]]
Former-commit-id: ba5cacb5e5
Former-commit-id: c7e2a458d6 [formerly 33d37db782] [formerly 3efe4a784168aeb58039f98d462587155a4eb17e [formerly 09b2a2a8a6]]
Former-commit-id: e08605001fec21916582c08aaff9c1572c0ef3b3 [formerly bcb76fba53]
Former-commit-id: 7d048be8e2
2013-08-05 12:13:15 -05:00
Nate Jensen
5167b8c85c Merge "Issue #2202 Add edex specific connectivity checking. Change-Id: I003957001ed608d1054ab2a87019b018f8996d36" into development
Former-commit-id: b06d7f1843 [formerly a28827953e] [formerly b7e69cfcd5] [formerly b06d7f1843 [formerly a28827953e] [formerly b7e69cfcd5] [formerly 21b0a2b103 [formerly b7e69cfcd5 [formerly 1c314409369402473812c954821e0d47a4e05183]]]]
Former-commit-id: 21b0a2b103
Former-commit-id: de1403cea2 [formerly 08e3b40e4b] [formerly 5de7cc16231ad7eca899859678048265f064b215 [formerly 159e35d87e]]
Former-commit-id: 52fe98237d259b4d92fed1b264a8f18b6845a369 [formerly 790a50ec95]
Former-commit-id: a4d56766bf
2013-08-05 11:38:02 -05:00
Ben Steffensmeier
411c2b5b17 Issue #2202 Add edex specific connectivity checking.
Change-Id: I003957001ed608d1054ab2a87019b018f8996d36

Former-commit-id: 8eb1bf8c88 [formerly 54321b4839] [formerly cfd9cb0b7d] [formerly 8eb1bf8c88 [formerly 54321b4839] [formerly cfd9cb0b7d] [formerly fac4cdc131 [formerly cfd9cb0b7d [formerly b8e5323b70db03817c6c750746f29cc550cbc815]]]]
Former-commit-id: fac4cdc131
Former-commit-id: 0b22fe9da3 [formerly b7e7e69acd] [formerly a127f5eb4b93131c2c55736067e9343cd59ea445 [formerly 66ce1a9c68]]
Former-commit-id: 202c41a4257e94127e748af48148d0d9a987e879 [formerly 977e135e17]
Former-commit-id: 7028e9f71f
2013-08-05 11:17:23 -05:00
Richard Peter
3c4ae9d17e Merge "Issue #2057 Added support for marking obsolete databases for later removal." into development
Former-commit-id: 0bad46b054 [formerly c43cdaeb76] [formerly af826f283b] [formerly 0bad46b054 [formerly c43cdaeb76] [formerly af826f283b] [formerly f964cc3e65 [formerly af826f283b [formerly 5e67c228fea2f719bfb0561132701097bf785a80]]]]
Former-commit-id: f964cc3e65
Former-commit-id: 8b342df320 [formerly 0d69b079ee] [formerly 04faa56f3d06a21a1153f3ddf213d4a2e546ce64 [formerly 9a6015efcb]]
Former-commit-id: f74a204639a22dc90a7bc364f92c6417a810c6ea [formerly c3fd34895c]
Former-commit-id: 4bd15f7789
2013-08-05 09:51:14 -05:00