Commit graph

3536 commits

Author SHA1 Message Date
Richard Peter
dda77cc9e4 Merge "Issue #2224 Changes to have DataSet in configuration." into development
Former-commit-id: 201004e203 [formerly 5548ae76b1] [formerly d8124958b5] [formerly 201004e203 [formerly 5548ae76b1] [formerly d8124958b5] [formerly 2de533cbbf [formerly d8124958b5 [formerly d4a46b8283ac0cb47f62c43b999d7f119161e08d]]]]
Former-commit-id: 2de533cbbf
Former-commit-id: 6dd74d080f [formerly e9651a43ed] [formerly 36f4d2af4006b315ff6170d430184188400680b2 [formerly 4605595354]]
Former-commit-id: 7b7126e4a52616c3c982eea2f26e9664b76e7c1b [formerly 96336e3fa3]
Former-commit-id: 35dec4295c
2013-08-12 15:01:51 -05:00
Nate Jensen
f349600446 Merge "Issue #2142 remove some uf.common dependencies on edex.common" into development
Former-commit-id: 04d2a4741d [formerly 1473d04e25] [formerly 82472058e9] [formerly 04d2a4741d [formerly 1473d04e25] [formerly 82472058e9] [formerly de38280317 [formerly 82472058e9 [formerly 9e3b68a2e0ed6dcc63c5d2cace84c0fa3cadb521]]]]
Former-commit-id: de38280317
Former-commit-id: 5d26df965e [formerly 65c7c9e9b3] [formerly fbcdcf125155de037dae9b094e3b3d3c7c63fb4c [formerly f6c4ec164f]]
Former-commit-id: 705ac5bcd11eac9567339f2706f155daa3fff4cd [formerly 5b096c5524]
Former-commit-id: a80ab51f46
2013-08-12 14:16:29 -05:00
Ben Steffensmeier
cdcd9bdd10 Issue #2245 make DataTimeCompatible Java 6 compatible.
Former-commit-id: 62961949ba [formerly 00f61c4858] [formerly 67c84f2fb8] [formerly 62961949ba [formerly 00f61c4858] [formerly 67c84f2fb8] [formerly 46c3413805 [formerly 67c84f2fb8 [formerly e32655d3daef131c451d972c7b2747b01e49d840]]]]
Former-commit-id: 46c3413805
Former-commit-id: f80b7d3112 [formerly 16dd725cc1] [formerly 8897a82fdb7c4ccf99db2fe277299859be6243af [formerly 64b1d5d9dd]]
Former-commit-id: f2ca707dd86aa8999cff7c997ec48dba8cd6c9b9 [formerly bf58a91f2d]
Former-commit-id: 0ab1fb6e3c
2013-08-12 13:43:43 -05:00
Roger Ferrel
7678e266b8 Issue #2224 Changes to have DataSet in configuration.
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8

Former-commit-id: 09360f30c5 [formerly 705a3482f8] [formerly 1863d4d65b] [formerly 09360f30c5 [formerly 705a3482f8] [formerly 1863d4d65b] [formerly 3ecf95b18a [formerly 1863d4d65b [formerly de48fa389414c87ba557b70a480ce6b45144f4aa]]]]
Former-commit-id: 3ecf95b18a
Former-commit-id: 3ff13b5a3a [formerly 8884343d89] [formerly d6bebdca540bfacd287d4ffd9f21c25794c91d4f [formerly 3d9be94e7e]]
Former-commit-id: 51ddb755a5783a79e40ea7bc4708a317725db50b [formerly e51bf3559c]
Former-commit-id: 9dd8173991
2013-08-12 12:50:12 -05:00
Nate Jensen
8d9aeceb45 Issue #2142 remove some uf.common dependencies on edex.common
Change-Id: I327d9c6a184c2a9b422c02a39a2268459775a887

Former-commit-id: 525666a23f [formerly 2f641b40d7] [formerly 94096b8f65] [formerly 525666a23f [formerly 2f641b40d7] [formerly 94096b8f65] [formerly 48758e64ef [formerly 94096b8f65 [formerly c0c65319cd731aea51f730f700b0fda3c6992d38]]]]
Former-commit-id: 48758e64ef
Former-commit-id: f3618a3bca [formerly f69d155d26] [formerly 7f46154e70296dfe6b057533331f4761d699edc2 [formerly ce0c8f3259]]
Former-commit-id: 9537addcd08e6d8d2c723dbbf79e893f985eec4a [formerly 4bb302cd5c]
Former-commit-id: 4ee212306e
2013-08-12 12:47:51 -05:00
Greg Armendariz
aaab00ce8b Merge "Issue #2254 - Fix the nightly automated junit tests" into development
Former-commit-id: 8ac14d0f1b [formerly 773a7a4903] [formerly 1386598257] [formerly 8ac14d0f1b [formerly 773a7a4903] [formerly 1386598257] [formerly 594198b5a5 [formerly 1386598257 [formerly 347fe4615e9902892a95f13d13cfd8c0bcd7c39d]]]]
Former-commit-id: 594198b5a5
Former-commit-id: 98f05beab6 [formerly 20cffb4cad] [formerly a35a78e5eda85ce674a232de597ca6fd183a8a1f [formerly 3c0c7ee56b]]
Former-commit-id: f75a50c2b9aeaade8dc34ae40207901a69c637dd [formerly 84e38e55c7]
Former-commit-id: 792f31fbce
2013-08-12 12:25:17 -05:00
David Gillingham
1134f407f6 Issue #2162: Add performance logging for GFE edit area query evaluation.
Change-Id: I916750fd00549dc53b1dd645792c04f4f63aa338

Former-commit-id: 11384d2198 [formerly ed39a866f0] [formerly 07312fe01f] [formerly 11384d2198 [formerly ed39a866f0] [formerly 07312fe01f] [formerly 98f48e5a64 [formerly 07312fe01f [formerly 7d24f69078e324c56db448f293d3094df83f5c34]]]]
Former-commit-id: 98f48e5a64
Former-commit-id: ef8d1ab050 [formerly ffa45d26d9] [formerly 0527b1c234a834d22bfd7b3815bbcd2f2a5ee8ef [formerly 0b8a48b12e]]
Former-commit-id: 23d77b644b9e924392294d072039d0266bf858c7 [formerly 235df668a6]
Former-commit-id: 98fdc5d1a1
2013-08-12 12:18:02 -05:00
Nate Jensen
30b8856941 Merge "Issue #2245 Make all DataTime comparisons consistent. Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d" into development
Former-commit-id: d4dbb8fe98 [formerly 81510bc3b7] [formerly 9f0698fe75] [formerly d4dbb8fe98 [formerly 81510bc3b7] [formerly 9f0698fe75] [formerly c5b96690ce [formerly 9f0698fe75 [formerly 971df482819466e48efcbc3a1b01eab88687436a]]]]
Former-commit-id: c5b96690ce
Former-commit-id: b886cddc80 [formerly 0261071228] [formerly a8203aeffc85324d517d20a945883c7a079b265e [formerly b18fa88aaf]]
Former-commit-id: ce4493bc39d39b4651d356d7dccccd406b437835 [formerly 1afec6d94d]
Former-commit-id: 2ba81e806a
2013-08-12 12:06:53 -05:00
Ben Steffensmeier
e8923fc949 Issue #2245 Make all DataTime comparisons consistent.
Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d

Former-commit-id: e39f55eeb7 [formerly 7e65ad5fe8] [formerly 479f72bc10] [formerly e39f55eeb7 [formerly 7e65ad5fe8] [formerly 479f72bc10] [formerly 9901e7a622 [formerly 479f72bc10 [formerly b175ec81e61f18b42432e0245cddb953fbc5963f]]]]
Former-commit-id: 9901e7a622
Former-commit-id: 4376d4c066 [formerly 98dab7a5bd] [formerly 9bb59859513212d7b568900c9fea7ec4afdb0e0a [formerly 5071cf2fce]]
Former-commit-id: 21724cc18fe4234e4dfd9b24a7136c0658599635 [formerly 2c2b4c6c41]
Former-commit-id: 23e244e520
2013-08-12 11:37:51 -05:00
Greg Armendariz
8c073c655e Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into development
Former-commit-id: 949e3974ef [formerly ab41d0cdb6] [formerly 5ea53e1c0f] [formerly 949e3974ef [formerly ab41d0cdb6] [formerly 5ea53e1c0f] [formerly 487b751143 [formerly 5ea53e1c0f [formerly a978af636454b1c1ef5287869de3b91ceac52ee1]]]]
Former-commit-id: 487b751143
Former-commit-id: 99315891ce [formerly 84360a83de] [formerly b1c84fa3b3553a3c0e0d8722e08ad6ea8340df09 [formerly fd306c44bd]]
Former-commit-id: e853ba06748f435e74caa2c9b1350aa8d110c022 [formerly 488ad3b167]
Former-commit-id: 65d727103d
2013-08-12 11:14:03 -05:00
Richard Peter
c4ea5f4964 Merge "Issue #2222 Changes to allow display of all selected data." into development
Former-commit-id: e61f9667c6 [formerly bb2dfdbcce] [formerly b6c34162c6] [formerly e61f9667c6 [formerly bb2dfdbcce] [formerly b6c34162c6] [formerly b89bb1e8a0 [formerly b6c34162c6 [formerly 957ff1720c6bc80372c0cdb44b95e628e7dbbdd2]]]]
Former-commit-id: b89bb1e8a0
Former-commit-id: 76acb0349e [formerly 6d713faf72] [formerly 5df3d208a95eb5996e46425cd66aab9d4d336f54 [formerly a3895de934]]
Former-commit-id: ca177e3ef17f81e8c3d8ba4ae26293c4378c2104 [formerly f820e819b9]
Former-commit-id: 2608077df4
2013-08-12 11:09:55 -05:00
Nate Jensen
50db03ebae Merge "Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base" into development
Former-commit-id: 5fafd2f64e [formerly ba4ca59667] [formerly 564c26361f] [formerly 5fafd2f64e [formerly ba4ca59667] [formerly 564c26361f] [formerly 2245b2f7a6 [formerly 564c26361f [formerly 187dd7ebbada6ef7d2d6cdddd9d9354fc73c0fc8]]]]
Former-commit-id: 2245b2f7a6
Former-commit-id: d9cf3a6d3f [formerly e82ecb755a] [formerly a5bea3938a36d8f40e4ad78c67ad582ea9a1ec66 [formerly 47e3e698de]]
Former-commit-id: 1a95638984f5e65b52cbad676a4f8a5b780690e7 [formerly 292d9e92a2]
Former-commit-id: 2c1c96016b
2013-08-12 09:49:22 -05:00
Mike Duff
b8ec9f07fb Issue #2254 - Fix the nightly automated junit tests
Change-Id: I8e595c097682ddd01cebf23fedbe5380d078085a

Former-commit-id: 5a3578accd [formerly f25d52e1e7] [formerly 9558b20e7c] [formerly 5a3578accd [formerly f25d52e1e7] [formerly 9558b20e7c] [formerly 832e61f938 [formerly 9558b20e7c [formerly 96eddd84c4f1287fa56e5356831961209c76331a]]]]
Former-commit-id: 832e61f938
Former-commit-id: 3ca0a91246 [formerly 7d5413647c] [formerly 00a0bf66e1141f15efb1bb46edae8f4643e7d7c9 [formerly 7b36ba1a19]]
Former-commit-id: bf3693d59197a0504a6680fce6f20c902823b8b0 [formerly 93ce81f949]
Former-commit-id: d081e799c8
2013-08-12 09:25:21 -05:00
Brad Gonzales
6242314838 Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals.
Change-Id: If1037781d8fbf0e3a88556ef4401fb77621187d7

Former-commit-id: b0779c9b4f [formerly 5ebe8ee093] [formerly 21c1b35c8b] [formerly b0779c9b4f [formerly 5ebe8ee093] [formerly 21c1b35c8b] [formerly d5ee61dc2b [formerly 21c1b35c8b [formerly 9ddb76125f51eb0ea73b7bb54a77e84fb32349e4]]]]
Former-commit-id: d5ee61dc2b
Former-commit-id: 030b466b8a [formerly 2468077e8b] [formerly 1f321bfc5353c97375cf29fe6b5a3b7362000fbf [formerly 780062acf3]]
Former-commit-id: d4831539fc28c09ade22bc75769737d060ad4fe3 [formerly e642fb330f]
Former-commit-id: b6745768de
2013-08-09 15:42:38 -05:00
Max Schenkelberg
750f71ea98 Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f

Former-commit-id: cb1d5d1c5b [formerly b95a96f4c9] [formerly 0f3c791120] [formerly cb1d5d1c5b [formerly b95a96f4c9] [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: cc6950107f [formerly 4fdb3c8306] [formerly 0d46128ba8af16237227239c716ce61a2bd99042 [formerly 75c95e83ef]]
Former-commit-id: 6330e8d0028065ee6a7110c911ee4f47033f7729 [formerly 2178fac70d]
Former-commit-id: 5167a52b65
2013-08-09 14:24:49 -05:00
Ben Steffensmeier
451acac93b Issue #1869 Fix bufrua point data stationId.
Former-commit-id: c88e432d04 [formerly bf2dfbaca8] [formerly 9e799b4df1] [formerly c88e432d04 [formerly bf2dfbaca8] [formerly 9e799b4df1] [formerly d1d3491aaf [formerly 9e799b4df1 [formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]]]
Former-commit-id: d1d3491aaf
Former-commit-id: b357fb0018 [formerly 20a7ba8e69] [formerly 5ee45ce1a1eec70e460a54a9e98781bb2db78baa [formerly 761cb47f73]]
Former-commit-id: f26d6075dc3483c9d4f7cfcf7de81d03d46f8bf5 [formerly b5332f3eb5]
Former-commit-id: 7a2cde76d5
2013-08-09 13:00:18 -05:00
David Gillingham
09c19d25ea Issue #1856: Fix HazardRecovery to work in SimulatedTime mode.
Change-Id: I811f9a87ac57c3682f282c45f5b380d7773c805b

Former-commit-id: b498e52510 [formerly beb78ae48d] [formerly 5743aebcbe] [formerly b498e52510 [formerly beb78ae48d] [formerly 5743aebcbe] [formerly 640452837c [formerly 5743aebcbe [formerly db77c4ea478fbaaf9a9e1b64d9df008874a71548]]]]
Former-commit-id: 640452837c
Former-commit-id: eb1b2bda8b [formerly d42ae1701d] [formerly a67e0e6bd7abdc943eb4fe37a1a2d56de8d62a8c [formerly f0fbc3766d]]
Former-commit-id: 3bf5fb1bfb20daf44758c48db5b90f963e042f48 [formerly feb37bc4f1]
Former-commit-id: 969ae1bcf0
2013-08-09 10:48:13 -05:00
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