Commit graph

8 commits

Author SHA1 Message Date
Benjamin Phillippe
3cc6978718 Issue #1802 Fixes related to DD transaction refactor
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1

Former-commit-id: 30be5ce6f9 [formerly 115dc12790] [formerly 2a14245dce [formerly 393a469e2f65894a6dd5b58c1431c3d727951eda]]
Former-commit-id: 2a14245dce
Former-commit-id: b0010de8ff
2013-03-27 17:12:52 -05:00
Benjamin Phillippe
541646148b Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 4675bed4c2 [formerly b10b1150be] [formerly af05feb5a7 [formerly 534777d96a45b275abd9cc26818b7df200974595]]
Former-commit-id: af05feb5a7
Former-commit-id: 4d1a8805ab
2013-03-25 15:15:38 -05:00
Dustin Johnson
219e882fc5 Issue #1643 Add NCF bandwidth manager router
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8

Former-commit-id: ebf02481f0 [formerly d58d28c636] [formerly 722e41b8b0 [formerly 2b52368c81272df18f3af1334057295d11bb4b52]]
Former-commit-id: 722e41b8b0
Former-commit-id: cf86c92fad
2013-02-26 11:32:03 -06:00
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
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
Matt Nash
2070cc94b0 Issue #1491 add Geometry converter and move registry spring instantiation
Change-Id: I7794f41c637b5e29662356d81e172d3484e66a56

Former-commit-id: 5bc585c73c [formerly 648c027294] [formerly b4f48078ca [formerly 94b52c4d617f15bb0bd8d460eb9c5ab6e1a201e6]]
Former-commit-id: b4f48078ca
Former-commit-id: 73ab7a756a
2013-01-15 17:06:28 -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