Steve Harris
|
346b22b196
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 36261cb095 [formerly 753a5213ab] [formerly 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: bca46a1354 [formerly d5bcdb0015]
Former-commit-id: 5232592cfa
|
2013-03-12 16:04:23 -05:00 |
|
Mike Duff
|
3eef80b3d1
|
Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d
Former-commit-id: 492cf0f7e6 [formerly 6a6844fdaf] [formerly 492cf0f7e6 [formerly 6a6844fdaf] [formerly cac9bd6119 [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]]
Former-commit-id: cac9bd6119
Former-commit-id: 2df046d409 [formerly caed059e23]
Former-commit-id: 659a2a4f4c
|
2013-03-12 09:03:08 -05:00 |
|
Steve Harris
|
2b489e4e40
|
Merge branch 'omaha_13.3.1' into development
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 4a0b8772ec [formerly b9563da8a8]
Former-commit-id: 46d0c9fcee
|
2013-03-05 12:29:44 -06:00 |
|
Steve Harris
|
d842ed88a7
|
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 61a19a460b [formerly 305dd72969] [formerly 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: b423579e4a [formerly a8e1557c62]
Former-commit-id: b630339eb7
|
2013-03-05 12:27:49 -06:00 |
|
Steve Harris
|
153aadc1d7
|
13.3.1-4 baseline
Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: 3e0614b43a [formerly 5e55ded3a9]
Former-commit-id: 0df35cc5ec
|
2013-03-05 10:39:59 -06:00 |
|
Ben Steffensmeier
|
866c873f71
|
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
|
2013-02-28 17:00:56 -06:00 |
|
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 |
|
Ben Steffensmeier
|
c300faa186
|
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: 1940a92596 [formerly aa4c7526ff] [formerly 1940a92596 [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: 086f6aabe9 [formerly 455aa4628f]
Former-commit-id: 49b700da85
|
2013-02-14 15:34:25 -06:00 |
|
Roger Ferrel
|
894eef22a5
|
Issue #1578 Changes for non-blocking ProductViewerDlg.
Change-Id: I61e9bf6089795391bb8d396f9ad2cd2602f5ecfb
Former-commit-id: fd340e6e4c [formerly e4df58e3b9] [formerly fd340e6e4c [formerly e4df58e3b9] [formerly cd1441fba6 [formerly 9e632efc115011649b365ed80e7bedb8b1ed317a]]]
Former-commit-id: cd1441fba6
Former-commit-id: 3caf7f4f38 [formerly 5ad8acf84b]
Former-commit-id: 5bd3e5d9e8
|
2013-02-11 08:24:01 -06:00 |
|
Roger Ferrel
|
b9553a063f
|
Issue #1578 Changes for non-blocking QuestionableBadDataDlg.
Change-Id: I872b351c983a825d646b213bc683f66cc0e13577
Former-commit-id: a798c0df19 [formerly 81a9bdc034] [formerly a798c0df19 [formerly 81a9bdc034] [formerly 33d9e6a001 [formerly ed0cfb0fd11a1449d2e2f3e5f316181734a25b84]]]
Former-commit-id: 33d9e6a001
Former-commit-id: 253c0909b6 [formerly 58c989a3bf]
Former-commit-id: c486edab44
|
2013-02-07 15:27:55 -06:00 |
|
Roger Ferrel
|
76974357cf
|
Issue #1578 Changes for non-blocking PDC_SaveDlg.
Change-Id: I29228892970a5349c352a34880087afe48a339da
Former-commit-id: ba3fa2a509 [formerly ad2639601e] [formerly ba3fa2a509 [formerly ad2639601e] [formerly d4660004f3 [formerly 0ea655d32be4e0e13bdade510bcc6979d6da3799]]]
Former-commit-id: d4660004f3
Former-commit-id: 4e773c2c9c [formerly bb84fe5f68]
Former-commit-id: 62eb1a3cdf
|
2013-02-07 14:08:59 -06:00 |
|
Lee Venable
|
dc5ba802ec
|
Merge "Issue #1560 - Additional fix to HTS page up/down reload problem." into development
Former-commit-id: 56ec704522 [formerly 8d7c0e3b6a] [formerly 56ec704522 [formerly 8d7c0e3b6a] [formerly 1f1b171862 [formerly d36aa52d8d212aaef3bc68c96a24956696fef513]]]
Former-commit-id: 1f1b171862
Former-commit-id: c8ddcf394b [formerly e70a758f63]
Former-commit-id: e92666cc43
|
2013-02-07 13:06:09 -06:00 |
|
Lee Venable
|
c74632b003
|
Merge "Issue #1578 Changes for non-blocking FilteringDlg and bug fix to TimeSeriesDlg." into development
Former-commit-id: 758d23cc43 [formerly 2b63f58269] [formerly 758d23cc43 [formerly 2b63f58269] [formerly 3932a3e7c2 [formerly 002f832ca109fdd0df9112d2341aeab038aba0db]]]
Former-commit-id: 3932a3e7c2
Former-commit-id: 1e2fa53f57 [formerly a7de993595]
Former-commit-id: df1d5ee70e
|
2013-02-07 12:58:13 -06:00 |
|
Lee Venable
|
026ed72df4
|
Merge "Issue #1578 Changes for non-blocking GageLegend." into development
Former-commit-id: 09cb9bbc55 [formerly 4915d89fb8] [formerly 09cb9bbc55 [formerly 4915d89fb8] [formerly f0cdda345d [formerly e00c153669b699e2d2dd63fec85b9f891688a5d9]]]
Former-commit-id: f0cdda345d
Former-commit-id: 77bb92dd26 [formerly 6e9094a27e]
Former-commit-id: 0371047157
|
2013-02-07 12:37:22 -06:00 |
|
Roger Ferrel
|
b221911a63
|
Issue #1578 Changes for non-blocking FilteringDlg and bug fix to TimeSeriesDlg.
Change-Id: Ib024fe2051d753c001bbd43079c629cc2cca8e9b
Former-commit-id: a87fd5c9f6 [formerly 2c10f90df0] [formerly a87fd5c9f6 [formerly 2c10f90df0] [formerly 0186ec3b68 [formerly 1994880374ba0fcccedfde60bff6645acbafabae]]]
Former-commit-id: 0186ec3b68
Former-commit-id: 27339cbd7f [formerly 45d3bcb6e9]
Former-commit-id: 2fc55e62c5
|
2013-02-07 11:12:51 -06:00 |
|
Mike Duff
|
b2ac85eeac
|
Issue #1560 - Additional fix to HTS page up/down reload problem.
Former-commit-id: 307b36486d [formerly 11aae8b26f] [formerly 307b36486d [formerly 11aae8b26f] [formerly 4f1bdd295a [formerly dbc68b231bbf9fda21c7b8faf09aebaa1879143a]]]
Former-commit-id: 4f1bdd295a
Former-commit-id: 8b8bd8b190 [formerly 159702d551]
Former-commit-id: 2e281af27f
|
2013-02-07 10:22:40 -06:00 |
|
Roger Ferrel
|
8c2defd927
|
Issue #1578 Changes for non-blocking DataTashCanDlg and clean up to data managers.
Review changes 2.
Change-Id: I4d697ccc5a2e5ab63dfef3e52e88d039adfcdaa0
Former-commit-id: b0d1575727 [formerly b2dc220bcd] [formerly b0d1575727 [formerly b2dc220bcd] [formerly dd85695eb9 [formerly 7d2e157d20a009a2192b35f95252bdad895a91c5]]]
Former-commit-id: dd85695eb9
Former-commit-id: b04dee98c7 [formerly 0731398ac7]
Former-commit-id: 83fc1951f4
|
2013-02-07 09:12:24 -06:00 |
|
Roger Ferrel
|
e174c75bec
|
Issue #1578 Changes for non-blocking GageLegend.
Change-Id: I5ae04e8eaf8ebf33bd6a6466925102cfd12f1550
Former-commit-id: b2f4b219ac [formerly a002b9119d] [formerly b2f4b219ac [formerly a002b9119d] [formerly 845e05782c [formerly 7bde6bde475269b700826ce699a2437ea6dc9cad]]]
Former-commit-id: 845e05782c
Former-commit-id: 86e8bb60c1 [formerly 00b4dc560b]
Former-commit-id: c9285492fd
|
2013-02-07 09:05:51 -06:00 |
|
Roger Ferrel
|
a802ac6f39
|
Issue #1578 Changes for non-blocking FlashFloodGuidanceDlg.
Change-Id: I00efe50ba8e0fe11fcca560ef2d07293c9bdf771
Former-commit-id: 0c5e92eb7f [formerly bb69390c9b] [formerly 0c5e92eb7f [formerly bb69390c9b] [formerly 78a7d02fd2 [formerly d3fd2d7f0591f6fbe15d522a6c909f4509fede94]]]
Former-commit-id: 78a7d02fd2
Former-commit-id: d9197606ff [formerly c1b45bd6c9]
Former-commit-id: 7c4114c404
|
2013-02-07 08:27:18 -06:00 |
|
Roger Ferrel
|
3e5e303037
|
Issue #1578 Code clean up for non-blocking dialogs.
Changes from code review.
Change-Id: I9f95dd07736f96af8cb1116030a9fb778fe4b047
Former-commit-id: 5e2b33206c [formerly 581b04f8f7] [formerly 5e2b33206c [formerly 581b04f8f7] [formerly db818dfd35 [formerly e3c21436e1186e467daf071bb723a2c31d6d3579]]]
Former-commit-id: db818dfd35
Former-commit-id: fc8537fb12 [formerly 1029538171]
Former-commit-id: 22bc10663c
|
2013-02-06 13:42:57 -06:00 |
|
Roger Ferrel
|
c4c24e2753
|
Issue #1578 Changes for non-blocking CaveHydroSWTDialog, singleton TimeseriesDlg and removal of TimeSeriesconfigAction.
Change-Id: Ie249af9dcb2b84db686bca5c0936c2157d40c507
Former-commit-id: a558cbc03a [formerly eaa3834f6b] [formerly a558cbc03a [formerly eaa3834f6b] [formerly dc965dc82a [formerly 413491362e25a08b7e43f86987cc059f794a674b]]]
Former-commit-id: dc965dc82a
Former-commit-id: 30a1f42557 [formerly d9d53340bb]
Former-commit-id: 24ff19dae7
|
2013-02-05 16:13:08 -06:00 |
|
Mike Duff
|
7b6f64506a
|
Issue #1560 - TS Graphs refresh data on page up/down.
Former-commit-id: 24e9ae73f0 [formerly fc24735297] [formerly 24e9ae73f0 [formerly fc24735297] [formerly f03e9cc5ce [formerly 272894304774c8446ac6476cd9edcb8e212ffb19]]]
Former-commit-id: f03e9cc5ce
Former-commit-id: f5ef2dc1fe [formerly a51d48db5e]
Former-commit-id: a0e2621664
|
2013-01-30 16:38:04 -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 |
|
Steve Harris
|
08bf724a6c
|
13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113 [formerly f6670806bf]
Former-commit-id: 9146e727f9
|
2013-01-23 11:13:03 -05:00 |
|
Richard Peter
|
e838f2db25
|
Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 79ef100838 [formerly 345dfd2ca9]
Former-commit-id: cd2014bf8d
|
2013-01-14 18:07:17 -06:00 |
|
Steve Harris
|
b4556ea28f
|
13.2.1-1 baseline
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d [formerly 8713dfc5ca]
Former-commit-id: ebff2a6275
|
2013-01-14 18:42:21 -05:00 |
|
Richard Peter
|
398b47967d
|
Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28 [formerly 6a5a0d7d09]
Former-commit-id: 709af3b25e
|
2013-01-09 17:55:05 -06:00 |
|
Steve Harris
|
b7f180d9d3
|
13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
f52ec0b0a0
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
868acb808b
|
Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: d4686333a1 [formerly ab8b1ae64d] [formerly d4686333a1 [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 15849ae72a [formerly 113fdcb679]
Former-commit-id: db24093e42
|
2012-12-11 08:56:54 -06:00 |
|
Steve Harris
|
b0a60923c4
|
Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: f02c1ef71d [formerly 6287b32e7d]
Former-commit-id: ebcc9975c4
|
2012-12-11 08:45:53 -06:00 |
|
Roger Ferrel
|
d8640632cd
|
Issue #1353 Changes for non-blocking DamDisplayControlDlg.
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475
Former-commit-id: f9a8d30c4d [formerly 35261a7964] [formerly f9a8d30c4d [formerly 35261a7964] [formerly 40b8e4ec57 [formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]]]
Former-commit-id: 40b8e4ec57
Former-commit-id: 80d7309ea7 [formerly fdad99bcc8]
Former-commit-id: 387c5d0e36
|
2012-12-10 11:30:06 -06:00 |
|
Roger Ferrel
|
50bf368b38
|
Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481
Former-commit-id: f72e89ad2c [formerly 921566317a] [formerly f72e89ad2c [formerly 921566317a] [formerly 81966d39fc [formerly 62cdaba1d9e59c77efe6253105582894cd8596a0]]]
Former-commit-id: 81966d39fc
Former-commit-id: bc26433783 [formerly 053584c4e2]
Former-commit-id: 039b95d202
|
2012-12-07 14:43:53 -06:00 |
|
Steve Harris
|
f8a9ae24cb
|
12.12.1-12 baseline
Former-commit-id: 89def5cf03 [formerly e8e41630e8] [formerly 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 69ab975fab [formerly 7bb37caa23]
Former-commit-id: 190378beeb
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
0b22b3c014
|
12.12.1-8 baseline
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: ff4131c2ee [formerly ee06a94735]
Former-commit-id: ec2cdc1593
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
ae9d9985cd
|
Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719 [formerly c8cac52915]
Former-commit-id: 59efd9a217
|
2012-11-13 17:28:50 -06:00 |
|
Steve Harris
|
53d74c66e7
|
12.12.1-2 baseline
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 111e7607cf [formerly df89fe9bed]
Former-commit-id: 96a4a4f3f5
|
2012-11-13 17:14:24 -06:00 |
|
Ben Steffensmeier
|
9f2f2591ee
|
Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: ed4f88aa22 [formerly 69fc030bb4] [formerly ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 109ec1e778 [formerly 60f78c22e3]
Former-commit-id: 7761060a12
|
2012-11-13 16:00:19 -06:00 |
|
Steve Harris
|
af59663a99
|
12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928 [formerly 214fcd3b63]
Former-commit-id: a5be98d6de
|
2012-11-07 12:41:20 -06:00 |
|
Ben Steffensmeier
|
86562637f0
|
merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 9b8f2bcdbd [formerly a77d2097f8]
Former-commit-id: dd5ab10b61
|
2012-10-25 12:22:11 -05:00 |
|
Steve Harris
|
35e34308c5
|
12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
c25ebcdc41
|
12.11.1-3 baseline
Former-commit-id: 196afa0e5f [formerly 2d0c424713] [formerly 196afa0e5f [formerly 2d0c424713] [formerly 5d796f775c [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]
Former-commit-id: 5d796f775c
Former-commit-id: 725b2f8ba5 [formerly 5723fb0031]
Former-commit-id: bf1f88482b
|
2012-10-15 16:30:31 -05:00 |
|
Ben Steffensmeier
|
29777154bb
|
Merge branch 'ss_builds' into Unified_Grid
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
Former-commit-id: de3769129c [formerly 8b7256b1ae] [formerly de3769129c [formerly 8b7256b1ae] [formerly 266a2f317f [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]
Former-commit-id: 266a2f317f
Former-commit-id: fde1e73d58 [formerly fed5a35af3]
Former-commit-id: b2fdd9283d
|
2012-10-12 12:45:50 -05:00 |
|
Steve Harris
|
ff9321e3ce
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 75901860c2 [formerly c12ee14e66] [formerly 75901860c2 [formerly c12ee14e66] [formerly 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 772c60efa4 [formerly 42bf60b2fc]
Former-commit-id: e72b6d5da6
|
2012-10-08 13:26:20 -05:00 |
|
Ben Steffensmeier
|
d3f7a486e7
|
Issue #189 convert hydro and hydrocommon to grid.
Former-commit-id: 3e0da6d171 [formerly 8d150d404c] [formerly 3e0da6d171 [formerly 8d150d404c] [formerly 3e93e8980b [formerly a84fcbd045c24c16b30df4328aaf3bbbb30efd17]]]
Former-commit-id: 3e93e8980b
Former-commit-id: 3a1ba7bd87 [formerly 734922cb44]
Former-commit-id: 24e6010646
|
2012-10-01 14:05:40 -05:00 |
|
Steven Harris
|
2f855322f6
|
12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
|
2012-09-27 15:57:45 -05:00 |
|
Ben Steffensmeier
|
231ab11d9a
|
Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 8e5b20236d [formerly 9632663c0a] [formerly 8e5b20236d [formerly 9632663c0a] [formerly f918b6636f [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]
Former-commit-id: f918b6636f
Former-commit-id: 9512238d6e [formerly 6c38e6abb2]
Former-commit-id: 769e28c28d
|
2012-09-24 14:05:22 -05:00 |
|
Steve Harris
|
288d4afff5
|
12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]
Former-commit-id: 4fd8893e55
Former-commit-id: a903893a09 [formerly deed84c1a2]
Former-commit-id: 430a11f72b
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
e57e7237a9
|
12.10.1-4 baseline
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5 [formerly 2ba58a3576]
Former-commit-id: 26b7d083ec
|
2012-09-13 12:08:11 -05:00 |
|