xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2010 commits 31 branches 40 tags 3.8 GiB
Commit graph

8 commits

Author SHA1 Message Date
Steve Harris
4f155a183a 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 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
 2013-02-21 15:41:39 -06:00
Steve Harris
e4435815c9 13.3.1-1 baseline 
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
 2013-02-20 16:19:40 -06:00
Mike Duff
3e59308771 Issue #1584 - FFMP performance stats and performance logger 
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 897262630c [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 079ec4b6dd
 2013-02-18 08:16:57 -06:00
Steve Harris
bbe92e6824 13.2.1-6 baseline 
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
 2013-02-07 16:00:39 -06:00
Steve Harris
d9be4dce21 13.2.1-2 baseline 
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
 2013-01-23 11:18:44 -05:00
Dustin Johnson
756080321e Issue #1441 Create new datadelivery services plugin 
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 3ec05a5a9c [formerly 557de162b0] [formerly 15c2c55ff9 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]
Former-commit-id: 15c2c55ff9
Former-commit-id: a3c99f86bb
 2013-01-22 11:45:18 -06:00
Dustin Johnson
9681f57fac Issue #1501 Use registry version of subscription when sending notification responses 
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962

Former-commit-id: 9f775d2dd7 [formerly d9064bdc98] [formerly 38036a0e8b [formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]
Former-commit-id: 38036a0e8b
Former-commit-id: 13a75fabad
 2013-01-17 14:53:36 -06:00
Bryan Kowal
6d7f57c62a Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline 
Former-commit-id: ab8b346489 [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 146c43a606
 2013-01-07 12:16:01 -06:00