Commit graph

15 commits

Author SHA1 Message Date
Steve Harris
b5d9e75b95 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1]
Former-commit-id: f3c3191a1c
2013-02-21 15:41:39 -06:00
Steve Harris
8c828dbd75 13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4]
Former-commit-id: b3b56830b0
2013-02-20 16:19:40 -06:00
Steve Harris
dc55ef579a 13.2.1-6 baseline
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: a46e33f06e
Former-commit-id: bbe92e6824 [formerly 30d38334cc]
Former-commit-id: 0c128dd8f0
2013-02-07 16:00:39 -06:00
Mike Duff
28e854de25 Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a

Former-commit-id: 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 36909dd6c0 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]]
Former-commit-id: 36909dd6c0
Former-commit-id: cd52a94032 [formerly 4400265394]
Former-commit-id: 0cb979038b
2013-02-05 15:13:51 -06:00
Ben Steffensmeier
9e304a42da Issue #1495 fix fens regex.
Former-commit-id: 37d712231a [formerly e28749bc03] [formerly 37d712231a [formerly e28749bc03] [formerly 2cb3fe3dc2 [formerly fda3d6ae8ecd44d03b9c4afb1fd0b93b0f3aaccf]]]
Former-commit-id: 2cb3fe3dc2
Former-commit-id: 07d1695d81 [formerly 243af2b479]
Former-commit-id: df72441e79
2013-01-24 10:53:51 -06:00
Steve Harris
2779f5c6d9 13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Dustin Johnson
ce68428901 Merge "Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets." into 13.2.1_delivery
Former-commit-id: 04398e0aa4 [formerly c1f03f7d81] [formerly 04398e0aa4 [formerly c1f03f7d81] [formerly 350becc94f [formerly 2b3039f0f55655d484867701b4f28bfae12aece9]]]
Former-commit-id: 350becc94f
Former-commit-id: 8aed30442e [formerly aa85e0c3ca]
Former-commit-id: 51a9a32485
2013-01-21 12:23:08 -06:00
Dave Hladky
220296333b Issue #1513 Updated the way level lookups are created
Change-Id: Ie1120707af608910a88c407ca8af8cf19b964555

Former-commit-id: d0ff35051e [formerly 53ceda6a62] [formerly d0ff35051e [formerly 53ceda6a62] [formerly cf1c674c2e [formerly a6b74b9bd1781ca61e364e24f61bb647602fcce6]]]
Former-commit-id: cf1c674c2e
Former-commit-id: 82cd0a1b58 [formerly e497d39d75]
Former-commit-id: 037353dda2
2013-01-21 11:19:00 -06:00
Dave Hladky
4f536836cb Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets.
Change-Id: I6035ad79a31f9ada9910d599d6529ca91ff03173

Former-commit-id: 1c39b88ba4 [formerly 786afee256] [formerly 1c39b88ba4 [formerly 786afee256] [formerly 5d8851b214 [formerly 07d90ad640806abd237fb13e1476adc1fb8d35c0]]]
Former-commit-id: 5d8851b214
Former-commit-id: bd7e8a6968 [formerly c45822f09b]
Former-commit-id: 409508d3e2
2013-01-21 08:29:29 -06:00
Ben Steffensmeier
c659ffb227 Issue #1495 add ensemble selection tab to subset dialog
Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15

Former-commit-id: d06ef00715 [formerly f0d1c1a737] [formerly d06ef00715 [formerly f0d1c1a737] [formerly 14f3c3b3bf [formerly e884c8e79f05af8fb3252fa7a492d232ba090715]]]
Former-commit-id: 14f3c3b3bf
Former-commit-id: 0ec9848c96 [formerly a28d09edbf]
Former-commit-id: 88dd263c34
2013-01-18 15:42:08 -06:00
Richard Peter
90d7ef6fc3 Merge "Issue #1489 Harvester directories not created causing harvester to not start" into 13.2.1_delivery
Former-commit-id: e8a4939150 [formerly 09fb2d0919] [formerly e8a4939150 [formerly 09fb2d0919] [formerly 0e684515c6 [formerly 8388122d8273aca20a9c4292035049957a091a69]]]
Former-commit-id: 0e684515c6
Former-commit-id: cb3f43b17a [formerly 8258395d58]
Former-commit-id: 81bfd386a2
2013-01-15 16:11:35 -06:00
Dave Hladky
50d1017f46 Issue #1489 Harvester directories not created causing harvester to not start
Change-Id: Id5caa14ebc33451f95e5d1e9d685c4094091ff63

Former-commit-id: 34577b50dd [formerly 9b75eaf869] [formerly 34577b50dd [formerly 9b75eaf869] [formerly b6bf73134e [formerly 08b944fa708ba12ac6df63b64501ff20f4738063]]]
Former-commit-id: b6bf73134e
Former-commit-id: fa9dc500a3 [formerly ccf832dd38]
Former-commit-id: d1c940cd8e
2013-01-15 12:41:15 -06:00
Dustin Johnson
1070de3f2d Issue #1286 Fix bugs found during 1286 testing
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 99f8d40bed [formerly 3d74a68e94] [formerly 99f8d40bed [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]
Former-commit-id: 2cf52d976b
Former-commit-id: 94e95f3e07 [formerly aa7acedf0a]
Former-commit-id: 5cd31fc0b7
2013-01-15 10:18:14 -06:00
Dave Hladky
b5ea7aaff8 Issue #1466 Updated parsing for NCOM, revamped MetaDataParser to make more efficient, unit updates, tests, params
Change-Id: I5177209c25cb08c0ffe74104ceb6e16874ce3208

Former-commit-id: 440de708df [formerly 5cf3eee426] [formerly 440de708df [formerly 5cf3eee426] [formerly 002ac2eb41 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]
Former-commit-id: 002ac2eb41
Former-commit-id: fe486b4889 [formerly 5312e82b4b]
Former-commit-id: a51f8f449b
2013-01-11 11:59:36 -06:00
Bryan Kowal
1996f92f7e Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: ab8b346489 [formerly c8a43edd9e] [formerly ab8b346489 [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 6d7f57c62a [formerly 146c43a606]
Former-commit-id: 0136f9d5a3
2013-01-07 12:16:01 -06:00