Commit graph

3695 commits

Author SHA1 Message Date
Matt Nash
53fbeaff34 Issue #2253 fix issue where warnings do not show up in the drop down in Warngen
Change-Id: I680948f5e5224da9f649632fd72ca0412eb9b186

Former-commit-id: 80172b1aba [formerly 5aeda85fca] [formerly 80172b1aba [formerly 5aeda85fca] [formerly dda3d78b48 [formerly 1c72a8cfeeb9263f8d406002de9703a1ee73f40e]]]
Former-commit-id: dda3d78b48
Former-commit-id: fc6e2bf0c3 [formerly ebb291e6c3]
Former-commit-id: 82214b871e
2013-08-13 11:59:35 -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
Richard Peter
912f409622 Merge "Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals." into development
Former-commit-id: 3763073459 [formerly 3f6d8a28da] [formerly 3763073459 [formerly 3f6d8a28da] [formerly 60831564a0 [formerly c4cc04a6b759f934a556004a242da4dfa4709653]]]
Former-commit-id: 60831564a0
Former-commit-id: 35a3e81478 [formerly a4d9a82ca5]
Former-commit-id: c14c5c3b15
2013-08-13 10:10:07 -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
Richard Peter
35dec4295c Merge "Issue #2224 Changes to have DataSet in configuration." into development
Former-commit-id: 5548ae76b1 [formerly d8124958b5] [formerly 5548ae76b1 [formerly d8124958b5] [formerly 2de533cbbf [formerly d4a46b8283ac0cb47f62c43b999d7f119161e08d]]]
Former-commit-id: 2de533cbbf
Former-commit-id: e9651a43ed [formerly 4605595354]
Former-commit-id: 96336e3fa3
2013-08-12 15:01:51 -05:00
Nate Jensen
a80ab51f46 Merge "Issue #2142 remove some uf.common dependencies on edex.common" into development
Former-commit-id: 1473d04e25 [formerly 82472058e9] [formerly 1473d04e25 [formerly 82472058e9] [formerly de38280317 [formerly 9e3b68a2e0ed6dcc63c5d2cace84c0fa3cadb521]]]
Former-commit-id: de38280317
Former-commit-id: 65c7c9e9b3 [formerly f6c4ec164f]
Former-commit-id: 5b096c5524
2013-08-12 14:16:29 -05:00
Ben Steffensmeier
0ab1fb6e3c Issue #2245 make DataTimeCompatible Java 6 compatible.
Former-commit-id: 00f61c4858 [formerly 67c84f2fb8] [formerly 00f61c4858 [formerly 67c84f2fb8] [formerly 46c3413805 [formerly e32655d3daef131c451d972c7b2747b01e49d840]]]
Former-commit-id: 46c3413805
Former-commit-id: 16dd725cc1 [formerly 64b1d5d9dd]
Former-commit-id: bf58a91f2d
2013-08-12 13:43:43 -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
Nate Jensen
4ee212306e Issue #2142 remove some uf.common dependencies on edex.common
Change-Id: I327d9c6a184c2a9b422c02a39a2268459775a887

Former-commit-id: 2f641b40d7 [formerly 94096b8f65] [formerly 2f641b40d7 [formerly 94096b8f65] [formerly 48758e64ef [formerly c0c65319cd731aea51f730f700b0fda3c6992d38]]]
Former-commit-id: 48758e64ef
Former-commit-id: f69d155d26 [formerly ce0c8f3259]
Former-commit-id: 4bb302cd5c
2013-08-12 12:47:51 -05:00
Greg Armendariz
792f31fbce Merge "Issue #2254 - Fix the nightly automated junit tests" into development
Former-commit-id: 773a7a4903 [formerly 1386598257] [formerly 773a7a4903 [formerly 1386598257] [formerly 594198b5a5 [formerly 347fe4615e9902892a95f13d13cfd8c0bcd7c39d]]]
Former-commit-id: 594198b5a5
Former-commit-id: 20cffb4cad [formerly 3c0c7ee56b]
Former-commit-id: 84e38e55c7
2013-08-12 12:25:17 -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
Mike Duff
d081e799c8 Issue #2254 - Fix the nightly automated junit tests
Change-Id: I8e595c097682ddd01cebf23fedbe5380d078085a

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

Former-commit-id: 5ebe8ee093 [formerly 21c1b35c8b] [formerly 5ebe8ee093 [formerly 21c1b35c8b] [formerly d5ee61dc2b [formerly 9ddb76125f51eb0ea73b7bb54a77e84fb32349e4]]]
Former-commit-id: d5ee61dc2b
Former-commit-id: 2468077e8b [formerly 780062acf3]
Former-commit-id: e642fb330f
2013-08-09 15:42:38 -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
Ben Steffensmeier
7a2cde76d5 Issue #1869 Fix bufrua point data stationId.
Former-commit-id: bf2dfbaca8 [formerly 9e799b4df1] [formerly bf2dfbaca8 [formerly 9e799b4df1] [formerly d1d3491aaf [formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]]
Former-commit-id: d1d3491aaf
Former-commit-id: 20a7ba8e69 [formerly 761cb47f73]
Former-commit-id: b5332f3eb5
2013-08-09 13:00:18 -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
6a24eb7f9a Issue #2252 - remove file accidentally re-added by the merge.
Former-commit-id: 0ba5c54688 [formerly 3bdbf6d0cc] [formerly 0ba5c54688 [formerly 3bdbf6d0cc] [formerly 5c6258e8c1 [formerly 0462ccb18fdd17b2d25a2c22b547d052ffe33aca]]]
Former-commit-id: 5c6258e8c1
Former-commit-id: 4f0b9b4cf3 [formerly a35cbbf85c]
Former-commit-id: e5727ed745
2013-08-08 18:38:21 -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
26601ba4b2 Merge "Issue #2191 Addressing comments from previous change" into development
Former-commit-id: 2f6af1cf34 [formerly 95357f0b2c] [formerly 2f6af1cf34 [formerly 95357f0b2c] [formerly 40c4593896 [formerly 8a9557269526e7f8efd21a8c46d50f30fb9f7b6e]]]
Former-commit-id: 40c4593896
Former-commit-id: a7ac9871bb [formerly 88768c369a]
Former-commit-id: 72918d8f81
2013-08-08 09:58:18 -05:00
Benjamin Phillippe
5700c52860 Issue #2191 Addressing comments from previous change
Change-Id: Ib7e23bdfbecebe7141ef2d086d7b049530d11ce2

Former-commit-id: a7258dd8f6 [formerly 59a9aeabf0] [formerly a7258dd8f6 [formerly 59a9aeabf0] [formerly 3c7ad386ed [formerly c2d5beba2c9656d80851aee1a7beabe4807c14f6]]]
Former-commit-id: 3c7ad386ed
Former-commit-id: 2c2ed655aa [formerly dc2e0f6a7b]
Former-commit-id: 35ee48c73b
2013-08-08 09:56:35 -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
Max Schenkelberg
9edbaaf730 Issue #2190 removed non-existent .so from meteolib build.properties
Change-Id: I40ff45473518215375ace9fbdcd9a8e416ddb438

Former-commit-id: 48dd7a6ca7 [formerly f587206b84] [formerly 48dd7a6ca7 [formerly f587206b84] [formerly 7ed0b6c5f8 [formerly 006ea8d18d40c8fb147e4970a1032f0f6efa3cfc]]]
Former-commit-id: 7ed0b6c5f8
Former-commit-id: fbe0988682 [formerly 259f16578c]
Former-commit-id: 8157d99949
2013-08-08 09:15:05 -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
Greg Armendariz
69c581a199 Merge "Issue #2190 attempt to fix build" into development
Former-commit-id: 430dd1bb43 [formerly 614a9a5ca0] [formerly 430dd1bb43 [formerly 614a9a5ca0] [formerly c588a5ce7e [formerly 3cf79c8f9e9391b4bac3d6dba05570eb9a1cedfc]]]
Former-commit-id: c588a5ce7e
Former-commit-id: 85b41d68d1 [formerly 8c8439446a]
Former-commit-id: 7c87d81235
2013-08-07 14:41:37 -05:00
Nate Jensen
37ce13f591 Issue #2190 attempt to fix build
Change-Id: I733289250b318c81134bacb676837b36b67fb6c6

Former-commit-id: 88cefe228a [formerly f56bb10cb2] [formerly 88cefe228a [formerly f56bb10cb2] [formerly d1e2274f46 [formerly 9e6ca01815f880282ec87fdce72d108131039f2e]]]
Former-commit-id: d1e2274f46
Former-commit-id: 2ceeb152ba [formerly 8478d68a56]
Former-commit-id: c69abb1d90
2013-08-07 14:15:50 -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