Commit graph

65 commits

Author SHA1 Message Date
Mike Duff
0c3527a58c Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9

Former-commit-id: 896ad0ff63 [formerly 3d783c54be] [formerly afd0de8b5b] [formerly 88e75f4a90 [formerly afd0de8b5b [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]]
Former-commit-id: 88e75f4a90
Former-commit-id: 0265f807aa71c3ad5de9c0f866b4c6f9d30d772c [formerly b517ce9a9f]
Former-commit-id: fc0b126eee
2013-03-25 16:03:18 -05:00
Mike Duff
848f7982d6 Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d

Former-commit-id: 5704b2689e [formerly 492cf0f7e6] [formerly 6a6844fdaf] [formerly cac9bd6119 [formerly 6a6844fdaf [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]]
Former-commit-id: cac9bd6119
Former-commit-id: b852cff98c7943089d4fa9240397aef285faa297 [formerly caed059e23]
Former-commit-id: 2df046d409
2013-03-12 09:03:08 -05:00
Steve Harris
7ff64bf8cc Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]
Former-commit-id: b423579e4a
2013-03-05 12:27:49 -06:00
Steve Harris
4bfbb518c0 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]
Former-commit-id: 3e0614b43a
2013-03-05 10:39:59 -06:00
Steve Harris
7e48d3e684 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: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
2013-02-21 15:41:39 -06:00
Steve Harris
db712e1fcf 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
2013-02-20 16:19:40 -06:00
Ben Steffensmeier
4140260659 Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390

Former-commit-id: bd6e0f8462 [formerly 1940a92596] [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly aa4c7526ff [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: badd785e8aa7a433093d24b4c4bf0d45450daf4a [formerly 455aa4628f]
Former-commit-id: 086f6aabe9
2013-02-14 15:34:25 -06:00
Roger Ferrel
55f0d344fd Issue #1578 Changes for non-blocking ProductViewerDlg.
Change-Id: I61e9bf6089795391bb8d396f9ad2cd2602f5ecfb

Former-commit-id: 03223f5aca [formerly fd340e6e4c] [formerly e4df58e3b9] [formerly cd1441fba6 [formerly e4df58e3b9 [formerly 9e632efc115011649b365ed80e7bedb8b1ed317a]]]
Former-commit-id: cd1441fba6
Former-commit-id: 6d192f77e3dac4c6d7b1e8f1dd2b83b0703ac375 [formerly 5ad8acf84b]
Former-commit-id: 3caf7f4f38
2013-02-11 08:24:01 -06:00
Roger Ferrel
66cc060b91 Issue #1578 Changes for non-blocking QuestionableBadDataDlg.
Change-Id: I872b351c983a825d646b213bc683f66cc0e13577

Former-commit-id: e674368756 [formerly a798c0df19] [formerly f03bde3337ee7a7139ac1c57530c679d975b0f92 [formerly 81a9bdc034]] [formerly 33d9e6a001 [formerly 81a9bdc034 [formerly ed0cfb0fd11a1449d2e2f3e5f316181734a25b84]]]
Former-commit-id: 33d9e6a001
Former-commit-id: 03f91965a70ff3c71fb7ecde0295eae32c4034bd [formerly 58c989a3bf]
Former-commit-id: 253c0909b6
2013-02-07 15:27:55 -06:00
Roger Ferrel
183c5e9d65 Issue #1578 Changes for non-blocking PDC_SaveDlg.
Change-Id: I29228892970a5349c352a34880087afe48a339da

Former-commit-id: 35e9473494 [formerly ba3fa2a509] [formerly ad2639601e] [formerly d4660004f3 [formerly ad2639601e [formerly 0ea655d32be4e0e13bdade510bcc6979d6da3799]]]
Former-commit-id: d4660004f3
Former-commit-id: 154a4712436955b7c70b14470fe583cc773331e3 [formerly bb84fe5f68]
Former-commit-id: 4e773c2c9c
2013-02-07 14:08:59 -06:00
Lee Venable
e341f9bc06 Merge "Issue #1560 - Additional fix to HTS page up/down reload problem." into development
Former-commit-id: 80311cbba3 [formerly 56ec704522] [formerly 8d7c0e3b6a] [formerly 1f1b171862 [formerly 8d7c0e3b6a [formerly d36aa52d8d212aaef3bc68c96a24956696fef513]]]
Former-commit-id: 1f1b171862
Former-commit-id: 515ebc187374550f3e7fb56ecf8f2b38f34dd615 [formerly e70a758f63]
Former-commit-id: c8ddcf394b
2013-02-07 13:06:09 -06:00
Lee Venable
e1307c742b Merge "Issue #1578 Changes for non-blocking FilteringDlg and bug fix to TimeSeriesDlg." into development
Former-commit-id: bf5766a916 [formerly 758d23cc43] [formerly 2b63f58269] [formerly 3932a3e7c2 [formerly 2b63f58269 [formerly 002f832ca109fdd0df9112d2341aeab038aba0db]]]
Former-commit-id: 3932a3e7c2
Former-commit-id: f8529a27a69ffaf02699ef563f9a5a1cb2b17a1e [formerly a7de993595]
Former-commit-id: 1e2fa53f57
2013-02-07 12:58:13 -06:00
Lee Venable
a8433ee638 Merge "Issue #1578 Changes for non-blocking GageLegend." into development
Former-commit-id: ad34019ce3 [formerly 09cb9bbc55] [formerly 4915d89fb8] [formerly f0cdda345d [formerly 4915d89fb8 [formerly e00c153669b699e2d2dd63fec85b9f891688a5d9]]]
Former-commit-id: f0cdda345d
Former-commit-id: e17e8b1eecb3c6a6732196dd60017ea9a5c3a18b [formerly 6e9094a27e]
Former-commit-id: 77bb92dd26
2013-02-07 12:37:22 -06:00
Roger Ferrel
cfe1f28f17 Issue #1578 Changes for non-blocking FilteringDlg and bug fix to TimeSeriesDlg.
Change-Id: Ib024fe2051d753c001bbd43079c629cc2cca8e9b

Former-commit-id: e0e27a3a0f [formerly a87fd5c9f6] [formerly 2c10f90df0] [formerly 0186ec3b68 [formerly 2c10f90df0 [formerly 1994880374ba0fcccedfde60bff6645acbafabae]]]
Former-commit-id: 0186ec3b68
Former-commit-id: 5de58b070bbc6dae59fcade6741107c449d8280c [formerly 45d3bcb6e9]
Former-commit-id: 27339cbd7f
2013-02-07 11:12:51 -06:00
Mike Duff
1ee0fa6e77 Issue #1560 - Additional fix to HTS page up/down reload problem.
Former-commit-id: e43648860a [formerly 307b36486d] [formerly 11aae8b26f] [formerly 4f1bdd295a [formerly 11aae8b26f [formerly dbc68b231bbf9fda21c7b8faf09aebaa1879143a]]]
Former-commit-id: 4f1bdd295a
Former-commit-id: 464a678accbc10ea2c9acd8772d152f4d7d23a07 [formerly 159702d551]
Former-commit-id: 8b8bd8b190
2013-02-07 10:22:40 -06:00
Roger Ferrel
2321480a4f Issue #1578 Changes for non-blocking DataTashCanDlg and clean up to data managers.
Review changes 2.

Change-Id: I4d697ccc5a2e5ab63dfef3e52e88d039adfcdaa0

Former-commit-id: 247d0550b9 [formerly b0d1575727] [formerly b2dc220bcd] [formerly dd85695eb9 [formerly b2dc220bcd [formerly 7d2e157d20a009a2192b35f95252bdad895a91c5]]]
Former-commit-id: dd85695eb9
Former-commit-id: 33710c8bdfd40b76a059c9d4ddd43fe1ccada227 [formerly 0731398ac7]
Former-commit-id: b04dee98c7
2013-02-07 09:12:24 -06:00
Roger Ferrel
2909d1fd40 Issue #1578 Changes for non-blocking GageLegend.
Change-Id: I5ae04e8eaf8ebf33bd6a6466925102cfd12f1550

Former-commit-id: eff002b037 [formerly b2f4b219ac] [formerly a002b9119d] [formerly 845e05782c [formerly a002b9119d [formerly 7bde6bde475269b700826ce699a2437ea6dc9cad]]]
Former-commit-id: 845e05782c
Former-commit-id: afaf62f39fe97152d398b2c7e0d3e3daa9e79de0 [formerly 00b4dc560b]
Former-commit-id: 86e8bb60c1
2013-02-07 09:05:51 -06:00
Roger Ferrel
3c2c6f8156 Issue #1578 Changes for non-blocking FlashFloodGuidanceDlg.
Change-Id: I00efe50ba8e0fe11fcca560ef2d07293c9bdf771

Former-commit-id: 48609202e6 [formerly 0c5e92eb7f] [formerly bb69390c9b] [formerly 78a7d02fd2 [formerly bb69390c9b [formerly d3fd2d7f0591f6fbe15d522a6c909f4509fede94]]]
Former-commit-id: 78a7d02fd2
Former-commit-id: 3dcd22d561969147753ef1769b030af9913894e1 [formerly c1b45bd6c9]
Former-commit-id: d9197606ff
2013-02-07 08:27:18 -06:00
Roger Ferrel
2b54f7aac4 Issue #1578 Code clean up for non-blocking dialogs.
Changes from code review.

Change-Id: I9f95dd07736f96af8cb1116030a9fb778fe4b047

Former-commit-id: 1914a16504 [formerly 5e2b33206c] [formerly 581b04f8f7] [formerly db818dfd35 [formerly 581b04f8f7 [formerly e3c21436e1186e467daf071bb723a2c31d6d3579]]]
Former-commit-id: db818dfd35
Former-commit-id: 55193c36669e7a9b900055e5f3aa0567b8ff4e7d [formerly 1029538171]
Former-commit-id: fc8537fb12
2013-02-06 13:42:57 -06:00
Roger Ferrel
3f715082ec Issue #1578 Changes for non-blocking CaveHydroSWTDialog, singleton TimeseriesDlg and removal of TimeSeriesconfigAction.
Change-Id: Ie249af9dcb2b84db686bca5c0936c2157d40c507

Former-commit-id: 2bf24f97ee [formerly a558cbc03a] [formerly eaa3834f6b] [formerly dc965dc82a [formerly eaa3834f6b [formerly 413491362e25a08b7e43f86987cc059f794a674b]]]
Former-commit-id: dc965dc82a
Former-commit-id: 4a3137039bf4b27fdc3d09ef6745a196568a0bf6 [formerly d9d53340bb]
Former-commit-id: 30a1f42557
2013-02-05 16:13:08 -06:00
Mike Duff
fca5b04fa4 Issue #1560 - TS Graphs refresh data on page up/down.
Former-commit-id: 1f71b3c0df [formerly 24e9ae73f0] [formerly fc24735297] [formerly f03e9cc5ce [formerly fc24735297 [formerly 272894304774c8446ac6476cd9edcb8e212ffb19]]]
Former-commit-id: f03e9cc5ce
Former-commit-id: 1c778dd8ecedb2260d7a955f5176aacd9fddd3c9 [formerly a51d48db5e]
Former-commit-id: f5ef2dc1fe
2013-01-30 16:38:04 -06:00
Steve Harris
ce726fadc7 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]
Former-commit-id: d9be4dce21
2013-01-23 11:18:44 -05:00
Steve Harris
1d1791b3b4 13.2.1-1 baseline
Former-commit-id: 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf]
Former-commit-id: 8ed6a53113
2013-01-23 11:13:03 -05:00
Richard Peter
d880361e06 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: 6e42fa32d3 [formerly a966546e31] [formerly 20520c8f0152154419357d990f91f1ce998a888a [formerly 3fb7d96ec1]] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]
Former-commit-id: 79ef100838
2013-01-14 18:07:17 -06:00
Steve Harris
3d35fd52d5 13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]
Former-commit-id: e34695538d
2013-01-14 18:42:21 -05:00
Richard Peter
177a54d19a Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]
Former-commit-id: 80bf1d7a28
2013-01-09 17:55:05 -06:00
Steve Harris
fe763963e9 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]
Former-commit-id: 82a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
Steve Harris
88f9070c93 Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 638be45c65cc1e7b65d1b4e332046932a30ff790 [formerly 113fdcb679]
Former-commit-id: 15849ae72a
2012-12-11 08:56:54 -06:00
Steve Harris
377804398b 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: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]
Former-commit-id: f02c1ef71d
2012-12-11 08:45:53 -06:00
Roger Ferrel
c6b6263dc8 Issue #1353 Changes for non-blocking DamDisplayControlDlg.
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475

Former-commit-id: 57bad75093 [formerly f9a8d30c4d] [formerly 35261a7964] [formerly 40b8e4ec57 [formerly 35261a7964 [formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]]]
Former-commit-id: 40b8e4ec57
Former-commit-id: df96fece3ee8f724089352eddd79ab3cbf5a43eb [formerly fdad99bcc8]
Former-commit-id: 80d7309ea7
2012-12-10 11:30:06 -06:00
Roger Ferrel
d6787b7477 Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481

Former-commit-id: b5ff90958b [formerly f72e89ad2c] [formerly 921566317a] [formerly 81966d39fc [formerly 921566317a [formerly 62cdaba1d9e59c77efe6253105582894cd8596a0]]]
Former-commit-id: 81966d39fc
Former-commit-id: 989bb37959e7fc26d621af08b76f25afbe60302b [formerly 053584c4e2]
Former-commit-id: bc26433783
2012-12-07 14:43:53 -06:00
Steve Harris
79b0e973ef 12.12.1-12 baseline
Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]
Former-commit-id: 69ab975fab
2012-12-06 09:18:28 -06:00
Steve Harris
a45a7fe1bf 12.12.1-8 baseline
Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]
Former-commit-id: ff4131c2ee
2012-12-06 09:02:51 -06:00
Steve Harris
98670f1cc2 Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]
Former-commit-id: 21ecd53719
2012-11-13 17:28:50 -06:00
Steve Harris
5365b72401 12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]
Former-commit-id: 111e7607cf
2012-11-13 17:14:24 -06:00
Ben Steffensmeier
fa599c93a8 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: 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3]
Former-commit-id: 109ec1e778
2012-11-13 16:00:19 -06:00
Steve Harris
3cb24c1d06 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
2012-11-07 12:41:20 -06:00
Ben Steffensmeier
24de750932 merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8]
Former-commit-id: 9b8f2bcdbd
2012-10-25 12:22:11 -05:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Steve Harris
7fcbb49a3e 12.11.1-3 baseline
Former-commit-id: a65c057df5 [formerly 196afa0e5f] [formerly 2d0c424713] [formerly 5d796f775c [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]
Former-commit-id: 5d796f775c
Former-commit-id: 0e268084394b033a5de6dba694d14423a1da3040 [formerly 5723fb0031]
Former-commit-id: 725b2f8ba5
2012-10-15 16:30:31 -05:00
Ben Steffensmeier
97c23508d7 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: a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]
Former-commit-id: 266a2f317f
Former-commit-id: aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3]
Former-commit-id: fde1e73d58
2012-10-12 12:45:50 -05:00
Steve Harris
6e0b2c55d7 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc]
Former-commit-id: 772c60efa4
2012-10-08 13:26:20 -05:00
Ben Steffensmeier
f976af446f Issue #189 convert hydro and hydrocommon to grid.
Former-commit-id: a5c60f0f13 [formerly 3e0da6d171] [formerly 8d150d404c] [formerly 3e93e8980b [formerly 8d150d404c [formerly a84fcbd045c24c16b30df4328aaf3bbbb30efd17]]]
Former-commit-id: 3e93e8980b
Former-commit-id: 9c843ec0f10baa33a6447d47f517d98afd981744 [formerly 734922cb44]
Former-commit-id: 3a1ba7bd87
2012-10-01 14:05:40 -05:00
Steven Harris
9c67bbab77 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]
Former-commit-id: f5e63d5f93
2012-09-27 15:57:45 -05:00
Ben Steffensmeier
ecdef95d0a Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 54767956bc [formerly 8e5b20236d] [formerly 9632663c0a] [formerly f918b6636f [formerly 9632663c0a [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]
Former-commit-id: f918b6636f
Former-commit-id: 7490d8b24afa2934ebd15d8ff27aa170ba918366 [formerly 6c38e6abb2]
Former-commit-id: 9512238d6e
2012-09-24 14:05:22 -05:00
Steve Harris
70566fbec1 12.10.1-5 baseline
Former-commit-id: d0cd58d6bc [formerly 82feb4de50] [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly a96d35a1fa [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]
Former-commit-id: 4fd8893e55
Former-commit-id: 3760dcf872cc3205410a8002df70f1952ec6e644 [formerly deed84c1a2]
Former-commit-id: a903893a09
2012-09-17 15:42:31 -05:00
Steve Harris
424c32bd5d 12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]
Former-commit-id: 684feb34e5
2012-09-13 12:08:11 -05:00
Steve Harris
9f4fa7bf83 12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]
Former-commit-id: e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00