Commit graph

200 commits

Author SHA1 Message Date
Ron Anderson
dc714d7260 Issue #1571 Refactored GFE to store GridParmInfo and ParmStorageInfo in PostGres
Change-Id: Iae7cf49fc18abf03ef3b0ee498fb8e658f37d1cf

Former-commit-id: 3de94947e0 [formerly 3fd2f523d9] [formerly 04d2fdc214] [formerly 3de94947e0 [formerly 3fd2f523d9] [formerly 04d2fdc214] [formerly 5aee6f35ff [formerly 04d2fdc214 [formerly 3094dc247a6de94ff00321d093b431e3f401b0c5]]]]
Former-commit-id: 5aee6f35ff
Former-commit-id: c17e493249 [formerly 06cbd815be] [formerly 288c866bff4b051e23f64443aa754d46ba800e69 [formerly f0fb2391af]]
Former-commit-id: 0a37062489f09181fd87da2090b4049989f9632f [formerly ddf03d171e]
Former-commit-id: 7928912dc5
2013-08-20 17:16:21 -05:00
Richard Peter
7775ed3e03 Issue #2214: Fix merge issue with gfe-spring.xml
Former-commit-id: e5cb3f9e0a [formerly 2064be203d] [formerly eb8805e51c] [formerly e5cb3f9e0a [formerly 2064be203d] [formerly eb8805e51c] [formerly dad1b6fb45 [formerly eb8805e51c [formerly 346de47492d79ea1a2605fa3a02bc5058f2b8e9e]]]]
Former-commit-id: dad1b6fb45
Former-commit-id: 24f8756c64 [formerly bbe1002d2d] [formerly cb3e15e4ac897a4a2e865c445de30e1e35aa445f [formerly c799d73430]]
Former-commit-id: 30a7e16fcc217a4db3ce6d7a8d94a5a6e0494a27 [formerly b09a191bfc]
Former-commit-id: c27aa3bd98
2013-08-14 18:32:39 -05:00
Richard Peter
e6a36eb12a Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]]
Former-commit-id: 2a9276c728
Former-commit-id: 84bef1f2ec [formerly c0b0eef331] [formerly 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f]]
Former-commit-id: 45b98e41300d826058702743e6eeb0852aa1ad89 [formerly 9cf5e247ab]
Former-commit-id: 42c78326f1
2013-08-14 15:23:18 -05:00
Steve Harris
a700182250 13.5.1-15 baseline
Former-commit-id: b05abcaec0 [formerly 535218c676] [formerly 53e96e21db] [formerly b05abcaec0 [formerly 535218c676] [formerly 53e96e21db] [formerly c6dc1817e7 [formerly 53e96e21db [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 6f1b6d494f [formerly 4f9288e7c1] [formerly c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58]]
Former-commit-id: 813df6d93357ffbcdd78c9658dc75c9aaa803d60 [formerly 9ea3f0c215]
Former-commit-id: d0be6956e9
2013-08-14 10:24:26 -04: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
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
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
Ron Anderson
b08a7843c3 Issue #2057 Added support for marking obsolete databases for later removal.
Change-Id: Ie1859e08c7a0305f3ea7bc82e726dd8ba1658b1a

Former-commit-id: 54c09d83c9 [formerly fa3640fb11] [formerly b84a946f86] [formerly 54c09d83c9 [formerly fa3640fb11] [formerly b84a946f86] [formerly 2a0c77eb5c [formerly b84a946f86 [formerly db55eb737e5b7a82dec8f585eabda455717321a2]]]]
Former-commit-id: 2a0c77eb5c
Former-commit-id: 4c2e248897 [formerly 4b2660c2c4] [formerly be348fb8b5aa3bf05312f7ba0bbea72ba9aa1a18 [formerly f54129bbda]]
Former-commit-id: 9653cbb4361d4f025b3236871f1d7dd2be04ea71 [formerly 648e17e9e0]
Former-commit-id: eabd25e221
2013-07-31 17:38:09 -05:00
Ron Anderson
08da44e136 Issue #2044 Fix topo retrieval in ifpnetCDF
Change-Id: I3e15f9ed8a5e7577332fade9cfabeb9734fd1d20

Former-commit-id: 2ec3c5eb95 [formerly d850a79cbd] [formerly 807b4ee431] [formerly 2ec3c5eb95 [formerly d850a79cbd] [formerly 807b4ee431] [formerly f6f19065e6 [formerly 807b4ee431 [formerly 9bacbf50094476cfb01be5b9ae1f535ca4afd1c9]]]]
Former-commit-id: f6f19065e6
Former-commit-id: 72f4e4f14f [formerly 754e521085] [formerly efa321e63a18527d354b11a2b5486ade82a7fce3 [formerly e5551d529a]]
Former-commit-id: 01883b98514926168430c3b3bf9783e276542c3e [formerly 59924c01b5]
Former-commit-id: 26e98bdc0b
2013-07-25 18:14:38 -05:00
Ron Anderson
5fcf50976f Merge "Issue #2044 Refactor of GFE Server code" into development
Former-commit-id: d31300ae2d [formerly b3619c1ba4] [formerly 604cfd2070] [formerly d31300ae2d [formerly b3619c1ba4] [formerly 604cfd2070] [formerly 0428b8fb7b [formerly 604cfd2070 [formerly 3720bf498346073343d0dff7a6949d3f7f0d5f62]]]]
Former-commit-id: 0428b8fb7b
Former-commit-id: 8f1392adb2 [formerly 9e10143fb2] [formerly fdede04caaf020efc425615ddb25f1baf3096304 [formerly b084626454]]
Former-commit-id: 518fb9e06a2a1cc7e3c87159590a2757a57c6e93 [formerly 68de87a472]
Former-commit-id: 584e4946f9
2013-07-25 13:59:17 -05:00
Ron Anderson
cd69e79fa3 Issue #2044 Refactor of GFE Server code
Change-Id: I2c6dde3ba9646f6b36a3f74657dc0d21cbcf3f35

Former-commit-id: e97351d981 [formerly d32f777957] [formerly cfa2d38a32] [formerly e97351d981 [formerly d32f777957] [formerly cfa2d38a32] [formerly a915cdab25 [formerly cfa2d38a32 [formerly 03c62b606659be0cf81c8401a1c52c5fe5c52b1b]]]]
Former-commit-id: a915cdab25
Former-commit-id: 57332aa94a [formerly a40cde69de] [formerly 050757a603a935e3e7b340b3f32becba5adb5f15 [formerly 46d47d61e7]]
Former-commit-id: 2e1838b83b3b0dea8269e3ceb154fdb3796eb058 [formerly 7c0b176b9d]
Former-commit-id: 13e808b34d
2013-07-25 13:05:56 -05:00
Nate Jensen
2cfedda23c Issue #2208 moving edex unit tests to tests project
Change-Id: I9189ebd225df930d021855c19d338e74af800702

Former-commit-id: 4b14026435 [formerly 2103294b75] [formerly 8d1e19f2df] [formerly 4b14026435 [formerly 2103294b75] [formerly 8d1e19f2df] [formerly 15fae243c9 [formerly 8d1e19f2df [formerly 37c1d3c5b1a60260a537951c8a4bbceef4204029]]]]
Former-commit-id: 15fae243c9
Former-commit-id: 8daa0c9ae8 [formerly be35d04928] [formerly 4d4ce0a9603f247eb573e5562887a5ae4518d04d [formerly fd38b63609]]
Former-commit-id: 68e6249f0a095eac8ca13dc66d427b00a6b0a310 [formerly 52dfbc9f9f]
Former-commit-id: 820150deb3
2013-07-25 12:29:46 -05:00
Richard Peter
1d08e54d43 Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: 4c53471f8e [formerly e7ec068c7e] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]]
Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b]
Former-commit-id: 2a9cfe51af
2013-07-22 09:40:18 -05:00
Nate Jensen
2ac94b1152 Issue #2032 moving localization edex_static files to respective plugins, except colormaps
Change-Id: I287fe0a7d44782dc45265a9ffe2312549d95edbf

Former-commit-id: 3d226c0e69 [formerly 2ee87452db] [formerly da311b00a8] [formerly 3d226c0e69 [formerly 2ee87452db] [formerly da311b00a8] [formerly b7ea2ae30b [formerly da311b00a8 [formerly 69c812bb8f03844333497feba62951fbdcbc9e2b]]]]
Former-commit-id: b7ea2ae30b
Former-commit-id: e0650650c9 [formerly 41d3e45e60] [formerly d21a0f2bca28d0f158a5d74da9f0d15c638ab7ac [formerly dce6c06174]]
Former-commit-id: 1adfa30cf69529b0b748acde939b453b7a7d7b49 [formerly b997f2a670]
Former-commit-id: 6d7658e02e
2013-07-18 17:20:27 -05:00
Steve Harris
adf2f89d57 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b [formerly cb50a0028d] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00
Nate Jensen
2d6737f52c Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15

Former-commit-id: 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly b767760a9c [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]]
Former-commit-id: b767760a9c
Former-commit-id: 0509e362b9 [formerly 93713d9698] [formerly 85f35fc0d31289c55393eeee4cf0917b4eabadb0 [formerly c77936c6c0]]
Former-commit-id: 0d2fa08b78da80bd2050c50580bfb6d7564771fc [formerly 175a28da9a]
Former-commit-id: 06502f57ef
2013-07-18 09:53:53 -05:00
Max Schenkelberg
ad32bbd91d Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04 [formerly d1881ffa51] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f]
Former-commit-id: 5ba50b4476
2013-07-15 14:26:15 -05:00
Matt Nash
09e4900a66 Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things
Change-Id: I025fb4b799193478250b61bc492e5b0dbdfd973d

Former-commit-id: e41b83f7fb [formerly d2e5e7284a] [formerly 0470e7531a] [formerly e41b83f7fb [formerly d2e5e7284a] [formerly 0470e7531a] [formerly 3939a15ff9 [formerly 0470e7531a [formerly 894f51376ba69365192ad0b9c5dd19c9cfba4e5c]]]]
Former-commit-id: 3939a15ff9
Former-commit-id: 10dd336a9a [formerly 388c2b5b13] [formerly 489cbf67d681e142ef6ece3175ed698665d35b62 [formerly 8bb5a46772]]
Former-commit-id: 2736d4159ada8d436e94524bda62b3c4fcc015bf [formerly 2003f89be3]
Former-commit-id: caec447a3e
2013-07-11 13:32:26 -05:00
Steve Harris
9f5469bc6e 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Richard Peter
f6e6c3c531 Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]]
Former-commit-id: b007d4a302
Former-commit-id: bf6e4c1f71 [formerly e03283ad4a] [formerly e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb]]
Former-commit-id: 1de9b6af0b5cf07a5ce19b7ea696b742fc341cd8 [formerly 8f49eea08f]
Former-commit-id: ed15c2edcc
2013-06-24 18:51:56 -05:00
Richard Peter
7ef16a186e Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]]
Former-commit-id: 37645245e5
Former-commit-id: 46ee2f5dd7 [formerly be094a1745] [formerly 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]]
Former-commit-id: cacc5fb146cf2c652dd6ad6ea3b7938c9d320b73 [formerly 4b582fef50]
Former-commit-id: 9acddf6eeb
2013-06-24 18:36:15 -05:00
Steve Harris
d3517d7c1d 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0 [formerly deebdb874a] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5]
Former-commit-id: 50d4376af7
2013-06-24 09:29:43 -04:00
Nate Jensen
d2ef59e9ad Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6

Former-commit-id: 5eef22fd4d [formerly c0f95eb55a] [formerly 81fc4fa753] [formerly 5eef22fd4d [formerly c0f95eb55a] [formerly 81fc4fa753] [formerly c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]]
Former-commit-id: c4283b0336
Former-commit-id: ff64bf589b [formerly afae330d8a] [formerly 162242a2ebbd7afb05bf3ea77dffd622f7190412 [formerly a9c077f0a9]]
Former-commit-id: 9cbc7ddc24e78fbf205d00560788cdfa1249462a [formerly 73c0514c3d]
Former-commit-id: 8091cae89d
2013-06-19 10:16:06 -05:00
Steve Harris
740f6fb8e0 Merge branch 'omaha_13.5.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

Former-commit-id: ba02238047 [formerly 12248cade1] [formerly 43316cbff9] [formerly ba02238047 [formerly 12248cade1] [formerly 43316cbff9] [formerly 532d41787b [formerly 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]]
Former-commit-id: 532d41787b
Former-commit-id: 324532d6ac [formerly 251b3c1a9e] [formerly 1097d923e604a9a76d2ffe48161cb8324d205346 [formerly cb3e34813f]]
Former-commit-id: 67413e3c272a714fa394b7a22d2e55375f160635 [formerly 316d2ec667]
Former-commit-id: 01dee712d5
2013-06-17 15:29:01 -05:00
Steve Harris
173bcd08e1 Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts (self-resolved with kdiff3):
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java


Former-commit-id: dadf03acaf [formerly 41748175b6] [formerly 97631f9c62] [formerly dadf03acaf [formerly 41748175b6] [formerly 97631f9c62] [formerly 40359c27c3 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]]
Former-commit-id: 40359c27c3
Former-commit-id: a5fb9b721d [formerly 0e4504c0fa] [formerly adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea]]
Former-commit-id: 1687a46a12349027ac3ffa219ac1d360a20b95bd [formerly 9c75ca8493]
Former-commit-id: c27136275f
2013-06-17 15:25:32 -05:00
Steve Harris
4d75e573f4 13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]]
Former-commit-id: 3386330894
Former-commit-id: 0f83e19dab [formerly ccd66c0724] [formerly ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]]
Former-commit-id: 9e1fb182b15a5170eec651f5840744e66e08f619 [formerly 332a74c4de]
Former-commit-id: afc02d5731
2013-06-17 15:01:22 -04:00
Bryan Kowal
d73d4d9216 Issue #1924 - standardize build.properties files
Former-commit-id: ab045a7ce1 [formerly 874c93146c] [formerly cebb5f8d5f] [formerly ab045a7ce1 [formerly 874c93146c] [formerly cebb5f8d5f] [formerly ec78ee1838 [formerly cebb5f8d5f [formerly 739e93988616fefbb235ab3e023b7a7e0394b5e9]]]]
Former-commit-id: ec78ee1838
Former-commit-id: f951c5d78a [formerly 78c52ebb5a] [formerly 97bb0430a3e680ec6666816e15471172d37a62ca [formerly c5c6d1d4d4]]
Former-commit-id: 8faa4e0bc6eec75218489a470d33cdc82b4353ce [formerly fb1cbdebfa]
Former-commit-id: ec5cbd0a49
2013-06-13 16:04:18 -05:00
Steve Harris
97a4c59662 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Steve Harris
f3ba607c69 Merge branch 'omaha_13.4.1' into development
Conflicts:
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java

Former-commit-id: a150d8b90b [formerly 64cf1aedb1] [formerly 571757b2a6] [formerly a150d8b90b [formerly 64cf1aedb1] [formerly 571757b2a6] [formerly 2327205cb7 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]]
Former-commit-id: 2327205cb7
Former-commit-id: 78f0921f63 [formerly 8b78f538d3] [formerly bfd7bfea914d41fc958828fa95730a334190b2e1 [formerly 035d74b348]]
Former-commit-id: 5ebd8157d1a24184df8083fedec285c5bce096ea [formerly abfd0b9ead]
Former-commit-id: 18fdb31920
2013-06-06 15:46:23 -05:00
Steve Harris
c57686831a 13.4.1-14 baseline
Former-commit-id: ffcce90f3f [formerly be236eb722] [formerly c749e122eb] [formerly ffcce90f3f [formerly be236eb722] [formerly c749e122eb] [formerly 18b90226a2 [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]]
Former-commit-id: 18b90226a2
Former-commit-id: f7316ae4bd [formerly cebc1ddb63] [formerly a7fc76319d4a743a6f6c8fc92e7f97e543ca980f [formerly dee685e3c7]]
Former-commit-id: 1e747c10c7b7049ff47d3fe068c65055d7ab4a0e [formerly 8ec7524cbb]
Former-commit-id: d46b0413fb
2013-06-06 15:15:27 -04:00
David Gillingham
8c20759dbc Issue #2063: Improve performance of grid blanking in iscMosaic by only retrieving history data, not entire grid slices.
Change-Id: Icd25e7e54a391ca19445be866e411b35aed54b16

Former-commit-id: 5e53c3f0bd [formerly 51b317ac52] [formerly 9acf385f21] [formerly 5e53c3f0bd [formerly 51b317ac52] [formerly 9acf385f21] [formerly bad6a1fa40 [formerly 9acf385f21 [formerly 5570ee749c5797f8f2c9ab3f6f8392d2c5680d32]]]]
Former-commit-id: bad6a1fa40
Former-commit-id: 8ade43a3dc [formerly 5fe4739fc4] [formerly 71dde9577d001c57231eb1ddf6cca6a71e302a55 [formerly 070365714a]]
Former-commit-id: fadd22c5d4872ae77dc005477bc25d862c93c583 [formerly 8199019e54]
Former-commit-id: ce5c51d360
2013-06-05 16:26:04 -05:00
Richard Peter
ba88ac2d5c Merge branch 'omaha_13.4.1' (13.4.1-13) into development
Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
	tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java

Former-commit-id: c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: a8780f26b5 [formerly 9c3fe01efa] [formerly 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad]]
Former-commit-id: 21adb9c78d59896133d2b3efcbf7dcafb108064e [formerly 13f64a7da8]
Former-commit-id: 22f6319986
2013-06-04 14:06:53 -05:00
David Gillingham
8eafbcd92f Issue #1759: Add a more detailed comment in code for previous change.
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e

Former-commit-id: 483665612d [formerly 3ec84b8f18] [formerly 5b9094275d] [formerly 483665612d [formerly 3ec84b8f18] [formerly 5b9094275d] [formerly a11ef45913 [formerly 5b9094275d [formerly 76fd66783565677c99006dd7c2b7628acd61c2a3]]]]
Former-commit-id: a11ef45913
Former-commit-id: eb61d6b8e3 [formerly b77e978008] [formerly 1384cb8b21573990393d2c5eb79b38dc399186fa [formerly 593a5fcbed]]
Former-commit-id: fc9477544adacdd081d02a3a802e8329734ab052 [formerly db859cfe86]
Former-commit-id: c3cdfa4293
2013-05-31 12:25:19 -05:00
David Gillingham
9f86529f94 Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path.
Change-Id: I8ce909536174192217f5ba228af24cca08796c7b

Former-commit-id: 6fe3ffa07e [formerly 88eed9bc17] [formerly 3ccf091c44] [formerly 6fe3ffa07e [formerly 88eed9bc17] [formerly 3ccf091c44] [formerly cab1c849bf [formerly 3ccf091c44 [formerly 6ebf8b354145cac21458617b9bb4cdcbedeff7e7]]]]
Former-commit-id: cab1c849bf
Former-commit-id: e4626b7534 [formerly 912212b953] [formerly c70bfb52dbc0daf601b003261f6af93be9c8e983 [formerly df9c5492c8]]
Former-commit-id: 3ec56baf9412693f3e3e2e387ae597846f5dfbbb [formerly 06bfd0413c]
Former-commit-id: ca548953d2
2013-05-31 10:42:51 -05:00
Steve Harris
7e31d1a9a1 13.4.1-13 baseline
Former-commit-id: 9a7ef48967 [formerly e3b8086bd0] [formerly 87b9712009] [formerly 9a7ef48967 [formerly e3b8086bd0] [formerly 87b9712009] [formerly de476791fb [formerly 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]]
Former-commit-id: de476791fb
Former-commit-id: 70ecafa237 [formerly 418f8aef56] [formerly 0455657ac09be5391a236a0b109f8e55687afaa3 [formerly b58cf237bf]]
Former-commit-id: 28cd3469f8ef78216f243c61430c36c1ad67dd52 [formerly c9155c1631]
Former-commit-id: 176f4d392f
2013-05-29 16:30:09 -04:00
Nate Jensen
88f9c45cf0 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: 3a41ae85b4 [formerly b025262dc1] [formerly d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]]
Former-commit-id: 080efd3540895c64fe9887513267aae9011cea8d [formerly 4eb941dacb]
Former-commit-id: e4bbe70d57
2013-05-29 14:49:43 -05:00
Nate Jensen
8777604fdd Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: 768a7dad60 [formerly 452858b86f] [formerly db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]]
Former-commit-id: 4de98fe7068aa6e779321f9fb2a37687751247da [formerly 74081dd140]
Former-commit-id: f9d85ac8a9
2013-05-29 09:20:53 -05:00
Ron Anderson
bc0ece31ba Merge "Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest." into omaha_13.4.1
Former-commit-id: f9bedd3aec [formerly 1eb1cffa15] [formerly c0fffc630d] [formerly f9bedd3aec [formerly 1eb1cffa15] [formerly c0fffc630d] [formerly 57c452b085 [formerly c0fffc630d [formerly 339fa8409866f8464eebaf982cdbfc3ae37a8b6b]]]]
Former-commit-id: 57c452b085
Former-commit-id: 0462d29a0f [formerly 9cdf34184d] [formerly 782f51d6eb68810b024cac4035d52bed928b399f [formerly 59d823bf7b]]
Former-commit-id: f44b1ca1fcbc4a1a341f24d6e09c8b80575f1fa6 [formerly e33fd0c95f]
Former-commit-id: 3a44fb51ca
2013-05-23 12:12:39 -05:00
Nate Jensen
de2f575c94 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 3b56918970 [formerly a84a6fe6ae] [formerly f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]]
Former-commit-id: 897e2914605390b57d9f2b46e9b29f5c116a73d9 [formerly 9689640192]
Former-commit-id: eaaf8d1b8a
2013-05-23 11:20:40 -05:00
Nate Jensen
94c13665a9 Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: b8e6b1a083 [formerly 882296f823] [formerly c6fc510360ab5dfd2d963fcd65966cfc3d7993fa [formerly 91c8b9ac1d]]
Former-commit-id: ec0257ca11e61995af3a0f051f104254321c312f [formerly 0f319b9721]
Former-commit-id: 73290b1bb6
2013-05-23 10:06:28 -05:00
Steve Harris
6a5b97e11e Merge branch 'omaha_13.4.1' into development
Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]]
Former-commit-id: 3590310f17
Former-commit-id: d477564678 [formerly 389eefd1f9] [formerly 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d]]
Former-commit-id: 95db422c792e933bcfe1e19c2b8955eb8698bece [formerly c184d31779]
Former-commit-id: 61debd93bf
2013-05-22 16:13:08 -05:00
Steve Harris
32c2d3e5e9 Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]]
Former-commit-id: 462652e31e
Former-commit-id: a6bb8b38dd [formerly 026674d0b2] [formerly 19cf9a00ac458922c15640956ecdf8f46546e349 [formerly 299690a202]]
Former-commit-id: 1b7b8110c512177341c86e9272a2b79f0ae52bbb [formerly bd9b2e493e]
Former-commit-id: 6dbe80b1af
2013-05-22 16:10:04 -05:00
David Gillingham
6af35c977c Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest.
Change-Id: Ie9e58a139eed869a0483a475974ed4b733711bac

Former-commit-id: 63ea2808eb [formerly cf1f45d77f] [formerly 8e8d71dc2f] [formerly 63ea2808eb [formerly cf1f45d77f] [formerly 8e8d71dc2f] [formerly d5895e23c7 [formerly 8e8d71dc2f [formerly d6c6f3f9a6d7d37f22af82984d0d75937b4415cc]]]]
Former-commit-id: d5895e23c7
Former-commit-id: 82e61b31f6 [formerly 2e6f7c8250] [formerly 1cd8a6a6ca2d726353932c69d7adfc7def2761c1 [formerly 0e1135ac1f]]
Former-commit-id: f07ebe70943583bbe914ac2937013617e62bb895 [formerly 135ed9899f]
Former-commit-id: 8706da5f02
2013-05-22 15:48:32 -05:00
Steve Harris
cf67535a3a 13.4.1-12 baseline
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]]
Former-commit-id: e53ada66b8
Former-commit-id: fb41995981 [formerly b745b332ae] [formerly 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]]
Former-commit-id: 0563320c3a39f9ddb056e9b1876ed4108f818501 [formerly 0d9e71aee2]
Former-commit-id: 71e13c4d4d
2013-05-22 16:42:39 -04:00
David Gillingham
77ccf79293 Issue #1759: Fix regression to ISC request reply due to missing import.
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80

Former-commit-id: 511098fffd [formerly 2555cf9819] [formerly 5cba0f5e40] [formerly 511098fffd [formerly 2555cf9819] [formerly 5cba0f5e40] [formerly 801c659108 [formerly 5cba0f5e40 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]]
Former-commit-id: 801c659108
Former-commit-id: 60850d6f8a [formerly 1471a7fa34] [formerly 7464c78970ff1efe18387d6d2105db0eb2e2d4ad [formerly 60aeb71652]]
Former-commit-id: d28086240a58a1bd453231bbbeda47190441083b [formerly dca867b77c]
Former-commit-id: 016ea4ec14
2013-05-22 11:42:08 -05:00
Richard Peter
4a410e92b9 Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]]
Former-commit-id: a9869f07ba
Former-commit-id: f186912fe1 [formerly aff520d61b] [formerly fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]]
Former-commit-id: 597cb507dad744955c6d4c7e9004386c40c57fbc [formerly 969fa704e5]
Former-commit-id: fb910196c0
2013-05-17 10:33:18 -05:00
Steve Harris
202e373f01 13.4.1-9 baseline
Former-commit-id: 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]]
Former-commit-id: aff41713f9
Former-commit-id: 7d55d0e959 [formerly 67a95d07d2] [formerly b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd]]
Former-commit-id: a7c4bec32a032d07ef14566103e744b20ea31401 [formerly 3f87ea1a15]
Former-commit-id: 1730b6c41e
2013-05-16 11:12:07 -04:00
Steve Harris
4b1a9ad438 13.4.1-8 baseline
Former-commit-id: 02dba50c00 [formerly 576a74fe0b] [formerly 19866e7032] [formerly 02dba50c00 [formerly 576a74fe0b] [formerly 19866e7032] [formerly c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]]
Former-commit-id: c59b52a266
Former-commit-id: fddef92bf3 [formerly 5465764527] [formerly c60ffcebecebf9d637d3276980b24255a17f4079 [formerly a1c4cd2a39]]
Former-commit-id: 39606e2ce74e5380d44e132dd22716b3b06b5051 [formerly 395d21565f]
Former-commit-id: 5bdcf5c0a1
2013-05-14 09:21:41 -04:00
Richard Peter
dd2ceed4ae Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]]
Former-commit-id: c5040038d3
Former-commit-id: 994357c357 [formerly 6c09ab9bdf] [formerly 4a7cd13915319fef7cf3e6405d041ffee0348571 [formerly bcf4dcc810]]
Former-commit-id: 10a9ca07796d13205616f7696c5af614917400a1 [formerly f7470fbd8f]
Former-commit-id: c7755a649b
2013-05-13 17:11:05 -05:00
Steve Harris
a2c35a5f3f 13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]]
Former-commit-id: 8347bed50e
Former-commit-id: 6e1e454a9f [formerly ff7a21ac37] [formerly f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661]]
Former-commit-id: fa4cea9874a8ab4f41eefd7e3ce4a2ea2b2883b4 [formerly dffa6d3bdc]
Former-commit-id: c7c6ea343e
2013-05-13 12:58:10 -04:00