Commit graph

6 commits

Author SHA1 Message Date
Brad Gonzales
84e14a5a62 Issue #1654 added Adhoc and SubscriptionRequestEvent. Added AdhocDataRetrievalEvent.
Amend: Added constructor to RegistryStatisticsEvent that takes a count parameter
       and other recommendations from peer review.  Removed count attribute
       from RegistryStatisticsEvent.  Changed construction of SubsriptionRequestEvents
       to set numRecords attribute.

Change-Id: Ib7595b9098299aedeae9db0ca02250551848c3e2

Former-commit-id: d2dac35b65 [formerly 818688266a32feec2081f0c6e74a37e431df9435]
Former-commit-id: 64c6e5abff
2013-08-15 09:35:10 -05:00
Steve Harris
33dd2589f1 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: a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]
Former-commit-id: 2641d578e2
2013-02-21 15:41:39 -06:00
Steve Harris
46d28be4a4 13.3.1-1 baseline
Former-commit-id: 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: d2a654625f
2013-02-20 16:19:40 -06:00
Mike Duff
079ec4b6dd Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 0b044dba9c [formerly 1334488810c13f02e692c234a52d8f0f505a5846]
Former-commit-id: 9c1e0ab639
2013-02-18 08:16:57 -06:00
Steve Harris
47cc08ac79 13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 328c6dccad
2013-01-23 11:18:44 -05:00
Bryan Kowal
146c43a606 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: c8a43edd9e [formerly b535a90fb25287945485c10b3c85749c11285171]
Former-commit-id: d6b4cb65f4
2013-01-07 12:16:01 -06:00