Richard Peter
|
5e5047cc4f
|
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: e1aa1aa51e2325b005604aa971e842bccfcd8375
|
2013-08-14 15:23:18 -05:00 |
|
Greg Armendariz
|
ea7b22500e
|
13.5.1-11 baseline
Former-commit-id: 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f
|
2013-08-07 14:34:27 -04:00 |
|
Nate Jensen
|
8d1e19f2df
|
Issue #2208 moving edex unit tests to tests project
Change-Id: I9189ebd225df930d021855c19d338e74af800702
Former-commit-id: 37c1d3c5b1a60260a537951c8a4bbceef4204029
|
2013-07-25 12:29:46 -05:00 |
|
Richard Peter
|
15d1a6eab0
|
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: 293586df88f53c2ddf6f7586bf71719298728022
|
2013-07-22 09:40:18 -05:00 |
|
Steve Harris
|
bf58a81b38
|
13.5.1-7 baseline
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
|
2013-07-18 12:07:22 -04:00 |
|
Nate Jensen
|
5264d3a5b8
|
Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15
Former-commit-id: e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2
|
2013-07-18 09:53:53 -05:00 |
|
Max Schenkelberg
|
63421a4819
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
|
2013-07-15 14:26:15 -05:00 |
|
Greg Armendariz
|
492f92ef7b
|
13.5.1-5 baseline
Former-commit-id: e0157ab61ca5f2a62d78993a27893778fa119c4f
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
70e4ff30a6
|
13.5.1-4 baseline
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
|
2013-06-28 09:46:25 -04:00 |
|
Nate Jensen
|
81fc4fa753
|
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: 65a84967aa3afcef1f287fb769fd80f9dbf25349
|
2013-06-19 10:16:06 -05:00 |
|
Steve Harris
|
adb779323d
|
13.5.1-2 baseline
Former-commit-id: 36f4554f8f80812a5ffa0d243fe1a4ad6e330192
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
998961612c
|
13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
571757b2a6
|
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: 43499d1a76f65804a5e74894cad3186765de3501
|
2013-06-06 15:46:23 -05:00 |
|
Steve Harris
|
c749e122eb
|
13.4.1-14 baseline
Former-commit-id: 0e4ca3ea4159ea0256e22f9814f0de85180a41fb
|
2013-06-06 15:15:27 -04:00 |
|
Nate Jensen
|
f3258e77f7
|
Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: b0ad25ccd9e20b6bf994a3a46ce38298c363adff
|
2013-05-29 16:19:28 -05:00 |
|
Nate Jensen
|
99b4a21414
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: b7b619e1a3a85ac8c5f22a36317e22e15ad557a2
|
2013-05-29 14:49:43 -05:00 |
|
Nate Jensen
|
1978133177
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: a9330ce9247b05a0044778aeea46e0e986f05f2d
|
2013-05-23 11:20:40 -05:00 |
|
Nate Jensen
|
d74936ef3e
|
Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: 90397159ef98097da0754a846d1f67d4839a300d
|
2013-05-23 10:06:28 -05:00 |
|
Nate Jensen
|
08b9ce4c62
|
Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158
Former-commit-id: 61921c6a5d4ae8d7e6b2546a11fb7407f780830f
|
2013-05-14 16:16:13 -05:00 |
|
Richard Peter
|
a12830f762
|
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: 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e
|
2013-05-13 17:11:05 -05:00 |
|
Steve Harris
|
4c6ff79e71
|
13.4.1-7 baseline
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
|
2013-05-13 12:58:10 -04:00 |
|
Ben Steffensmeier
|
4209e014d8
|
Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 7fd2829cd730562a549a2f3c423ac5ead15872e7
|
2013-05-08 18:39:25 -05:00 |
|
Steve Harris
|
0be473728a
|
13.3.1-12 baseline
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
9cdd90e382
|
13.3.1-11 baseline
Former-commit-id: 81effd422de0285d345ebfd5c472c924ce261815
|
2013-03-25 13:20:03 -05:00 |
|
Steve Harris
|
3a4c7931e1
|
13.3.1-6 baseline
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
a89221c75b
|
13.3.1-5 baseline
Former-commit-id: 97fafc60d9327ab3ea3f72266113c8f5e122a275
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
f81b382c04
|
13.2.1-8 baseline
Former-commit-id: f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669
|
2013-02-18 09:09:41 -06:00 |
|
Steve Harris
|
7435527b25
|
13.2.1-3 baseline
Former-commit-id: ba03739c3528638c5383528fd64674ae5af1ed64
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
8e5f9e0e6c
|
13.1.2-6 baseline
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
c0c1d56f3a
|
13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
e8e41630e8
|
12.12.1-12 baseline
Former-commit-id: ae5110532f5ac5c7842a5483a8e2c3dc299ae814
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
d3497e47eb
|
12.11.1-4 baseline
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
c12ee14e66
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: da126f587a1e3761dbe16ee2a41aee0caba85bfc
|
2012-10-08 13:26:20 -05:00 |
|
Steve Harris
|
791ef6cedf
|
12.10.1-4 baseline
Former-commit-id: ce574eeff1d197862c8aac2d3fc838a452862576
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
61f269f54c
|
12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
fd2abfb6f1
|
12.8.1-5 baseline
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
16bf591a33
|
12.7.1-8 baseline
Former-commit-id: 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
2c0ff851ca
|
12.6.1-9 baseline
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
b13cbb7e00
|
12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
67a5a68300
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
4068f5295f
|
12.3.1-10 baseline
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
|
2012-03-30 08:38:33 -05:00 |
|
Matt Nash
|
66be3bec40
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
9f19e3f712
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|