Commit graph

64 commits

Author SHA1 Message Date
Steve Harris
545d7ca463 Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: 15ce9171f199bb062ed1374d00ae842b77c1dc62
2013-10-14 09:28:24 -05:00
Steve Harris
c3d29c0fa0 13.5.2-10 baseline
Former-commit-id: 83863a9833f309203af0ee34d503bf280e596397
2013-10-14 09:59:31 -04:00
Steve Harris
f36cf09d21 13.5.2-9 baseline
Former-commit-id: 948fc5e8cbbb6fa563e871417e455638fcbe154f
2013-10-10 10:55:20 -04:00
Steve Harris
18325949fb 13.5.2-8 baseline
Former-commit-id: 6effdd3f5ce46910c89236306fa33499eada174f
2013-10-04 11:30:03 -04:00
Richard Peter
3a859792ae Merge branch 'omaha_13.5.2' (omaha_13.5.2-6) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml

Former-commit-id: 8b80beb42d0a76cd158857df7f497c6eff874fe1
2013-09-24 12:57:48 -05:00
Richard Peter
271a8d753e Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml

Former-commit-id: 14284eb34f246c2d283ecf4040996957d7117cd3
2013-09-24 12:29:16 -05:00
Nate Jensen
e50aa8d7d7 Merge "Issue #2368: Fix grib-decode.xml for future case" into omaha_13.5.1.1
Former-commit-id: cc0207ec34b50ec2331e1d469153fd29a7be22ae
2013-09-23 12:45:23 -05:00
Steve Harris
f578f90a0b 13.5.1.1-4 baseline
Former-commit-id: 128f9c8e0e2d3706c39e259170b049a6c234be4c
2013-09-23 10:29:32 -04:00
Steve Harris
06694a32ce 13.5.1.1-3 baseline
Former-commit-id: 5f5672a32c95941d8a75d55dc99859f1f9585167
2013-09-23 10:16:44 -04:00
Richard Peter
0e23b3749d Issue #2368: Fix grib-decode.xml for future case
Former-commit-id: e3109abc996557301b6c91773b6841e6dc22c272
2013-09-22 22:02:19 -05:00
Richard Peter
152d8654ef Issue #2368: Fix durable jms configurations
Change-Id: I0167e5f0dd5caea72c5f4220979fd9b55375b3c4

Former-commit-id: f611b9afdf541b5fa632fe27755a69f16b871f68
2013-09-18 21:20:54 -05:00
Richard Peter
a5a7816b98 Issue #2368: Update JMS routing to set message persistence and durability at the config level
Former-commit-id: 9ac3d2ddbeee7265b9b7879fcc6efcee95281872
2013-09-15 13:44:17 -05:00
Richard Peter
799fe37bca Issue #2298: Remove setPluginName python calls.
Former-commit-id: b666f99d3dc79b90525177072e2448077c39545a
2013-09-12 12:49:23 -05:00
Richard Peter
80e7b265dd Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: 0f939c3d1f89bf3463315528c1b47f5f49e2fa05
2013-09-12 12:48:36 -05:00
Steve Harris
58c6821427 13.5.2-4 baseline
Former-commit-id: da631849bc9eaaa5c83c2393520b6099413107a5
2013-09-12 11:13:59 -04:00
Steve Harris
9e4bf0cf2e 13.5.2-2 baseline
Former-commit-id: 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9
2013-08-29 15:01:29 -04:00
Steve Harris
542b2c3d18 13.5.2-1 baseline
Former-commit-id: a362ca91ee5972a1501a2842191fbe2e23feac9c
2013-08-28 09:43:48 -04:00
Greg Armendariz
b9044b1195 13.5.1-6 baseline
Former-commit-id: 30b8d4c0ce425715ea44a394b4b4f143c64b416a
2013-07-10 10:04:22 -04:00
Greg Armendariz
ea7ac37930 13.5.1-5 baseline
Former-commit-id: e0157ab61ca5f2a62d78993a27893778fa119c4f
2013-07-03 12:20:27 -04:00
Steve Harris
e197f23ce3 13.5.1-4 baseline
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Steve Harris
fe872355a7 13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
92152778b9 13.4.1-10 baseline
Former-commit-id: bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4
2013-05-20 10:52:47 -04:00
Steve Harris
c59b52a266 13.4.1-8 baseline
Former-commit-id: d130c847d4f9d0b491f9326c8b5140fb59174927
2013-05-14 09:21:41 -04:00
Steve Harris
8347bed50e 13.4.1-7 baseline
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
2013-05-13 12:58:10 -04:00
Steve Harris
16fe8cc5a2 13.4.1-6 baseline
Former-commit-id: f30c650b1c406889c38a5f82bbeda3605adbd9a5
2013-05-07 08:47:39 -04:00
Steve Harris
00332e6305 13.4.1-1 baseline
Former-commit-id: c03222bb480d87c05982b4d49f863e615b5b5584
2013-04-24 17:15:55 -05:00
Steve Harris
a3fe998f8f 13.3.1-17 baseline
Former-commit-id: 0eb0081dbf1af625ca75e98ab775247c924c3527
2013-04-01 12:04:56 -05:00
Steve Harris
aaac0b51e5 13.3.1-12 baseline
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Steve Harris
e12ed113ae 13.3.1-7 baseline
Former-commit-id: aa42eb84d41a7f0577ab8ce8555c0922833f96f1
2013-03-13 09:50:28 -05:00
Steve Harris
053156f02e 13.2.1-8 baseline
Former-commit-id: f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669
2013-02-18 09:09:41 -06:00
Steve Harris
a46e33f06e 13.2.1-6 baseline
Former-commit-id: 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb
2013-02-07 16:00:39 -06:00
Steve Harris
0d7f53b6f4 13.2.1-4 baseline
Former-commit-id: d4fd198979dbc5d77a6bf836685cb658e7ac6cfe
2013-01-31 11:40:31 -06:00
Steve Harris
328c6dccad 13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
c63f9bcae0 13.2.1-1 baseline
Former-commit-id: 6831a29efca54cfde39ab6a462f76ca2ac206f49
2013-01-23 11:13:03 -05:00
Steve Harris
86ea0b666e 13.1.2-10 baseline
Former-commit-id: 5a6d030d358519ca30fc37bf4a090a00557422a3
2013-01-18 10:37:25 -05:00
Steve Harris
59969775ad 13.1.2-6 baseline
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
2013-01-06 14:55:11 -06:00
Steve Harris
4ba416aeb3 13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
Steve Harris
28018b8d9b 12.12.1-10 baseline
Former-commit-id: 07d77ee5ca986f9762ec9c3276e8320e3f363ebc
2012-12-06 09:12:15 -06:00
Steve Harris
5093a7c442 12.12.1-8 baseline
Former-commit-id: 657c868c5e52717a6de00dc61892115d91ada1c4
2012-12-06 09:02:51 -06:00
Steve Harris
b3b5e6d28f 12.12.1-3 baseline
Former-commit-id: 8481c91f9918a61631198331c324c4c5a76aac0f
2012-11-13 17:27:04 -06:00
Steve Harris
e1498006c7 12.12.1-1 baseline
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Steve Harris
5c1f3cdc46 12.11.1-6 baseline
Former-commit-id: 18939af3b7cf54a36970d65d528003f4fe489eb7
2012-10-18 15:53:01 -05:00
Steve Harris
a0eaf651ff 12.11.1-5 baseline
Former-commit-id: a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7
2012-10-18 15:46:42 -05:00
Steve Harris
6958b861f0 12.11.1-4 baseline
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
2012-10-16 13:27:07 -05:00
Steven Harris
feec28f274 12.11.1-1 baseline
Former-commit-id: 765055b5332ddace3cec2d07e279652de869cfe4
2012-09-27 15:57:45 -05:00
Steve Harris
a66f3f4b60 12.10.1-2 baseline
Former-commit-id: 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c
2012-09-11 15:50:57 -05:00
Steve Harris
f2fac39428 12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Steve Harris
33b95fb96d 12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
84bbf2573e 12.9.1-3 baseline
Former-commit-id: 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86
2012-08-15 14:26:10 -05:00
Steve Harris
79ce6cfd97 12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00