Steve Harris
|
d0be6956e9
|
13.5.1-15 baseline
Former-commit-id: 535218c676 [formerly 53e96e21db] [formerly 535218c676 [formerly 53e96e21db] [formerly c6dc1817e7 [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 4f9288e7c1 [formerly 65beefde58]
Former-commit-id: 9ea3f0c215
|
2013-08-14 10:24:26 -04:00 |
|
Max Schenkelberg
|
229e0ee235
|
Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc
Former-commit-id: 6c92aa9dd7 [formerly 5ab8b6e2c6] [formerly 6c92aa9dd7 [formerly 5ab8b6e2c6] [formerly 06dbae8bdb [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]]
Former-commit-id: 06dbae8bdb
Former-commit-id: 2fc5af010d [formerly 759ff7bcfd]
Former-commit-id: 961ed891c8
|
2013-08-14 09:20:28 -05:00 |
|
Steve Harris
|
f4262380d6
|
13.5.1-14 baseline
Former-commit-id: b848317203 [formerly d695e5debe] [formerly b848317203 [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 9bd983e2fe [formerly cd5b1e9e2f]
Former-commit-id: 0f3ffc3892
|
2013-08-14 10:07:41 -04:00 |
|
Jonathan Sanchez
|
c2e2741ad6
|
Issue #2243 Resolved incorrect import.
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb
Former-commit-id: 52d7862d36 [formerly c6b6576f01] [formerly 52d7862d36 [formerly c6b6576f01] [formerly fd0f2f1c09 [formerly f79e7820ea010e0bc860b0033183147d7299221f]]]
Former-commit-id: fd0f2f1c09
Former-commit-id: 7189057682 [formerly 70bb266da7]
Former-commit-id: 77a919a7e8
|
2013-08-13 20:47:49 -05:00 |
|
Nate Jensen
|
2bed514c66
|
Issue #2262 create new wxmath plugin seeded by Java derivparam functions
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2
Former-commit-id: 23fe237b7e [formerly 09872d6713] [formerly 23fe237b7e [formerly 09872d6713] [formerly 959b50d184 [formerly f3d233aeff8017c521288affd4b5be668c9a890a]]]
Former-commit-id: 959b50d184
Former-commit-id: aaee338f5c [formerly 44ef756627]
Former-commit-id: 5a2c7fd36f
|
2013-08-13 16:59:57 -05:00 |
|
Richard Peter
|
48e9e757e9
|
Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
Former-commit-id: 2b23cb871e [formerly 6efc27c1b1] [formerly 2b23cb871e [formerly 6efc27c1b1] [formerly d5130432a8 [formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]]
Former-commit-id: d5130432a8
Former-commit-id: e28de494e9 [formerly 2fc754b899]
Former-commit-id: 6e3624d1a7
|
2013-08-13 16:45:37 -05:00 |
|
Jonathan Sanchez
|
ba585b9424
|
Issue #2243 Fixed update list bugs.
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f
Former-commit-id: 8d0ee7f5ca [formerly d685125b25] [formerly 8d0ee7f5ca [formerly d685125b25] [formerly 49f488a58f [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]]
Former-commit-id: 49f488a58f
Former-commit-id: d33332bd58 [formerly 96c88ad28b]
Former-commit-id: 721b2c7c04
|
2013-08-13 16:30:05 -05:00 |
|
Greg Armendariz
|
0995174c2e
|
Merge "Issue #2164 - fix 13.6.1 build" into development
Former-commit-id: 8bcfc737e6 [formerly 34b428b5a0] [formerly 8bcfc737e6 [formerly 34b428b5a0] [formerly 84413bd66f [formerly aa808c2ef1cbee907fbe910892a2c37fa5b0d45c]]]
Former-commit-id: 84413bd66f
Former-commit-id: 02dfe84d31 [formerly dbae6131cb]
Former-commit-id: e5399de2a2
|
2013-08-13 12:34:04 -05:00 |
|
Nate Jensen
|
7e35afdd49
|
Issue #2197 cherry picking 2197 into 13.5
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: a9815b0551 [formerly 15405cab1b] [formerly a9815b0551 [formerly 15405cab1b] [formerly 63b2fe798a [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]
Former-commit-id: 63b2fe798a
Former-commit-id: 464a104dc1 [formerly 3be446fca8]
Former-commit-id: 96214e9554
|
2013-08-13 12:27:02 -05:00 |
|
Bryan Kowal
|
197cc17ce7
|
Issue #2164 - fix 13.6.1 build
Former-commit-id: dbaa6da3ea [formerly 4604653241] [formerly dbaa6da3ea [formerly 4604653241] [formerly 586b7646f0 [formerly 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371]]]
Former-commit-id: 586b7646f0
Former-commit-id: d96ca6737c [formerly 8b3827c745]
Former-commit-id: 64916e1833
|
2013-08-13 11:13:52 -05:00 |
|
Nate Jensen
|
bfca6dac18
|
Issue #2142 removing more dependencies on edex.common
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf
Former-commit-id: 78256fd891 [formerly df95db8f78] [formerly 78256fd891 [formerly df95db8f78] [formerly 0c92461c65 [formerly 231c873711159c9a59f0bc4e25e70cc9c989ecc0]]]
Former-commit-id: 0c92461c65
Former-commit-id: 988ac46c2b [formerly bf821fdbe0]
Former-commit-id: 276f78d5f3
|
2013-08-13 09:09:05 -05:00 |
|
Nate Jensen
|
d9c2941c1d
|
Merge "Issue #2162: Add performance logging for GFE edit area query evaluation." into development
Former-commit-id: 9e283f0640 [formerly bb955e6ee7] [formerly 9e283f0640 [formerly bb955e6ee7] [formerly e6fc534b8c [formerly 731fb620ed8dec721c1fe4bbc0b55b4e11e1283f]]]
Former-commit-id: e6fc534b8c
Former-commit-id: c370d3b7d0 [formerly ea4355e018]
Former-commit-id: 74bf4205cb
|
2013-08-13 08:58:50 -05:00 |
|
Nate Jensen
|
a6ec68d567
|
Merge "Issue #2033 Fixed alertviz startup" into development
Former-commit-id: 5b3334b2ff [formerly 58e7b31de9] [formerly 5b3334b2ff [formerly 58e7b31de9] [formerly c62139c327 [formerly 3312f297f36ab27d9f9fb74d48bf291f60292e5a]]]
Former-commit-id: c62139c327
Former-commit-id: d9e4590947 [formerly 95010dbbf4]
Former-commit-id: 1b0049b36b
|
2013-08-13 08:56:24 -05:00 |
|
Nate Jensen
|
f1c8e329d9
|
Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development
Former-commit-id: ce20de02a7 [formerly 5948ebca87] [formerly ce20de02a7 [formerly 5948ebca87] [formerly 8101c961d4 [formerly e9e46b68652caff85b2206180856654876f55f12]]]
Former-commit-id: 8101c961d4
Former-commit-id: 835516348f [formerly 75f31b372e]
Former-commit-id: abbe1e21d0
|
2013-08-13 08:56:01 -05:00 |
|
Max Schenkelberg
|
eacb9a3696
|
Issue #2033 Fixed alertviz startup
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5
Former-commit-id: c825e2f0e2 [formerly 49381ac481] [formerly c825e2f0e2 [formerly 49381ac481] [formerly 3f35c335c9 [formerly 1cdd5eab835f2df85f8ebc82d0bea79bca3977da]]]
Former-commit-id: 3f35c335c9
Former-commit-id: c34cc88aa8 [formerly 17a28bf292]
Former-commit-id: c292d1bdc0
|
2013-08-12 17:37:15 -05:00 |
|
Nate Jensen
|
3801d84a2f
|
Issue #2142 more removing of dependencies from common plugins to edex.common
Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f
Former-commit-id: 23802cfe02 [formerly 28c79d0a56] [formerly 23802cfe02 [formerly 28c79d0a56] [formerly c2bf2163d9 [formerly 2342170ce4cf51f12759afa26fc5af46f35c6188]]]
Former-commit-id: c2bf2163d9
Former-commit-id: 2117ec71c6 [formerly 018845db8f]
Former-commit-id: f0a8895a98
|
2013-08-12 15:41:39 -05:00 |
|
Roger Ferrel
|
9dd8173991
|
Issue #2224 Changes to have DataSet in configuration.
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8
Former-commit-id: 705a3482f8 [formerly 1863d4d65b] [formerly 705a3482f8 [formerly 1863d4d65b] [formerly 3ecf95b18a [formerly de48fa389414c87ba557b70a480ce6b45144f4aa]]]
Former-commit-id: 3ecf95b18a
Former-commit-id: 8884343d89 [formerly 3d9be94e7e]
Former-commit-id: e51bf3559c
|
2013-08-12 12:50:12 -05:00 |
|
David Gillingham
|
98fdc5d1a1
|
Issue #2162: Add performance logging for GFE edit area query evaluation.
Change-Id: I916750fd00549dc53b1dd645792c04f4f63aa338
Former-commit-id: ed39a866f0 [formerly 07312fe01f] [formerly ed39a866f0 [formerly 07312fe01f] [formerly 98f48e5a64 [formerly 7d24f69078e324c56db448f293d3094df83f5c34]]]
Former-commit-id: 98f48e5a64
Former-commit-id: ffa45d26d9 [formerly 0b8a48b12e]
Former-commit-id: 235df668a6
|
2013-08-12 12:18:02 -05:00 |
|
Nate Jensen
|
2ba81e806a
|
Merge "Issue #2245 Make all DataTime comparisons consistent. Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d" into development
Former-commit-id: 81510bc3b7 [formerly 9f0698fe75] [formerly 81510bc3b7 [formerly 9f0698fe75] [formerly c5b96690ce [formerly 971df482819466e48efcbc3a1b01eab88687436a]]]
Former-commit-id: c5b96690ce
Former-commit-id: 0261071228 [formerly b18fa88aaf]
Former-commit-id: 1afec6d94d
|
2013-08-12 12:06:53 -05:00 |
|
Ben Steffensmeier
|
23e244e520
|
Issue #2245 Make all DataTime comparisons consistent.
Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d
Former-commit-id: 7e65ad5fe8 [formerly 479f72bc10] [formerly 7e65ad5fe8 [formerly 479f72bc10] [formerly 9901e7a622 [formerly b175ec81e61f18b42432e0245cddb953fbc5963f]]]
Former-commit-id: 9901e7a622
Former-commit-id: 98dab7a5bd [formerly 5071cf2fce]
Former-commit-id: 2c2b4c6c41
|
2013-08-12 11:37:51 -05:00 |
|
Greg Armendariz
|
65d727103d
|
Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into development
Former-commit-id: ab41d0cdb6 [formerly 5ea53e1c0f] [formerly ab41d0cdb6 [formerly 5ea53e1c0f] [formerly 487b751143 [formerly a978af636454b1c1ef5287869de3b91ceac52ee1]]]
Former-commit-id: 487b751143
Former-commit-id: 84360a83de [formerly fd306c44bd]
Former-commit-id: 488ad3b167
|
2013-08-12 11:14:03 -05:00 |
|
Richard Peter
|
2608077df4
|
Merge "Issue #2222 Changes to allow display of all selected data." into development
Former-commit-id: bb2dfdbcce [formerly b6c34162c6] [formerly bb2dfdbcce [formerly b6c34162c6] [formerly b89bb1e8a0 [formerly 957ff1720c6bc80372c0cdb44b95e628e7dbbdd2]]]
Former-commit-id: b89bb1e8a0
Former-commit-id: 6d713faf72 [formerly a3895de934]
Former-commit-id: f820e819b9
|
2013-08-12 11:09:55 -05:00 |
|
Nate Jensen
|
2c1c96016b
|
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: ba4ca59667 [formerly 564c26361f] [formerly ba4ca59667 [formerly 564c26361f] [formerly 2245b2f7a6 [formerly 187dd7ebbada6ef7d2d6cdddd9d9354fc73c0fc8]]]
Former-commit-id: 2245b2f7a6
Former-commit-id: e82ecb755a [formerly 47e3e698de]
Former-commit-id: 292d9e92a2
|
2013-08-12 09:49:22 -05:00 |
|
Max Schenkelberg
|
5167a52b65
|
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: b95a96f4c9 [formerly 0f3c791120] [formerly b95a96f4c9 [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: 4fdb3c8306 [formerly 75c95e83ef]
Former-commit-id: 2178fac70d
|
2013-08-09 14:24:49 -05:00 |
|
David Gillingham
|
969ae1bcf0
|
Issue #1856: Fix HazardRecovery to work in SimulatedTime mode.
Change-Id: I811f9a87ac57c3682f282c45f5b380d7773c805b
Former-commit-id: beb78ae48d [formerly 5743aebcbe] [formerly beb78ae48d [formerly 5743aebcbe] [formerly 640452837c [formerly db77c4ea478fbaaf9a9e1b64d9df008874a71548]]]
Former-commit-id: 640452837c
Former-commit-id: d42ae1701d [formerly f0fbc3766d]
Former-commit-id: feb37bc4f1
|
2013-08-09 10:48:13 -05:00 |
|
Bryan Kowal
|
d043d52eee
|
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: ff9dd063b9 [formerly b88d324aac] [formerly ff9dd063b9 [formerly b88d324aac] [formerly 620fb06773 [formerly a29d3008676c2291c27ceed4e7aad10289a64569]]]
Former-commit-id: 620fb06773
Former-commit-id: 10af499f87 [formerly 083ca82113]
Former-commit-id: 62fd3f947e
|
2013-08-08 17:45:58 -05:00 |
|
Lee Venable
|
33177a8711
|
Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: ef5a7fb83a [formerly 69dd7b66fa] [formerly ef5a7fb83a [formerly 69dd7b66fa] [formerly 69645f03dc [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]
Former-commit-id: 69645f03dc
Former-commit-id: 696ee07b3f [formerly d9e82e20fd]
Former-commit-id: a0e0b81a81
|
2013-08-08 16:40:59 -05:00 |
|
Jonathan Sanchez
|
21368ade28
|
Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e
Former-commit-id: 05f49219d3 [formerly 4711226b21] [formerly 05f49219d3 [formerly 4711226b21] [formerly dad0681ae0 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]
Former-commit-id: dad0681ae0
Former-commit-id: b467d0fd66 [formerly d068b5d61f]
Former-commit-id: 9be546dab8
|
2013-08-08 16:31:35 -05:00 |
|
Greg Armendariz
|
e51e51c625
|
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: 3cecb178cf [formerly b08ce25ac8] [formerly 3cecb178cf [formerly b08ce25ac8] [formerly ffb2bea8ad [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]
Former-commit-id: ffb2bea8ad
Former-commit-id: 24dc722be4 [formerly 566532c40d]
Former-commit-id: 172bc300ca
|
2013-08-08 16:24:39 -05:00 |
|
Roger Ferrel
|
f283f130ba
|
Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb
Former-commit-id: af8668a4c4 [formerly f167ec49cd] [formerly af8668a4c4 [formerly f167ec49cd] [formerly efed5777e9 [formerly b49c3147991d87c32aba619521502438c11eb8f6]]]
Former-commit-id: efed5777e9
Former-commit-id: 2dc203ebdf [formerly 96e6d1f7cc]
Former-commit-id: 6a47c144c7
|
2013-08-08 16:15:34 -05:00 |
|
Greg Armendariz
|
0c61b62d24
|
13.5.1-13 baseline
Former-commit-id: f0b62a22bf [formerly 29b823fee4] [formerly f0b62a22bf [formerly 29b823fee4] [formerly 5577e686c1 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]
Former-commit-id: 5577e686c1
Former-commit-id: 9f2f62427b [formerly 8bfac41add]
Former-commit-id: b66fcc40a5
|
2013-08-08 17:00:36 -04:00 |
|
Nate Jensen
|
815087f84e
|
Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f
Former-commit-id: cce952c0bc [formerly a919490d00] [formerly cce952c0bc [formerly a919490d00] [formerly a9f5465c99 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]]
Former-commit-id: a9f5465c99
Former-commit-id: 71a7b044ae [formerly fe3adecbc2]
Former-commit-id: 440756a331
|
2013-08-08 14:46:52 -05:00 |
|
Greg Armendariz
|
244bc3ac37
|
13.5.1-12 baseline
Former-commit-id: 01d067cff9 [formerly c9898ba8d1] [formerly 01d067cff9 [formerly c9898ba8d1] [formerly fe51885ba7 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]
Former-commit-id: fe51885ba7
Former-commit-id: f777a744e5 [formerly 9892a1a262]
Former-commit-id: cbf9e42c21
|
2013-08-08 15:34:01 -04:00 |
|
Ron Anderson
|
ac87ab52dc
|
Merge "Issue #2027 upgrade version of derby" into development
Former-commit-id: a85bfb298b [formerly b43b05fced] [formerly a85bfb298b [formerly b43b05fced] [formerly 92741fe6dd [formerly d3867fbea055fa4b4fac77bc1524c2999db25c23]]]
Former-commit-id: 92741fe6dd
Former-commit-id: 6b3788382b [formerly 609a5c4a7c]
Former-commit-id: 15a3ac1082
|
2013-08-08 12:48:40 -05:00 |
|
Richard Peter
|
78a0252dbd
|
Merge "Issue #2077 Revise pixel size calculations. Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7" into development
Former-commit-id: 88a9f32aab [formerly e412320b39] [formerly 88a9f32aab [formerly e412320b39] [formerly f3ba33a84c [formerly ef55eddb22b9f50dc06496502e66ff170c603493]]]
Former-commit-id: f3ba33a84c
Former-commit-id: 0b721ec758 [formerly 22f9c92e4a]
Former-commit-id: 191ba3bd98
|
2013-08-08 09:52:25 -05:00 |
|
David Gillingham
|
651ed92403
|
Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389
Former-commit-id: 6471edab78 [formerly 20e0f4b756] [formerly 6471edab78 [formerly 20e0f4b756] [formerly f839ef6f3b [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]]
Former-commit-id: f839ef6f3b
Former-commit-id: 5f9352cb65 [formerly 616c023369]
Former-commit-id: 6b03403d65
|
2013-08-08 09:41:33 -05:00 |
|
Ben Steffensmeier
|
7762410fa0
|
Issue #2077 Revise pixel size calculations.
Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7
Former-commit-id: 6e1c8c7208 [formerly 6c7d1d60a8] [formerly 6e1c8c7208 [formerly 6c7d1d60a8] [formerly 1bd7cc1097 [formerly 99fa66319bfe07aa84276bd7f9f0817ed5868798]]]
Former-commit-id: 1bd7cc1097
Former-commit-id: ffe256a0eb [formerly 3071e53e45]
Former-commit-id: 65e33fdae5
|
2013-08-07 18:40:28 -05:00 |
|
Ben Steffensmeier
|
2056116c16
|
Issue #2235 Fix the build, hopefully.
Change-Id: I09466023c4d15921bc9b86e2d6f0958c1ff83539
Former-commit-id: 49a2b27ab1 [formerly 95c4e2d65d] [formerly 49a2b27ab1 [formerly 95c4e2d65d] [formerly 4b705b1436 [formerly 1545f57a99f47bd8dabb70235914bdaa14025b00]]]
Former-commit-id: 4b705b1436
Former-commit-id: 1de459b743 [formerly cdddcac87b]
Former-commit-id: 2877836f4d
|
2013-08-07 17:15:06 -05:00 |
|
Nate Jensen
|
d6cbe9b4f5
|
Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4
Former-commit-id: 8968389383 [formerly ec01e6e872] [formerly 8968389383 [formerly ec01e6e872] [formerly be9315642b [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]]
Former-commit-id: be9315642b
Former-commit-id: 8cca3c32ac [formerly b0f3d536e4]
Former-commit-id: 9d4e00d5d1
|
2013-08-07 16:44:30 -05:00 |
|
Greg Armendariz
|
4b29a16298
|
Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: d1fb06feb7 [formerly ecc9f77f42] [formerly d1fb06feb7 [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]
Former-commit-id: 6b1989cb29
Former-commit-id: fc6195bbf6 [formerly c46f04dd72]
Former-commit-id: 9a1b44efdc
|
2013-08-07 14:46:30 -05:00 |
|
Ron Anderson
|
ec60977418
|
Merge "Issue #2235 Added Caching version of TopoQuery. Change-Id: I0e17028921faa40e85134c79074655900bd8358c" into development
Former-commit-id: 896b5333d1 [formerly 216b2a5c86] [formerly 896b5333d1 [formerly 216b2a5c86] [formerly 0a9068e6d3 [formerly 4e9a02fcd4931d2a26b10b3e695a7fa99d1ef972]]]
Former-commit-id: 0a9068e6d3
Former-commit-id: 44c10c798d [formerly fcb78e78d3]
Former-commit-id: f8ad742697
|
2013-08-07 14:05:36 -05:00 |
|
Greg Armendariz
|
8bf2c1cc07
|
13.5.1-11 baseline
Former-commit-id: c402dbf6e9 [formerly ea7b22500e] [formerly c402dbf6e9 [formerly ea7b22500e] [formerly 4ec04083bd [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 75f9f8df3f [formerly 26e58d8cdb]
Former-commit-id: f06ee47260
|
2013-08-07 14:34:27 -04:00 |
|
Greg Armendariz
|
5998f47f57
|
13.5.1-10 baseline
Former-commit-id: e276b0fabe [formerly 852455843f] [formerly e276b0fabe [formerly 852455843f] [formerly acf7ced37b [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]
Former-commit-id: acf7ced37b
Former-commit-id: 9ddb32967c [formerly 05282eac88]
Former-commit-id: f37ef8c24e
|
2013-08-07 14:14:46 -04:00 |
|
Nate Jensen
|
527da593d3
|
Issue #1561 more efficient query of GFE files
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9
Former-commit-id: 04e78d5a64 [formerly cdfea29b16] [formerly 04e78d5a64 [formerly cdfea29b16] [formerly 5c7dc36583 [formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]]
Former-commit-id: 5c7dc36583
Former-commit-id: e99fd427ec [formerly d520081243]
Former-commit-id: f8bd55d407
|
2013-08-07 13:12:48 -05:00 |
|
Ben Steffensmeier
|
7a597c7223
|
Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c
Former-commit-id: f9cd8457bc [formerly 2ecba23bb9] [formerly f9cd8457bc [formerly 2ecba23bb9] [formerly 2a51ddd697 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]]
Former-commit-id: 2a51ddd697
Former-commit-id: 794d41a8f7 [formerly 15ddd45995]
Former-commit-id: 16c0832b4f
|
2013-08-06 18:27:21 -05:00 |
|
Nate Jensen
|
077c619bbf
|
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: 960dc1e81e [formerly a1a9a4751a] [formerly 960dc1e81e [formerly a1a9a4751a] [formerly 27dd27a73f [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]
Former-commit-id: 27dd27a73f
Former-commit-id: 04d55ac1c0 [formerly 15006517a2]
Former-commit-id: 22861240c8
|
2013-08-06 17:17:53 -05:00 |
|
Nate Jensen
|
94d44a672a
|
Merge "Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage" into development
Former-commit-id: fb6b9a8b42 [formerly 0bf9eed643] [formerly fb6b9a8b42 [formerly 0bf9eed643] [formerly e7949c04ad [formerly 311a4e792edd9c1a83fe2debfee1a00e43f12807]]]
Former-commit-id: e7949c04ad
Former-commit-id: a321310dd8 [formerly 2bd358ff19]
Former-commit-id: 5c3310851b
|
2013-08-06 14:14:27 -05:00 |
|
Richard Peter
|
3e7e16a995
|
Merge "Issue #2221 - Changes to have select configuration files for retention and case creation." into development
Former-commit-id: 87ecd93a4b [formerly d6041529db] [formerly 87ecd93a4b [formerly d6041529db] [formerly 301556213a [formerly 99422acbda91c8f499af9c4ae57b136a1469fdfa]]]
Former-commit-id: 301556213a
Former-commit-id: 9909443fdb [formerly 5349f48a34]
Former-commit-id: cb58571e5f
|
2013-08-06 12:46:32 -05:00 |
|
Max Schenkelberg
|
a691c86dc0
|
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: 7f4b63283d [formerly dda69d36b7] [formerly 7f4b63283d [formerly dda69d36b7] [formerly a18686135c [formerly 2e52921b21ecaeaa11be8277e264446686d65338]]]
Former-commit-id: a18686135c
Former-commit-id: 23b6e68e14 [formerly 75ae62fd9a]
Former-commit-id: 3d5f35d792
|
2013-08-06 12:37:52 -05:00 |
|
Nate Jensen
|
c5c37c9646
|
Issue #2142 fix logback config
Change-Id: I6e708cb251f6e4564ede0ba90f2cd906eb16a998
Former-commit-id: ef55df925d [formerly 05eba98d50] [formerly ef55df925d [formerly 05eba98d50] [formerly 148153eddf [formerly a200e86f382e532c1b60c907b4a0b00d80688917]]]
Former-commit-id: 148153eddf
Former-commit-id: 119368aec0 [formerly b04d075d18]
Former-commit-id: bcb21350cf
|
2013-08-06 11:39:34 -05:00 |
|