Commit graph

3435 commits

Author SHA1 Message Date
Nate Jensen
cdf60409ea Issue #2142 remove some uf.common dependencies on edex.common
Change-Id: I327d9c6a184c2a9b422c02a39a2268459775a887

Former-commit-id: 48758e64ef [formerly 2f641b40d7 [formerly 94096b8f65] [formerly 48758e64ef [formerly c0c65319cd731aea51f730f700b0fda3c6992d38]]]
Former-commit-id: 2f641b40d7 [formerly 94096b8f65]
Former-commit-id: 2f641b40d7
Former-commit-id: 525666a23f
2013-08-12 12:47:51 -05:00
Greg Armendariz
581d602611 Merge "Issue #2254 - Fix the nightly automated junit tests" into development
Former-commit-id: 594198b5a5 [formerly 773a7a4903 [formerly 1386598257] [formerly 594198b5a5 [formerly 347fe4615e9902892a95f13d13cfd8c0bcd7c39d]]]
Former-commit-id: 773a7a4903 [formerly 1386598257]
Former-commit-id: 773a7a4903
Former-commit-id: 8ac14d0f1b
2013-08-12 12:25:17 -05:00
David Gillingham
c6a93b13b9 Issue #2162: Add performance logging for GFE edit area query evaluation.
Change-Id: I916750fd00549dc53b1dd645792c04f4f63aa338

Former-commit-id: 98f48e5a64 [formerly ed39a866f0 [formerly 07312fe01f] [formerly 98f48e5a64 [formerly 7d24f69078e324c56db448f293d3094df83f5c34]]]
Former-commit-id: ed39a866f0 [formerly 07312fe01f]
Former-commit-id: ed39a866f0
Former-commit-id: 11384d2198
2013-08-12 12:18:02 -05:00
Nate Jensen
88a6d31464 Merge "Issue #2245 Make all DataTime comparisons consistent. Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d" into development
Former-commit-id: c5b96690ce [formerly 81510bc3b7 [formerly 9f0698fe75] [formerly c5b96690ce [formerly 971df482819466e48efcbc3a1b01eab88687436a]]]
Former-commit-id: 81510bc3b7 [formerly 9f0698fe75]
Former-commit-id: 81510bc3b7
Former-commit-id: d4dbb8fe98
2013-08-12 12:06:53 -05:00
Ben Steffensmeier
3bf313eec4 Issue #2245 Make all DataTime comparisons consistent.
Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d

Former-commit-id: 9901e7a622 [formerly 7e65ad5fe8 [formerly 479f72bc10] [formerly 9901e7a622 [formerly b175ec81e61f18b42432e0245cddb953fbc5963f]]]
Former-commit-id: 7e65ad5fe8 [formerly 479f72bc10]
Former-commit-id: 7e65ad5fe8
Former-commit-id: e39f55eeb7
2013-08-12 11:37:51 -05:00
Greg Armendariz
c8c6ff0fc8 Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into development
Former-commit-id: 487b751143 [formerly ab41d0cdb6 [formerly 5ea53e1c0f] [formerly 487b751143 [formerly a978af636454b1c1ef5287869de3b91ceac52ee1]]]
Former-commit-id: ab41d0cdb6 [formerly 5ea53e1c0f]
Former-commit-id: ab41d0cdb6
Former-commit-id: 949e3974ef
2013-08-12 11:14:03 -05:00
Richard Peter
1daa9655fd Merge "Issue #2222 Changes to allow display of all selected data." into development
Former-commit-id: b89bb1e8a0 [formerly bb2dfdbcce [formerly b6c34162c6] [formerly b89bb1e8a0 [formerly 957ff1720c6bc80372c0cdb44b95e628e7dbbdd2]]]
Former-commit-id: bb2dfdbcce [formerly b6c34162c6]
Former-commit-id: bb2dfdbcce
Former-commit-id: e61f9667c6
2013-08-12 11:09:55 -05:00
Nate Jensen
a69447f1c1 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: 2245b2f7a6 [formerly ba4ca59667 [formerly 564c26361f] [formerly 2245b2f7a6 [formerly 187dd7ebbada6ef7d2d6cdddd9d9354fc73c0fc8]]]
Former-commit-id: ba4ca59667 [formerly 564c26361f]
Former-commit-id: ba4ca59667
Former-commit-id: 5fafd2f64e
2013-08-12 09:49:22 -05:00
Mike Duff
aa0ec73726 Issue #2254 - Fix the nightly automated junit tests
Change-Id: I8e595c097682ddd01cebf23fedbe5380d078085a

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

Former-commit-id: d5ee61dc2b [formerly 5ebe8ee093 [formerly 21c1b35c8b] [formerly d5ee61dc2b [formerly 9ddb76125f51eb0ea73b7bb54a77e84fb32349e4]]]
Former-commit-id: 5ebe8ee093 [formerly 21c1b35c8b]
Former-commit-id: 5ebe8ee093
Former-commit-id: b0779c9b4f
2013-08-09 15:42:38 -05:00
Max Schenkelberg
23520d6f7a 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: d79cfe8ad1 [formerly b95a96f4c9 [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]
Former-commit-id: b95a96f4c9 [formerly 0f3c791120]
Former-commit-id: b95a96f4c9
Former-commit-id: cb1d5d1c5b
2013-08-09 14:24:49 -05:00
Ben Steffensmeier
6e9955ac74 Issue #1869 Fix bufrua point data stationId.
Former-commit-id: d1d3491aaf [formerly bf2dfbaca8 [formerly 9e799b4df1] [formerly d1d3491aaf [formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]]
Former-commit-id: bf2dfbaca8 [formerly 9e799b4df1]
Former-commit-id: bf2dfbaca8
Former-commit-id: c88e432d04
2013-08-09 13:00:18 -05:00
David Gillingham
484aa6500b Issue #1856: Fix HazardRecovery to work in SimulatedTime mode.
Change-Id: I811f9a87ac57c3682f282c45f5b380d7773c805b

Former-commit-id: 640452837c [formerly beb78ae48d [formerly 5743aebcbe] [formerly 640452837c [formerly db77c4ea478fbaaf9a9e1b64d9df008874a71548]]]
Former-commit-id: beb78ae48d [formerly 5743aebcbe]
Former-commit-id: beb78ae48d
Former-commit-id: b498e52510
2013-08-09 10:48:13 -05:00
Bryan Kowal
d0395ba930 Issue #2252 - remove file accidentally re-added by the merge.
Former-commit-id: 5c6258e8c1 [formerly 0ba5c54688 [formerly 3bdbf6d0cc] [formerly 5c6258e8c1 [formerly 0462ccb18fdd17b2d25a2c22b547d052ffe33aca]]]
Former-commit-id: 0ba5c54688 [formerly 3bdbf6d0cc]
Former-commit-id: 0ba5c54688
Former-commit-id: 09546736f2
2013-08-08 18:38:21 -05:00
Bryan Kowal
3d339bcfc8 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: 620fb06773 [formerly ff9dd063b9 [formerly b88d324aac] [formerly 620fb06773 [formerly a29d3008676c2291c27ceed4e7aad10289a64569]]]
Former-commit-id: ff9dd063b9 [formerly b88d324aac]
Former-commit-id: ff9dd063b9
Former-commit-id: 21b835c10b
2013-08-08 17:45:58 -05:00
Lee Venable
88c5d415b2 Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: 69645f03dc [formerly ef5a7fb83a [formerly 69dd7b66fa] [formerly 69645f03dc [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]
Former-commit-id: ef5a7fb83a [formerly 69dd7b66fa]
Former-commit-id: ef5a7fb83a
Former-commit-id: c314bf2092
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
165109a5e0 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: dad0681ae0 [formerly 05f49219d3 [formerly 4711226b21] [formerly dad0681ae0 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]
Former-commit-id: 05f49219d3 [formerly 4711226b21]
Former-commit-id: 05f49219d3
Former-commit-id: 7d34154d2c
2013-08-08 16:31:35 -05:00
Greg Armendariz
31220078bb 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: ffb2bea8ad [formerly 3cecb178cf [formerly b08ce25ac8] [formerly ffb2bea8ad [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]
Former-commit-id: 3cecb178cf [formerly b08ce25ac8]
Former-commit-id: 3cecb178cf
Former-commit-id: 154539a4fe
2013-08-08 16:24:39 -05:00
Roger Ferrel
51d574597d Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb

Former-commit-id: efed5777e9 [formerly af8668a4c4 [formerly f167ec49cd] [formerly efed5777e9 [formerly b49c3147991d87c32aba619521502438c11eb8f6]]]
Former-commit-id: af8668a4c4 [formerly f167ec49cd]
Former-commit-id: af8668a4c4
Former-commit-id: 33e860772d
2013-08-08 16:15:34 -05:00
Greg Armendariz
997dff83e0 13.5.1-13 baseline
Former-commit-id: 5577e686c1 [formerly f0b62a22bf [formerly 29b823fee4] [formerly 5577e686c1 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]
Former-commit-id: f0b62a22bf [formerly 29b823fee4]
Former-commit-id: f0b62a22bf
Former-commit-id: 429898edc6
2013-08-08 17:00:36 -04:00
Nate Jensen
9b9f26bcc5 Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: a9f5465c99 [formerly cce952c0bc [formerly a919490d00] [formerly a9f5465c99 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]]
Former-commit-id: cce952c0bc [formerly a919490d00]
Former-commit-id: cce952c0bc
Former-commit-id: 3b787e12df
2013-08-08 14:46:52 -05:00
Greg Armendariz
1d7ced1251 13.5.1-12 baseline
Former-commit-id: fe51885ba7 [formerly 01d067cff9 [formerly c9898ba8d1] [formerly fe51885ba7 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]
Former-commit-id: 01d067cff9 [formerly c9898ba8d1]
Former-commit-id: 01d067cff9
Former-commit-id: 34e0218b59
2013-08-08 15:34:01 -04:00
Ron Anderson
52795da9ce Merge "Issue #2027 upgrade version of derby" into development
Former-commit-id: 92741fe6dd [formerly a85bfb298b [formerly b43b05fced] [formerly 92741fe6dd [formerly d3867fbea055fa4b4fac77bc1524c2999db25c23]]]
Former-commit-id: a85bfb298b [formerly b43b05fced]
Former-commit-id: a85bfb298b
Former-commit-id: 40af78db23
2013-08-08 12:48:40 -05:00
Richard Peter
74b430d870 Merge "Issue #2191 Addressing comments from previous change" into development
Former-commit-id: 40c4593896 [formerly 2f6af1cf34 [formerly 95357f0b2c] [formerly 40c4593896 [formerly 8a9557269526e7f8efd21a8c46d50f30fb9f7b6e]]]
Former-commit-id: 2f6af1cf34 [formerly 95357f0b2c]
Former-commit-id: 2f6af1cf34
Former-commit-id: cf63f60a44
2013-08-08 09:58:18 -05:00
Benjamin Phillippe
fd0252c440 Issue #2191 Addressing comments from previous change
Change-Id: Ib7e23bdfbecebe7141ef2d086d7b049530d11ce2

Former-commit-id: 3c7ad386ed [formerly a7258dd8f6 [formerly 59a9aeabf0] [formerly 3c7ad386ed [formerly c2d5beba2c9656d80851aee1a7beabe4807c14f6]]]
Former-commit-id: a7258dd8f6 [formerly 59a9aeabf0]
Former-commit-id: a7258dd8f6
Former-commit-id: 00cb6b91da
2013-08-08 09:56:35 -05:00
Richard Peter
adbc2df3da Merge "Issue #2077 Revise pixel size calculations. Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7" into development
Former-commit-id: f3ba33a84c [formerly 88a9f32aab [formerly e412320b39] [formerly f3ba33a84c [formerly ef55eddb22b9f50dc06496502e66ff170c603493]]]
Former-commit-id: 88a9f32aab [formerly e412320b39]
Former-commit-id: 88a9f32aab
Former-commit-id: 85e950e286
2013-08-08 09:52:25 -05:00
David Gillingham
6c4aed582d Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: f839ef6f3b [formerly 6471edab78 [formerly 20e0f4b756] [formerly f839ef6f3b [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]]
Former-commit-id: 6471edab78 [formerly 20e0f4b756]
Former-commit-id: 6471edab78
Former-commit-id: ec00fa0cf8
2013-08-08 09:41:33 -05:00
Max Schenkelberg
c2cde3db0d Issue #2190 removed non-existent .so from meteolib build.properties
Change-Id: I40ff45473518215375ace9fbdcd9a8e416ddb438

Former-commit-id: 7ed0b6c5f8 [formerly 48dd7a6ca7 [formerly f587206b84] [formerly 7ed0b6c5f8 [formerly 006ea8d18d40c8fb147e4970a1032f0f6efa3cfc]]]
Former-commit-id: 48dd7a6ca7 [formerly f587206b84]
Former-commit-id: 48dd7a6ca7
Former-commit-id: e14aaef0e4
2013-08-08 09:15:05 -05:00
Ben Steffensmeier
b33127eabc Issue #2077 Revise pixel size calculations.
Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7

Former-commit-id: 1bd7cc1097 [formerly 6e1c8c7208 [formerly 6c7d1d60a8] [formerly 1bd7cc1097 [formerly 99fa66319bfe07aa84276bd7f9f0817ed5868798]]]
Former-commit-id: 6e1c8c7208 [formerly 6c7d1d60a8]
Former-commit-id: 6e1c8c7208
Former-commit-id: fbb18fd8c0
2013-08-07 18:40:28 -05:00
Ben Steffensmeier
f1be8ff5d1 Issue #2235 Fix the build, hopefully.
Change-Id: I09466023c4d15921bc9b86e2d6f0958c1ff83539

Former-commit-id: 4b705b1436 [formerly 49a2b27ab1 [formerly 95c4e2d65d] [formerly 4b705b1436 [formerly 1545f57a99f47bd8dabb70235914bdaa14025b00]]]
Former-commit-id: 49a2b27ab1 [formerly 95c4e2d65d]
Former-commit-id: 49a2b27ab1
Former-commit-id: 49e1e56ec5
2013-08-07 17:15:06 -05:00
Nate Jensen
c79b83981a Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: be9315642b [formerly 8968389383 [formerly ec01e6e872] [formerly be9315642b [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]]
Former-commit-id: 8968389383 [formerly ec01e6e872]
Former-commit-id: 8968389383
Former-commit-id: 0aab8a628a
2013-08-07 16:44:30 -05:00
Greg Armendariz
f4159f713a Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 6b1989cb29 [formerly d1fb06feb7 [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]
Former-commit-id: d1fb06feb7 [formerly ecc9f77f42]
Former-commit-id: d1fb06feb7
Former-commit-id: 7398504d85
2013-08-07 14:46:30 -05:00
Greg Armendariz
8bdfcf9bff Merge "Issue #2190 attempt to fix build" into development
Former-commit-id: c588a5ce7e [formerly 430dd1bb43 [formerly 614a9a5ca0] [formerly c588a5ce7e [formerly 3cf79c8f9e9391b4bac3d6dba05570eb9a1cedfc]]]
Former-commit-id: 430dd1bb43 [formerly 614a9a5ca0]
Former-commit-id: 430dd1bb43
Former-commit-id: cbd270b486
2013-08-07 14:41:37 -05:00
Nate Jensen
117b967519 Issue #2190 attempt to fix build
Change-Id: I733289250b318c81134bacb676837b36b67fb6c6

Former-commit-id: d1e2274f46 [formerly 88cefe228a [formerly f56bb10cb2] [formerly d1e2274f46 [formerly 9e6ca01815f880282ec87fdce72d108131039f2e]]]
Former-commit-id: 88cefe228a [formerly f56bb10cb2]
Former-commit-id: 88cefe228a
Former-commit-id: 6cade095f9
2013-08-07 14:15:50 -05:00
Ron Anderson
be4ff73519 Merge "Issue #2235 Added Caching version of TopoQuery. Change-Id: I0e17028921faa40e85134c79074655900bd8358c" into development
Former-commit-id: 0a9068e6d3 [formerly 896b5333d1 [formerly 216b2a5c86] [formerly 0a9068e6d3 [formerly 4e9a02fcd4931d2a26b10b3e695a7fa99d1ef972]]]
Former-commit-id: 896b5333d1 [formerly 216b2a5c86]
Former-commit-id: 896b5333d1
Former-commit-id: 17ed074c5e
2013-08-07 14:05:36 -05:00
Greg Armendariz
cccf0d6f34 13.5.1-11 baseline
Former-commit-id: 4ec04083bd [formerly c402dbf6e9 [formerly ea7b22500e] [formerly 4ec04083bd [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]
Former-commit-id: c402dbf6e9 [formerly ea7b22500e]
Former-commit-id: c402dbf6e9
Former-commit-id: 814f7fdcdd
2013-08-07 14:34:27 -04:00
Greg Armendariz
7da9205d7c 13.5.1-10 baseline
Former-commit-id: acf7ced37b [formerly e276b0fabe [formerly 852455843f] [formerly acf7ced37b [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]
Former-commit-id: e276b0fabe [formerly 852455843f]
Former-commit-id: e276b0fabe
Former-commit-id: 9694f9390a
2013-08-07 14:14:46 -04:00
Nate Jensen
b854e26da8 Issue #1561 more efficient query of GFE files
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9

Former-commit-id: 5c7dc36583 [formerly 04e78d5a64 [formerly cdfea29b16] [formerly 5c7dc36583 [formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]]
Former-commit-id: 04e78d5a64 [formerly cdfea29b16]
Former-commit-id: 04e78d5a64
Former-commit-id: 86d32ce3e0
2013-08-07 13:12:48 -05:00
Ben Steffensmeier
e20b1b25a4 Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: b06171b4f2 [formerly 74a5f09cd1 [formerly f0ceddacf1] [formerly b06171b4f2 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]]
Former-commit-id: 74a5f09cd1 [formerly f0ceddacf1]
Former-commit-id: 74a5f09cd1
Former-commit-id: 42c551bb7a
2013-08-07 12:08:13 -05:00
Ben Steffensmeier
31ec3b487c Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c

Former-commit-id: 2a51ddd697 [formerly f9cd8457bc [formerly 2ecba23bb9] [formerly 2a51ddd697 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]]
Former-commit-id: f9cd8457bc [formerly 2ecba23bb9]
Former-commit-id: f9cd8457bc
Former-commit-id: fb3a11161a
2013-08-06 18:27:21 -05:00
Nate Jensen
e88d16e545 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: 27dd27a73f [formerly 960dc1e81e [formerly a1a9a4751a] [formerly 27dd27a73f [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]
Former-commit-id: 960dc1e81e [formerly a1a9a4751a]
Former-commit-id: 960dc1e81e
Former-commit-id: 6d7d504f20
2013-08-06 17:17:53 -05:00
Richard Peter
d221aed878 Merge "Issue #2142 fix logback ingest config" into development
Former-commit-id: 883f450f28 [formerly 91bef56489 [formerly a229fd3abb] [formerly 883f450f28 [formerly 3deb3b03c2ab71ce00b1bf465bae6139e462c39e]]]
Former-commit-id: 91bef56489 [formerly a229fd3abb]
Former-commit-id: 91bef56489
Former-commit-id: 47ccb5664c
2013-08-06 14:23:41 -05:00
Nate Jensen
ee7256cad9 Issue #2142 fix logback ingest config
Change-Id: I7b50e76bea11eff68cc29930faa1cd1443558a70

Former-commit-id: ac3071cc0a [formerly 7aecba7abe [formerly f756c0039a] [formerly ac3071cc0a [formerly f191176549581689ac20b62a2033c19264aaa8df]]]
Former-commit-id: 7aecba7abe [formerly f756c0039a]
Former-commit-id: 7aecba7abe
Former-commit-id: 3cbbe0c45e
2013-08-06 14:22:15 -05:00
Richard Peter
bcddbfba9f Merge "Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup" into development
Former-commit-id: a91d535a99 [formerly d6ac029070 [formerly 6eb59502f8] [formerly a91d535a99 [formerly 14e07542613348b91e60baa914cdffe1b936d9d7]]]
Former-commit-id: d6ac029070 [formerly 6eb59502f8]
Former-commit-id: d6ac029070
Former-commit-id: 4158d57607
2013-08-06 14:21:53 -05:00
Nate Jensen
86a8b4a193 Merge "Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage" into development
Former-commit-id: e7949c04ad [formerly fb6b9a8b42 [formerly 0bf9eed643] [formerly e7949c04ad [formerly 311a4e792edd9c1a83fe2debfee1a00e43f12807]]]
Former-commit-id: fb6b9a8b42 [formerly 0bf9eed643]
Former-commit-id: fb6b9a8b42
Former-commit-id: 746a96fd40
2013-08-06 14:14:27 -05:00
Richard Peter
a22a021ede Merge "Issue #2221 - Changes to have select configuration files for retention and case creation." into development
Former-commit-id: 301556213a [formerly 87ecd93a4b [formerly d6041529db] [formerly 301556213a [formerly 99422acbda91c8f499af9c4ae57b136a1469fdfa]]]
Former-commit-id: 87ecd93a4b [formerly d6041529db]
Former-commit-id: 87ecd93a4b
Former-commit-id: d6daa8baf3
2013-08-06 12:46:32 -05:00
Max Schenkelberg
790f04d5dd 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: a18686135c [formerly 7f4b63283d [formerly dda69d36b7] [formerly a18686135c [formerly 2e52921b21ecaeaa11be8277e264446686d65338]]]
Former-commit-id: 7f4b63283d [formerly dda69d36b7]
Former-commit-id: 7f4b63283d
Former-commit-id: 9d590ce7f9
2013-08-06 12:37:52 -05:00
Nate Jensen
d9b1c9ba2e Issue #2142 fix logback config
Change-Id: I6e708cb251f6e4564ede0ba90f2cd906eb16a998

Former-commit-id: 148153eddf [formerly ef55df925d [formerly 05eba98d50] [formerly 148153eddf [formerly a200e86f382e532c1b60c907b4a0b00d80688917]]]
Former-commit-id: ef55df925d [formerly 05eba98d50]
Former-commit-id: ef55df925d
Former-commit-id: 2c4734ce54
2013-08-06 11:39:34 -05:00
Benjamin Phillippe
e9847daadf Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup
Change-Id: I0f4eafb3fa68f2d1eeade4f047c95d714502cf56

Former-commit-id: 5bd0d92363 [formerly 01466d0624 [formerly 73fd5ac852] [formerly 5bd0d92363 [formerly 2aa7bdc1a8a942eaa0589527e8987b6fc518479f]]]
Former-commit-id: 01466d0624 [formerly 73fd5ac852]
Former-commit-id: 01466d0624
Former-commit-id: 065a80e21f
2013-08-06 11:13:01 -05:00
Richard Peter
12d52d76b6 Merge "Issue #2228 use TMemoryInputTransport for slight efficiency improvement" into development
Former-commit-id: a6cccde03f [formerly fd739709d5 [formerly 7a1c02eac8] [formerly a6cccde03f [formerly 1fe04ca5037355f11d0deab7ebcc27b84e0a337b]]]
Former-commit-id: fd739709d5 [formerly 7a1c02eac8]
Former-commit-id: fd739709d5
Former-commit-id: 329f6f394a
2013-08-06 10:09:50 -05:00