Commit graph

68 commits

Author SHA1 Message Date
Steve Harris
3165545bb6 Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]]
Former-commit-id: 6040272573
Former-commit-id: c9bc690eca [formerly 75f6e61e6f] [formerly 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f]]
Former-commit-id: 97adf3dc9cd6eed17f75fee6569131485caea1a3 [formerly ba97151132]
Former-commit-id: 99bc358644
2013-01-29 15:57:21 -06:00
Steve Harris
d552dc5ffb 13.2.1-3 baseline
Former-commit-id: b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: 03989493ae [formerly daca1c3e73] [formerly aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be]]
Former-commit-id: 4abc68d3bc26a4259383e44830f853678146e7ed [formerly dbaf4a3e39]
Former-commit-id: 9ab34b7aeb
2013-01-29 15:52:43 -06:00
Steve Harris
5d7a0ba9af 13.2.1-2 baseline
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 0f4fcd0ba8 [formerly 251a9c0195] [formerly 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]]
Former-commit-id: a3e63c2bb7b23736c07cc90370ea39a5d96fd1a5 [formerly 27706b8dcb]
Former-commit-id: eafa141b90
2013-01-25 09:07:12 -06:00
Ben Steffensmeier
ae9f2caa73 Issue #1479 fix mod families
Former-commit-id: dec6cf6e9d [formerly 735add55ba] [formerly 13fd813660] [formerly dec6cf6e9d [formerly 735add55ba] [formerly 13fd813660] [formerly a7989d4638 [formerly 13fd813660 [formerly 76b5a4fcf313e2a028662a1e07871fff2e328d48]]]]
Former-commit-id: a7989d4638
Former-commit-id: d06eb6312e [formerly 3dfe43caac] [formerly 17cbebf191acc2d92271b74e20f9bb5df587b7a1 [formerly fbd614258f]]
Former-commit-id: ddd0166886969a5e01fb56ad440b559e700f192c [formerly d5e0e015b3]
Former-commit-id: 2c863705f7
2013-01-23 15:47:30 -06:00
Ben Steffensmeier
aeeae8dde3 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 3802dad955 [formerly a9654f859a] [formerly f0af056d97] [formerly 3802dad955 [formerly a9654f859a] [formerly f0af056d97] [formerly ec199ad7d1 [formerly f0af056d97 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]]]
Former-commit-id: ec199ad7d1
Former-commit-id: d270c16979 [formerly 50d1561165] [formerly 08da3e13f0dfa4e1eab04881e0b72815afc9b88a [formerly 3bfba5b771]]
Former-commit-id: 378f6595a0ecbd00464d01161dfb30503bf9e8c4 [formerly ca6ab4a945]
Former-commit-id: 8d6d821ac0
2013-01-18 10:59:43 -06:00
Richard Peter
0a55bcfd67 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 3fb7d96ec1] [formerly 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]]
Former-commit-id: 1dbb34523b
Former-commit-id: d880361e06 [formerly 79ef100838] [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]]
Former-commit-id: ef42f50f6a062518b4a0d8effc537eaf4c7292a1 [formerly cd2014bf8d]
Former-commit-id: e838f2db25
2013-01-14 18:07:17 -06:00
Steve Harris
e5f32a2bbe 13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5 [formerly e34695538d] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275]
Former-commit-id: b4556ea28f
2013-01-14 18:42:21 -05:00
Richard Peter
031bae3bfd Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]]
Former-commit-id: b8e42dabc0
Former-commit-id: 9da3b7e2dd [formerly fa6247baf7] [formerly bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]]
Former-commit-id: 353348b43765265bcb9885b4db6864c6e23d0b07 [formerly 096134d917]
Former-commit-id: ef2dc06b69
2013-01-14 17:38:38 -06:00
Steve Harris
005d9ccae2 13.1.2-7 baseline
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]]
Former-commit-id: 42189b5f88
Former-commit-id: 4c8e604619 [formerly f1256f2a9e] [formerly 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]]
Former-commit-id: bc0b5a7bf290d46a49a6251bcf649c05a7b9d563 [formerly 775a338b90]
Former-commit-id: 1ef10eaf2c
2013-01-11 16:12:09 -05:00
Nate Jensen
1f724217ca Merge "Issue #1467 - updated the memory settings for 64-bit GFE" into development
Former-commit-id: a9410160a8 [formerly d02e1ff0a7] [formerly a3e10f6dcd] [formerly a9410160a8 [formerly d02e1ff0a7] [formerly a3e10f6dcd] [formerly 62f89e6189 [formerly a3e10f6dcd [formerly 5f262d2cb46ad8ff0ec355e64ee73b6deb7ed454]]]]
Former-commit-id: 62f89e6189
Former-commit-id: cce4bebbe5 [formerly ef3468acd4] [formerly d12f5df726ebd0677bc478849410246bfac0e228 [formerly 5733a44770]]
Former-commit-id: fc2bdf799b307430f81e2eb541330216b1e02446 [formerly 4d91741212]
Former-commit-id: 3fff3b0d0b
2013-01-10 10:31:05 -06:00
Richard Peter
7d529beed2 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e]
Former-commit-id: 398b47967d
2013-01-09 17:55:05 -06:00
Bryan Kowal
e1524f86bc Issue #1467 - updated the memory settings for 64-bit GFE
Change-Id: I40df3faed89bd23c5e37b81f3a4e6b256b5a2cc3

Former-commit-id: fc4fd81849 [formerly 6129a00225] [formerly 0645a9fe40] [formerly fc4fd81849 [formerly 6129a00225] [formerly 0645a9fe40] [formerly 73bdd66283 [formerly 0645a9fe40 [formerly 2d6bf1e42cb628a5b5af6a261202d01c7fa236fb]]]]
Former-commit-id: 73bdd66283
Former-commit-id: 21649e9b6a [formerly 777b804edc] [formerly 5758de40a9aee192d431736f923321adb98c10b9 [formerly e9dd794082]]
Former-commit-id: faa201033f5f1cf0a73924306cedff5f4d426c74 [formerly 4f1a822578]
Former-commit-id: b6ceffe69a
2013-01-09 13:03:38 -06:00
Bryan Kowal
66872f739d Issue #1460 - Merge 4.7-GIS_Viewer into AWIPS2_baseline
Former-commit-id: 23c510dd69 [formerly 87d0821429] [formerly 76fe910606] [formerly 23c510dd69 [formerly 87d0821429] [formerly 76fe910606] [formerly 03f108f80b [formerly 76fe910606 [formerly 9e0eae1725af06ce834c926a4d70195a075e8152]]]]
Former-commit-id: 03f108f80b
Former-commit-id: ebfcb54d88 [formerly 7dd7d1cfa7] [formerly da032922f2d57ac81e22d50f2e2d5d1d844bfc99 [formerly bbeb6b5101]]
Former-commit-id: c2c9c8fe02c69d2f44b11846ef5c8dd2334a1e19 [formerly 74f4811f07]
Former-commit-id: 2ec11e041a
2013-01-07 18:14:07 -06:00
Bryan Kowal
904678e8f4 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: 199e202979 [formerly ab8b346489] [formerly c8a43edd9e] [formerly 199e202979 [formerly ab8b346489] [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly c8a43edd9e [formerly b535a90fb25287945485c10b3c85749c11285171]]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 0e985cf0f3 [formerly 6d7f57c62a] [formerly acd3a92b4c1f1e4b7e0fc18eb618a5d77643ccb8 [formerly 146c43a606]]
Former-commit-id: caceba3a84e843b279eb8a807b33e26d81487e49 [formerly 0136f9d5a3]
Former-commit-id: 1996f92f7e
2013-01-07 12:16:01 -06:00
Steve Harris
3e63f280a2 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Matt Nash
d7931f4adf Issue #1369 add pattern to p2-build.xml file to match the new cots product
Change-Id: I5a30c7fd6067b1c59794983c67b8186775af3849

Former-commit-id: c9f7f64c87 [formerly a661c27de7] [formerly cf0090b7d4] [formerly c9f7f64c87 [formerly a661c27de7] [formerly cf0090b7d4] [formerly 87b4d4b4e6 [formerly cf0090b7d4 [formerly a862d259af867bd15d381e05e421d8d653ae4f21]]]]
Former-commit-id: 87b4d4b4e6
Former-commit-id: 06964bc4ed [formerly 5de49c6734] [formerly 366d969178f0966d239a5f229d0f375488b48401 [formerly 83b9a4dfb7]]
Former-commit-id: f5d2aa418aaf72d78aa1564e88fa01b0a75fcaf8 [formerly 778191a87a]
Former-commit-id: ef3d62999c
2012-12-13 12:42:40 -06:00
Ron Anderson
368f497d27 Issue #1395 Comment out change in p2-build.xml to fix build
Change-Id: I47d426383734b876d5def9ba03677ef7ff745403

Former-commit-id: 48dbe8b641 [formerly c5cd2304a9] [formerly 5327d88a6d] [formerly 48dbe8b641 [formerly c5cd2304a9] [formerly 5327d88a6d] [formerly 06fdf91a1c [formerly 5327d88a6d [formerly 4636ad873e7de401e6384dd42857265e962aa8d9]]]]
Former-commit-id: 06fdf91a1c
Former-commit-id: 620d8f31d7 [formerly f4624af03c] [formerly f46b472b52d9fa302dd37019f37fcd05c9d31c60 [formerly 17b983ba02]]
Former-commit-id: 9f850041211afbf81d99759f7b4d4c810f80e98b [formerly a41d5a1ad0]
Former-commit-id: 4a539b10ce
2012-12-12 09:09:28 -06:00
Ron Anderson
dfd8bb918e Merge "Issue #1395 Modifed AwipsCalender and added additional date/time related widgets" into development
Former-commit-id: 871672fb21 [formerly 4ba089395c] [formerly d05dc0c6ca] [formerly 871672fb21 [formerly 4ba089395c] [formerly d05dc0c6ca] [formerly 277c9cb0ec [formerly d05dc0c6ca [formerly c6c26811ad96f862ae3ffb0e6d9056f0d9edecfb]]]]
Former-commit-id: 277c9cb0ec
Former-commit-id: c68f7097ea [formerly 14849786eb] [formerly c97adef4e79f5fd88656a760f044b526fb9aa42f [formerly 087af45be8]]
Former-commit-id: bdfb3c578d25a549c5181a20261ae25710b751df [formerly a0e7ae0f08]
Former-commit-id: ea5a6d9537
2012-12-11 16:09:24 -06:00
Ron Anderson
f0def7ad04 Issue #1395 Modifed AwipsCalender and added additional date/time related widgets
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b

Former-commit-id: f7cbb2f02e [formerly cc883294f1] [formerly bc5f445ecf] [formerly f7cbb2f02e [formerly cc883294f1] [formerly bc5f445ecf] [formerly 43881be47a [formerly bc5f445ecf [formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]]]]
Former-commit-id: 43881be47a
Former-commit-id: cd8f3771d8 [formerly 01081fe723] [formerly 4cf2d90e058f019ff51a78b9bc82342a2dd98b36 [formerly 641d268bd8]]
Former-commit-id: 53d593cfd8a4d833625f15d65100d87532bbfea4 [formerly bd7162eca5]
Former-commit-id: 958957d603
2012-12-11 13:31:05 -06:00
Steve Harris
179755f156 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 d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]]
Former-commit-id: f6988eefff
Former-commit-id: 377804398b [formerly f02c1ef71d] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]]
Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4]
Former-commit-id: b0a60923c4
2012-12-11 08:45:53 -06:00
Steve Harris
cedbde75e3 12.12.1-12 baseline
Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 79b0e973ef [formerly 69ab975fab] [formerly 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]]
Former-commit-id: 54c80ccffc60d6ee8a544b475ed12355b32a2f26 [formerly 190378beeb]
Former-commit-id: f8a9ae24cb
2012-12-06 09:18:28 -06:00
Steve Harris
5f22640e99 12.12.1-8 baseline
Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]]
Former-commit-id: 5093a7c442
Former-commit-id: a45a7fe1bf [formerly ff4131c2ee] [formerly 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]]
Former-commit-id: d1f389a14d75a14807b83f7528cff619dda45f17 [formerly ec2cdc1593]
Former-commit-id: 0b22b3c014
2012-12-06 09:02:51 -06:00
Max Schenkelberg
0a1a51c6ef Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation
Amend: Fixed time matcher index error when no data is available in GFE

Change-Id: Ie222ba72cb3890d3dc32699828b45012cd1783e5

Former-commit-id: a614307c95 [formerly b744ba68e0] [formerly 624cafb066] [formerly a614307c95 [formerly b744ba68e0] [formerly 624cafb066] [formerly 1328deac56 [formerly 624cafb066 [formerly 974ef3068d48244ca622edc17045266cc34b6468]]]]
Former-commit-id: 1328deac56
Former-commit-id: c9f3a07ac0 [formerly 47c7518388] [formerly b86ec7c1b619648b5b662c8f776712e299e94036 [formerly c5536a9a84]]
Former-commit-id: 53e8d333e59bfe0fb923f0e1ef352a70cc918e0d [formerly b1c2bf1cc4]
Former-commit-id: a488900f51
2012-11-30 14:17:50 -06:00
Bryan Kowal
ecaf5b86dd Issue #1354 - the Linux CAVE thinclient and the MSFT Windows CAVE thinclient will now <b>always</b> include the same CAVE features
Change-Id: Ib0f1a90fc55293cff2d43d236bec93001d93e8bf

Former-commit-id: 8fe14a9a60 [formerly 3a4ca9582d] [formerly d3b455c955] [formerly 8fe14a9a60 [formerly 3a4ca9582d] [formerly d3b455c955] [formerly f99d351995 [formerly d3b455c955 [formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]]]]
Former-commit-id: f99d351995
Former-commit-id: 7c25f7a517 [formerly ae64e9ce3b] [formerly e09ce067241433822f5df68635984933d876ecc4 [formerly b0c65323b6]]
Former-commit-id: 1c92174acee3e52589c731c91b5fe228e8000580 [formerly 774d3a8f8d]
Former-commit-id: 49f45e1901
2012-11-28 16:30:10 -06:00
Dustin Johnson
c6dbe1bc0c Merge branch 'ss_builds' (12.12.1-4) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 08fd67e94a [formerly 5d5dbe27e1] [formerly 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]]
Former-commit-id: bcac2231856130f2c05f39f9472f65a6c8313dca [formerly ff33643234]
Former-commit-id: 6d21c445c2
2012-11-14 14:41:57 -06:00
Steve Harris
ccb16b9b44 12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]]
Former-commit-id: 57578da521
Former-commit-id: 4300583fc2 [formerly e35a321a8c] [formerly 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]]
Former-commit-id: 83b699079d09b1ae989d5d92097f6ebe23a8c242 [formerly 493f335c0b]
Former-commit-id: 2c2bfc949d
2012-11-14 14:19:20 -06:00
Steve Harris
b5fd6ed2fd Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]]
Former-commit-id: 00f3d51546
Former-commit-id: 98670f1cc2 [formerly 21ecd53719] [formerly 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]]
Former-commit-id: 02f982c590df771367e3d55fa354bfe951bed8de [formerly 59efd9a217]
Former-commit-id: ae9d9985cd
2012-11-13 17:28:50 -06:00
Steve Harris
9e4dbe2640 12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 5365b72401 [formerly 111e7607cf] [formerly 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]]
Former-commit-id: 0a26a9f757bec6107dd0eb5024ce9aaf5d84b865 [formerly 96a4a4f3f5]
Former-commit-id: 53d74c66e7
2012-11-13 17:14:24 -06:00
Ben Steffensmeier
b57a30d18d 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 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]]
Former-commit-id: e8090e654b
Former-commit-id: fa599c93a8 [formerly 109ec1e778] [formerly 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3]]
Former-commit-id: 1922ebb0208920ac3ef27814907ade54d1a0244a [formerly 7761060a12]
Former-commit-id: 9f2f2591ee
2012-11-13 16:00:19 -06:00
Steve Harris
94cd5a1388 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de]
Former-commit-id: af59663a99
2012-11-07 12:41:20 -06:00
Dustin Johnson
4bc4d95b21 Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]]
Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388]
Former-commit-id: 931d94d1de
2012-11-01 13:36:06 -05:00
Ben Steffensmeier
84ee3cecaa merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 24de750932 [formerly 9b8f2bcdbd] [formerly de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8]]
Former-commit-id: c7706c1a1114c9415a5ad6c33596002a145bf919 [formerly dd5ab10b61]
Former-commit-id: 86562637f0
2012-10-25 12:22:11 -05:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00
Ben Steffensmeier
51d1c03c36 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 a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]]
Former-commit-id: 266a2f317f
Former-commit-id: 97c23508d7 [formerly fde1e73d58] [formerly aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3]]
Former-commit-id: 4391a50cd6a1b526355ffcad5b2b61ac30604784 [formerly b2fdd9283d]
Former-commit-id: 29777154bb
2012-10-12 12:45:50 -05:00
Steve Harris
75d99f4e93 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 6e0b2c55d7 [formerly 772c60efa4] [formerly 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc]]
Former-commit-id: 8fe8231e2d1c3ba8a832320dad34957e6a59e8fe [formerly e72b6d5da6]
Former-commit-id: ff9321e3ce
2012-10-08 13:26:20 -05:00
Steven Harris
db663faca9 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
2012-09-27 15:57:45 -05:00
Steve Harris
32608f3225 12.10.1-7 baseline
Former-commit-id: 9677f9321f [formerly 2ee78eaf6d] [formerly b754630136] [formerly 9677f9321f [formerly 2ee78eaf6d] [formerly b754630136] [formerly 7b37cfca85 [formerly b754630136 [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]]]]
Former-commit-id: 7b37cfca85
Former-commit-id: 3df1d781a7 [formerly b18e5b5f2e] [formerly 3c2e7eeb8b3932870c7deeb8b9c0408a284968c4 [formerly 30592ab872]]
Former-commit-id: 5a0ba5b4c37f5fddce4a8d1a566ae6a457f326b2 [formerly 2a6e4b513c]
Former-commit-id: 6419b3c85c
2012-09-25 10:21:10 -05:00
Ben Steffensmeier
2be6128151 Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 54767956bc [formerly 8e5b20236d] [formerly 9632663c0a] [formerly 54767956bc [formerly 8e5b20236d] [formerly 9632663c0a] [formerly f918b6636f [formerly 9632663c0a [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]]
Former-commit-id: f918b6636f
Former-commit-id: ecdef95d0a [formerly 9512238d6e] [formerly 7490d8b24afa2934ebd15d8ff27aa170ba918366 [formerly 6c38e6abb2]]
Former-commit-id: c681a18cb95fad2c1f4c02dc98365a32a2b66a40 [formerly 769e28c28d]
Former-commit-id: 231ab11d9a
2012-09-24 14:05:22 -05:00
Steve Harris
987397b2db 12.10.1-4 baseline
Former-commit-id: ddc923e3e0 [formerly 9cd1f3ec0f] [formerly 791ef6cedf] [formerly ddc923e3e0 [formerly 9cd1f3ec0f] [formerly 791ef6cedf] [formerly 92cc2d8605 [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]]
Former-commit-id: 92cc2d8605
Former-commit-id: 27d8601fe0 [formerly f641cdd4e0] [formerly 53da655c90a1b4d0e3b7bbcaf373c23ba32edc6a [formerly b4d2a0e8dd]]
Former-commit-id: 5159825bf9b81d8d0188fb4bcfd469ccb27fd393 [formerly 451459d8cb]
Former-commit-id: f61c5114e8
2012-09-13 12:33:36 -05:00
Steve Harris
ed04125cd7 12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec]
Former-commit-id: e57e7237a9
2012-09-13 12:08:11 -05:00
Steve Harris
9d4e230e7a 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
2012-09-11 16:00:38 -05:00
Steve Harris
4ccea19158 12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]]
Former-commit-id: a66f3f4b60
Former-commit-id: 406bde9fd0 [formerly ec74f638e5] [formerly f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d]]
Former-commit-id: c8612b01cf2efa0937102321eb6c14dfe7097005 [formerly cc3c3dadee]
Former-commit-id: 5684a84a46
2012-09-11 15:50:57 -05:00
Steve Harris
bc97cf788a 12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83 [formerly e720b8ed31] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9]
Former-commit-id: a924a8347a
2012-09-04 12:07:27 -05:00
Steve Harris
e38cbf019b 12.9.1-12 baseline
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]]
Former-commit-id: 150bc967a5
Former-commit-id: 15fa63819d [formerly 782941ccc1] [formerly 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e]]
Former-commit-id: 636b0752d8e9909d3f1d52f3fb2dd51e26dcd63d [formerly 38aa573545]
Former-commit-id: c1e601dc30
2012-09-04 11:47:38 -05:00
Steve Harris
98059f9ef1 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
2012-08-21 15:27:03 -05:00
Steve Harris
867586657b 12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3 [formerly d7d60cc623] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501]
Former-commit-id: 7e1d1f6e08
2012-08-15 15:19:10 -05:00
Steve Harris
31353e2296 12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
2012-08-15 13:59:00 -05:00
Steve Harris
1098368e19 12.8.1-5 baseline
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced [formerly dab00b12e6] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3]
Former-commit-id: d3be09bd74
2012-08-01 10:45:37 -05:00
Steve Harris
23dc8deeb0 12.7.1-8 baseline
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972 [formerly f2102bfb24] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9]
Former-commit-id: 36e2ad3023
2012-07-19 16:20:40 -05:00