Commit graph

3731 commits

Author SHA1 Message Date
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
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
7a95a653aa Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: 74a5f09cd1 [formerly f0ceddacf1] [formerly 74a5f09cd1 [formerly f0ceddacf1] [formerly b06171b4f2 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]]
Former-commit-id: b06171b4f2
Former-commit-id: 7de39a58bb [formerly 3eb869c65e]
Former-commit-id: 7e3835fd0a
2013-08-07 12:08:13 -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
Richard Peter
ca511021e3 Merge "Issue #2142 fix logback ingest config" into development
Former-commit-id: 91bef56489 [formerly a229fd3abb] [formerly 91bef56489 [formerly a229fd3abb] [formerly 883f450f28 [formerly 3deb3b03c2ab71ce00b1bf465bae6139e462c39e]]]
Former-commit-id: 883f450f28
Former-commit-id: 52d44a496e [formerly d75818c241]
Former-commit-id: d8ef36a6f3
2013-08-06 14:23:41 -05:00
Nate Jensen
fc6a343ba5 Issue #2142 fix logback ingest config
Change-Id: I7b50e76bea11eff68cc29930faa1cd1443558a70

Former-commit-id: 7aecba7abe [formerly f756c0039a] [formerly 7aecba7abe [formerly f756c0039a] [formerly ac3071cc0a [formerly f191176549581689ac20b62a2033c19264aaa8df]]]
Former-commit-id: ac3071cc0a
Former-commit-id: 83e9df5281 [formerly b50304a16f]
Former-commit-id: 97cf1bb5bb
2013-08-06 14:22:15 -05:00
Richard Peter
85b333758b Merge "Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup" into development
Former-commit-id: d6ac029070 [formerly 6eb59502f8] [formerly d6ac029070 [formerly 6eb59502f8] [formerly a91d535a99 [formerly 14e07542613348b91e60baa914cdffe1b936d9d7]]]
Former-commit-id: a91d535a99
Former-commit-id: 3e07f1af5a [formerly 6fb0e514f5]
Former-commit-id: a082f83204
2013-08-06 14:21: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
Benjamin Phillippe
70887ec713 Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup
Change-Id: I0f4eafb3fa68f2d1eeade4f047c95d714502cf56

Former-commit-id: 01466d0624 [formerly 73fd5ac852] [formerly 01466d0624 [formerly 73fd5ac852] [formerly 5bd0d92363 [formerly 2aa7bdc1a8a942eaa0589527e8987b6fc518479f]]]
Former-commit-id: 5bd0d92363
Former-commit-id: 972d02114c [formerly 33f601b72e]
Former-commit-id: ce5cb744d8
2013-08-06 11:13:01 -05:00
Richard Peter
c64797d099 Merge "Issue #2228 use TMemoryInputTransport for slight efficiency improvement" into development
Former-commit-id: fd739709d5 [formerly 7a1c02eac8] [formerly fd739709d5 [formerly 7a1c02eac8] [formerly a6cccde03f [formerly 1fe04ca5037355f11d0deab7ebcc27b84e0a337b]]]
Former-commit-id: a6cccde03f
Former-commit-id: 4d11d1bed2 [formerly fdcb9d2070]
Former-commit-id: 6cf41de9f8
2013-08-06 10:09:50 -05:00
Nate Jensen
88fb4ae098 Merge "Issue #1726 change how swt is imported to tests" into development
Former-commit-id: fe50df0d72 [formerly 35ec9bb413] [formerly fe50df0d72 [formerly 35ec9bb413] [formerly 730f0d7f78 [formerly 47f5fbe957aedbf7edbc9b45fd9774fb73fa1c9f]]]
Former-commit-id: 730f0d7f78
Former-commit-id: a23cc7344c [formerly 6f61e57845]
Former-commit-id: 884506cd70
2013-08-06 09:57:44 -05:00