Commit graph

3243 commits

Author SHA1 Message Date
Nate Jensen
44795095a4 Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing
Change-Id: I49467fe6e9425a73985f729bc1ea4b10eb139c16

Former-commit-id: 37b332864d [formerly 25b78917ff] [formerly cf656dddc6] [formerly d364cfe32e [formerly cf656dddc6 [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]]
Former-commit-id: d364cfe32e
Former-commit-id: c3a9606c2218691935816ad67207a547e1d9ab53 [formerly dc7c2fd063]
Former-commit-id: f110fe5f6f
2013-07-25 14:59:01 -05:00
Nate Jensen
98a80d01a8 Merge "Issue #2208 moving ncep unit tests to tests project" into development
Former-commit-id: ebb7c0e559 [formerly 5590514a50] [formerly 825dd73eb4] [formerly 21261b1d2f [formerly 825dd73eb4 [formerly a7a6e14f62c7f17808330ea464129dabbe6d1afb]]]
Former-commit-id: 21261b1d2f
Former-commit-id: b535edaf35a4c674c9d8ab5377bbe3fb37ff6143 [formerly 8f168b281b]
Former-commit-id: 6db7d44964
2013-07-25 13:46:39 -05:00
Nate Jensen
7697ce9f79 Issue #2208 moving ncep unit tests to tests project
Change-Id: I723edf8936970d57108796ca1bc775b93e5e2507

Former-commit-id: cf4dce1b2d [formerly 38fa2ca855] [formerly 838554cf98] [formerly d7be59a97e [formerly 838554cf98 [formerly b027914534dc808a616e2b5b2ee55ed3dd304b2e]]]
Former-commit-id: d7be59a97e
Former-commit-id: 940cac296935adfd05d57f0ec83d385a448d267b [formerly 43f8386f7c]
Former-commit-id: 891484b533
2013-07-25 13:28:27 -05:00
Nate Jensen
4a54a4a6e3 Merge "Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint" into development
Former-commit-id: 78b463f5b0 [formerly 1c564eeaad] [formerly d5158a3fd5] [formerly 4f8cf1230f [formerly d5158a3fd5 [formerly 3d3e29b59fdac2e97d9783e1b102fe3227c4197d]]]
Former-commit-id: 4f8cf1230f
Former-commit-id: 19669ca32f38fac58b8710a7e750bc946f36af75 [formerly 65dc8671f7]
Former-commit-id: a8b2d95ba0
2013-07-25 13:22:37 -05:00
Max Schenkelberg
480c65b247 Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint
Amend: Added comments

Change-Id: Ieb045b1a8f8271adba804cacd6f47996ffae4cf5

Former-commit-id: ada5aca6fb [formerly 439c8040c9] [formerly d3df3e97c8] [formerly 3506c5d38d [formerly d3df3e97c8 [formerly 2cc61515015e125816b76c560900744258dbd2f1]]]
Former-commit-id: 3506c5d38d
Former-commit-id: 908b39930b95e040938a6d7a91f66ed331c72e70 [formerly dafbad884d]
Former-commit-id: b4807c9831
2013-07-25 13:18:46 -05:00
Nate Jensen
8daa0c9ae8 Issue #2208 moving edex unit tests to tests project
Change-Id: I9189ebd225df930d021855c19d338e74af800702

Former-commit-id: 4b14026435 [formerly 2103294b75] [formerly 8d1e19f2df] [formerly 15fae243c9 [formerly 8d1e19f2df [formerly 37c1d3c5b1a60260a537951c8a4bbceef4204029]]]
Former-commit-id: 15fae243c9
Former-commit-id: 4d4ce0a9603f247eb573e5562887a5ae4518d04d [formerly fd38b63609]
Former-commit-id: be35d04928
2013-07-25 12:29:46 -05:00
Richard Peter
9c31c08d9d Merge "Issue #2216 Removetime stamp filer when copying to a hdf5 file." into development
Former-commit-id: 3a77af7cea [formerly edd3f92a2e] [formerly 766dc280e6] [formerly 37b87b0a6f [formerly 766dc280e6 [formerly d69fb813113fbaf92400e90bfd63e7de2a65b639]]]
Former-commit-id: 37b87b0a6f
Former-commit-id: a3427a7f426ce712b6e0b79b71542fec1b67159e [formerly 7a5327af97]
Former-commit-id: fcb150ef7d
2013-07-25 10:55:39 -05:00
Nate Jensen
6bf5baf7ca Merge "Issue #2203 synchronize init and dispose of frames" into development
Former-commit-id: 50368c8cea [formerly 989ce29e03] [formerly 9ad16f084a] [formerly 1bb0208372 [formerly 9ad16f084a [formerly dff57efeb2c54cffc5caf61a50bf954cc39bdc37]]]
Former-commit-id: 1bb0208372
Former-commit-id: bdf55c4a6c6ec81907b7ed4ae831d427e72f1c20 [formerly 294a8d0d38]
Former-commit-id: f84d36038c
2013-07-25 10:02:42 -05:00
Nate Jensen
d20b7f17c0 Merge "Issue #2189 Added a FontType option when initializing a font from a file." into development
Former-commit-id: a25f442ddc [formerly ca729f1c49] [formerly c8d7c9cdf9] [formerly 7b1d8cb576 [formerly c8d7c9cdf9 [formerly a17330cc596961b4b3630579631de438f971c884]]]
Former-commit-id: 7b1d8cb576
Former-commit-id: b29e7a9876349d4e309e91c0af2186dfa94e3345 [formerly 29e7454a4f]
Former-commit-id: 94cb066d8c
2013-07-24 17:01:06 -05:00
Max Schenkelberg
4ce2412501 Issue #2189 Added a FontType option when initializing a font from a file.
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments

Change-Id: Ia5608cb7ffd0b760b3922e65107e66c971fa3e63

Former-commit-id: 723332e20a [formerly 52110961b4] [formerly c386533867] [formerly 3381c0016e [formerly c386533867 [formerly 9250700e425983156dd2d226556647d6a2bf43af]]]
Former-commit-id: 3381c0016e
Former-commit-id: 580e0daa3b16e5dda092a1efbc79fd49e8c80aa2 [formerly a8972da606]
Former-commit-id: 473c2f2659
2013-07-24 16:35:50 -05:00
Nate Jensen
23b6c0281a Issue #2203 synchronize init and dispose of frames
Change-Id: I94504a039f321ff40830b3bb7e21d31bf586a0d0

Former-commit-id: f213ead41f [formerly f556c7191b] [formerly b053fea59b] [formerly 162a1ba48f [formerly b053fea59b [formerly ed75a28d871dc1e97717fa44636df635eed8b4fc]]]
Former-commit-id: 162a1ba48f
Former-commit-id: 9eb75c7c0a2d21497d1472054a78c53207337705 [formerly ac310f7bbf]
Former-commit-id: 52e1262094
2013-07-24 16:17:43 -05:00
Roger Ferrel
59c42662ca Issue #2216 Removetime stamp filer when copying to a hdf5 file.
Change-Id: Ib3ff230e410a73ea63c5d5f5dc2a27efa663921f

Former-commit-id: cfbfe1852d [formerly ded6102f7d] [formerly 47632854c3] [formerly e90ec9184c [formerly 47632854c3 [formerly ec1c371beb034e8ea256c18b7da074cabebe56f4]]]
Former-commit-id: e90ec9184c
Former-commit-id: 4d34be19b514b34d22fe966ed6e032c59e6e1c69 [formerly b9bcc23b96]
Former-commit-id: d6e54addf1
2013-07-24 15:21:18 -05:00
Richard Peter
44f9b2de8e Merge "Issue #1655 - Delta Scripts for adding ddsystemstatus table." into development
Former-commit-id: 5cbd3e5d3d [formerly bfc288965c] [formerly d0fb138b5e] [formerly 56c16fc15b [formerly d0fb138b5e [formerly 6d4b225142a86cbffb50af02127a96edddef3d96]]]
Former-commit-id: 56c16fc15b
Former-commit-id: 38ffa20e40727f6ff909b96f5f40a5ab440072b3 [formerly 9c4070b8d5]
Former-commit-id: 3ada8d3a05
2013-07-24 13:47:17 -05:00
Nate Jensen
d023b3d75b Merge "Issue #2032 move warngen files out of build.edex" into development
Former-commit-id: 91a41431a1 [formerly 3dc28df1e7] [formerly b300d9a847] [formerly 90646a6cb9 [formerly b300d9a847 [formerly b81e696e390e7d46939e546661a56d23b7c965cf]]]
Former-commit-id: 90646a6cb9
Former-commit-id: c749231248976af3265055563f94e8716ac64886 [formerly f5ab274c2c]
Former-commit-id: fe41d0e590
2013-07-24 12:53:48 -05:00
Bryan Kowal
c3704454f7 Merge "Issue #2164 - disable build of awips2-notification temporarily." into development
Former-commit-id: 81349638a9 [formerly 45b521958e] [formerly 990b162124] [formerly d0b6aeba28 [formerly 990b162124 [formerly 619acd4183c8f5a6d856bcf6174161b769060bbc]]]
Former-commit-id: d0b6aeba28
Former-commit-id: 10c960581837a5ad0da007e07e9306a1d20900b2 [formerly 9ac5967643]
Former-commit-id: 7509e7e9b1
2013-07-24 12:47:51 -05:00
Bryan Kowal
d9c8a62bbd Issue #2164 - disable build of awips2-notification temporarily.
Former-commit-id: 631fa7e5bf [formerly bedb6e5b55] [formerly 9ae7f63e26] [formerly cccb37ebc0 [formerly 9ae7f63e26 [formerly 69f7d9afd3d61fe1a68b16b98d7d3a41d4fcc2c4]]]
Former-commit-id: cccb37ebc0
Former-commit-id: faee5296a8e05ac1bd6012bc5025005b71e77423 [formerly 779c2ea7a2]
Former-commit-id: 693a72ad6a
2013-07-24 12:45:29 -05:00
Mike Duff
aee4bb328b Issue #1655 - Delta Scripts for adding ddsystemstatus table.
Change-Id: Ib2618f907e9e13567ef40a5d2613b12f85a7011f

Former-commit-id: 4b7bb2baca [formerly b62085d376] [formerly 4a5bbf85da] [formerly 03b39f12bc [formerly 4a5bbf85da [formerly 5ff320a3345d510a1f848460ed8739b20f7a5629]]]
Former-commit-id: 03b39f12bc
Former-commit-id: a18cfd81ea8bd0708d3fc9e7b4a169913819161f [formerly ad6ac7ec68]
Former-commit-id: 538bc95479
2013-07-24 12:09:24 -05:00
Richard Peter
dd0188629e Merge "Issue #1953 added madis distribution srv config file. added gunzip to route for madis ingest." into development
Former-commit-id: 5f9f041ee0 [formerly 7427ec9c3c] [formerly 5cc249186d] [formerly 9450910f54 [formerly 5cc249186d [formerly e12170bac70d242572b7720c954b65735b202409]]]
Former-commit-id: 9450910f54
Former-commit-id: 191643f0412b43ecf2a1195efc9f1b08f7f9fac0 [formerly 716e02fa4c]
Former-commit-id: bfba94f286
2013-07-24 11:39:39 -05:00
Nate Jensen
d7e194a476 Issue #2032 move warngen files out of build.edex
Change-Id: Ie91caef086abca30d4b509453e1172a75fbaa09f

Former-commit-id: 7b22b2f72d [formerly 6180a3ba60] [formerly 22e72a646f] [formerly 4eb21a4ea3 [formerly 22e72a646f [formerly eabd12dbcb081897ed340394efee2e9482fab3c7]]]
Former-commit-id: 4eb21a4ea3
Former-commit-id: 044de761ebafac76ebf4e508d988ea954ff88168 [formerly 72726a8484]
Former-commit-id: b02bd4f7d8
2013-07-24 09:35:24 -05:00
Nate Jensen
fb816b8615 Merge "Issue #2223 fix melting layer memory leak" into development
Former-commit-id: dbd9508668 [formerly b604a13d73] [formerly 59f14f622f] [formerly e147fd411e [formerly 59f14f622f [formerly 88fd745e4bb12abc3302727f9ec0ed37afc133c5]]]
Former-commit-id: e147fd411e
Former-commit-id: 5778aee1b9379e13c6d0b9438bf3db9fb149fd4b [formerly 64ba0d05ab]
Former-commit-id: 7ae65a8946
2013-07-23 15:49:06 -05:00
Nate Jensen
23113b9799 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: bf0ff5eb76 [formerly 194db9a9f9] [formerly 88b2dd18e6] [formerly 7b5dcc09fa [formerly 88b2dd18e6 [formerly 3909f42ee097dac541328f8dc85330c618583b3f]]]
Former-commit-id: 7b5dcc09fa
Former-commit-id: 565ae6820431b40a925d369d31213973fbb0fab4 [formerly 8db7b7b5f6]
Former-commit-id: 95aeee2fe6
2013-07-23 14:27:29 -05:00
Ron Anderson
92c28d148c Merge "Issue #2009: Fix NullPointerException in SocketServer start up." into development
Former-commit-id: b516de5288 [formerly 5ff82ce522] [formerly 1b87afefc3] [formerly fd031ba61f [formerly 1b87afefc3 [formerly 71ae0f3b1c05f6e888e974946d7f4378c6efe32f]]]
Former-commit-id: fd031ba61f
Former-commit-id: d4d02ece1ceae4270bd382ee0efb3e81ec3a1a61 [formerly ee45dfcbea]
Former-commit-id: 90f3f0f4b7
2013-07-23 14:07:43 -05:00
Nate Jensen
51ebc7cbce Issue #2215 finish removing old facebook thrift
Change-Id: I32423b0f7d0b59cb439fcefcc9b5482947a8a4b1

Former-commit-id: fe77ac028d [formerly b22a1302e9] [formerly d6efde8ce2] [formerly a859d20865 [formerly d6efde8ce2 [formerly 66924bc597e0e6da2e5f28b10a40fca10d697fbd]]]
Former-commit-id: a859d20865
Former-commit-id: 3cf4ef02f8041c3ce9b6edba8975b7a332c3cd64 [formerly 1feaa09ccf]
Former-commit-id: 3bff1bfbad
2013-07-23 14:03:03 -05:00
David Gillingham
1ce2c2fcf4 Issue #2009: Fix NullPointerException in SocketServer start up.
Change-Id: I07683ba74410234d162e058df0bb3ff6e00ee59e

Former-commit-id: e10c907d60 [formerly a42de38d9e] [formerly f4b6c5929c] [formerly a711fea3d9 [formerly f4b6c5929c [formerly b2b6220d5b5ef2235edb57fe2ab2ce0cb234ee25]]]
Former-commit-id: a711fea3d9
Former-commit-id: 3f2862d88613bb9801408b75f01fb41f8da27c96 [formerly 9fbbeff998]
Former-commit-id: bf2e332633
2013-07-23 13:57:38 -05:00
Nate Jensen
8580abb9fe Merge "Issue #2215 upgrade thrift to version 0.9.0" into development
Former-commit-id: e4867042d2 [formerly 3aee4ff8a4] [formerly 99eff65daa] [formerly fa8d032583 [formerly 99eff65daa [formerly 5afd770ba549c485b3bba3e9c24aa5d9ae45f326]]]
Former-commit-id: fa8d032583
Former-commit-id: a78932ea4a0671427755bb002de3a9bab71a45fa [formerly 4aa9943e70]
Former-commit-id: d2d760e035
2013-07-23 13:48:19 -05:00
Nate Jensen
c869207445 Issue #2215 upgrade thrift to version 0.9.0
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70

Former-commit-id: 8707633263 [formerly 7197e75c15] [formerly 7b4938a999] [formerly 8898a6d2ba [formerly 7b4938a999 [formerly ab2e3f3e8910043b117887712258fc689f2e9445]]]
Former-commit-id: 8898a6d2ba
Former-commit-id: 4fe140d3706a9bb93c749820c213f4a95dd40dbc [formerly 375ad89ac8]
Former-commit-id: 7c438bd944
2013-07-23 12:28:07 -05:00
Greg Armendariz
15bdc4f6c4 Issue #2214 - Correct syntax
Former-commit-id: bd9c893494 [formerly eb6fef00c7] [formerly 2ea8c6cd5d8241cebf9f8690a338942596613dd4 [formerly 62751f2af8]] [formerly df8dd8d71b [formerly 62751f2af8 [formerly 0b398665c539949a624b9d2e3e0b11dcd501044d]]]
Former-commit-id: df8dd8d71b
Former-commit-id: a612dab10b72b7853b3b68864ce38d4b1f9c19bc [formerly 6f0c139522]
Former-commit-id: d8b26bf14f
2013-07-23 09:08:53 -05:00
Richard Peter
a138619ea8 Issue #1977: Fix NCEP Plugin issues due to merge
Former-commit-id: fc28bf67bb [formerly 3879c810db] [formerly fa6a457cd0] [formerly 00aeeb338b [formerly fa6a457cd0 [formerly 7c054e201e41d4df5fdb82faf2648e3f8cd227cc]]]
Former-commit-id: 00aeeb338b
Former-commit-id: 2fcab6ba0629d543c3db0c87536593cdc6fea382 [formerly b5e8abbcab]
Former-commit-id: 55730a775c
2013-07-22 16:37:43 -05:00
Bryan Kowal
0056d3fd53 Issue #2206 - relocate ATBL directory change to 13.5
Former-commit-id: 38ef1633d2 [formerly 7e0a51e3b2] [formerly bdcbf39a9a] [formerly 7dcbe438e9 [formerly bdcbf39a9a [formerly e6bc04f738a19c56563e81d1924969640223f843]]]
Former-commit-id: 7dcbe438e9
Former-commit-id: 51ed507e7af85ecf40d3340950202abafe787a1a [formerly 1729820501]
Former-commit-id: d393264d27
2013-07-22 16:37:42 -05:00
David Gillingham
10adecfece Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: b850630912 [formerly 5bfa13b5bf] [formerly cf21fb8fb3] [formerly 2281f4abc5 [formerly cf21fb8fb3 [formerly e6ad90e07a4af553edcb79ce71790f339b3f4ed5]]]
Former-commit-id: 2281f4abc5
Former-commit-id: be091cc35bece18942bed5dda679b7f3418ec640 [formerly ea42ffa3e5]
Former-commit-id: c14ab8225f
2013-07-22 16:37:42 -05:00
Nate Jensen
df039291f6 Issue #2142 fix ncep features
Change-Id: I3d13c58e450d7b0b41f41f608986537b51c3b4ca

Former-commit-id: 96afcbfa72 [formerly 412c880579] [formerly 747cab2eaf] [formerly 07dfc5d206 [formerly 747cab2eaf [formerly 3b35fd54816e3a8926e4061a4e36ca6be7287dd3]]]
Former-commit-id: 07dfc5d206
Former-commit-id: 3998b8ee2da3132c813de94e8a202f05ea32d3ad [formerly 2e92cf7bc1]
Former-commit-id: 682bf1ea10
2013-07-22 14:17:17 -05:00
Ron Anderson
6a13573cbc Merge "Issue #2009: Implement dual-domain GFE export_grids solution. Update MHS emulator program to support new directory structure and some code cleanup and refactoring." into development
Former-commit-id: 0b8a7a5725 [formerly 89a1c1b2c9] [formerly eb7893c0ba] [formerly 6540885809 [formerly eb7893c0ba [formerly ba587ef79d0db60aa31b681e1a0614d2fee65417]]]
Former-commit-id: 6540885809
Former-commit-id: fe10c63301d5526605b465bdd6d822d6248227eb [formerly d54aa6fe0b]
Former-commit-id: 8425e10cbc
2013-07-22 13:29:24 -05:00
Nate Jensen
78e718122d Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 178107c128 [formerly bcdaae1922] [formerly 22438766b4] [formerly 4c9cc211ec [formerly 22438766b4 [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: 3dc4b88484b3a717a07e85e47dd00b4cd0dcaaee [formerly 797760bb71]
Former-commit-id: a51d424851
2013-07-22 12:20:43 -05:00
Ron Anderson
dbb6dccf32 Merge "Issue #2185 Cache computed grid reprojections." into development
Former-commit-id: ddf5165267 [formerly 1a479e848f] [formerly ecce97701f] [formerly cd639e0220 [formerly ecce97701f [formerly 4f75c44b4dccb1cde093e32605dae809aa7a351c]]]
Former-commit-id: cd639e0220
Former-commit-id: 5eebb28a1dedb2ebe2a2eea184eb9d3992c79673 [formerly 61e947ba76]
Former-commit-id: 95a153d410
2013-07-22 11:43:48 -05:00
Richard Peter
4c53471f8e Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 8c66430f15bae97a44ce97acd0a8c896a7b3aa22 [formerly 15d1a6eab0]] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]
Former-commit-id: e7ec068c7e
2013-07-22 09:40:18 -05:00
Richard Peter
bbd3b18d5f Merge "Issue #1655 - Implement the framework for DD system status messaging" into development
Former-commit-id: e0564b3b6c [formerly d075546952] [formerly 51a097fb8d] [formerly 7ceaed43c3 [formerly 51a097fb8d [formerly 638b708123bb5a89292cc7778ed8211102718d28]]]
Former-commit-id: 7ceaed43c3
Former-commit-id: d38a47bc4241e93cb847b7f2b7c520baf5764f92 [formerly 5026801885]
Former-commit-id: ce7e6eeeed
2013-07-21 22:54:14 -05:00
Richard Peter
0845c5e3d1 Merge "Issue #1653 - Add a subscription summary" into development
Former-commit-id: f5040c96b7 [formerly c926f71281] [formerly 73c2547981] [formerly 68e565fdd9 [formerly 73c2547981 [formerly 74351187e3b7061ecfdfd040ff88b81823055889]]]
Former-commit-id: 68e565fdd9
Former-commit-id: 94ee77045edc6a368692dfc25e52a4a8f9104a06 [formerly 992b544e33]
Former-commit-id: d922c86c26
2013-07-21 22:04:02 -05:00
Richard Peter
1c023492a9 Merge "Issue #1992 Remove redundant time columns from bufrua. Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90" into development
Former-commit-id: 9429c1cd71 [formerly 4dc5e4ac27] [formerly 857426cc44] [formerly c7e9cd592e [formerly 857426cc44 [formerly 57a6241f16973a6e793d0917ca4242a51bfd55f6]]]
Former-commit-id: c7e9cd592e
Former-commit-id: 25cb9281915b246dafc2c45370d2c68f3373388d [formerly a86bc58e13]
Former-commit-id: 54d607a63f
2013-07-21 21:57:38 -05:00
Richard Peter
19beaef3fc Merge "Issue #2194 Fix site override." into development
Former-commit-id: bd05184660 [formerly 09b2f9fa7e] [formerly 26ab0ff706] [formerly 347fb5bc2f [formerly 26ab0ff706 [formerly f32db14a29a2d545aa44dddf0bec0d4e5e56069b]]]
Former-commit-id: 347fb5bc2f
Former-commit-id: 52c02331b3ac7bb70cc2423580905b8d948d36fd [formerly 3719e0d32f]
Former-commit-id: 3ddae2a6e5
2013-07-21 21:45:43 -05:00
Greg Armendariz
4c26ff845a Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: 16cb7d3737 [formerly fda3ba6d5b] [formerly a3b77f2623] [formerly d5ea12d97f [formerly a3b77f2623 [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]
Former-commit-id: d5ea12d97f
Former-commit-id: 6a070220b5d10249ff1b492f7b2e28dd9dd2b76e [formerly 3947baa02d]
Former-commit-id: c8c2a3d636
2013-07-19 14:15:24 -05:00
Ben Steffensmeier
8045e0c18c Issue #1992 Remove redundant time columns from bufrua.
Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90

Former-commit-id: 095f200bd9 [formerly e11099ff24] [formerly ad0cefc7fa] [formerly 9c55581ad2 [formerly ad0cefc7fa [formerly 3e916aad7d281ba53cd1634a15d7ac521943bc75]]]
Former-commit-id: 9c55581ad2
Former-commit-id: 7fbf5157984fd1fdbb4718c783654069ee6d1a47 [formerly a4f75b68d4]
Former-commit-id: f6eb262152
2013-07-19 11:53:23 -05:00
Dustin Johnson
ae0b440061 Merge "Issue #2193 - Fix for DD data browser subscription column." into development
Former-commit-id: 48daaa343b [formerly 9dbf1c69d8] [formerly 8e78f80ddd] [formerly 1acaf2dbfa [formerly 8e78f80ddd [formerly 674aeafa6f5d317a30e1f078b1ee38acff6acf95]]]
Former-commit-id: 1acaf2dbfa
Former-commit-id: 4e04acfbd88020959c649d17548647bac210a17e [formerly 900241dc68]
Former-commit-id: 176b1fddfb
2013-07-19 10:40:45 -05:00
Bryan Kowal
18f781ee61 Issue #2153 - fix 13.5.1 build after merge
Former-commit-id: 0a4d751112 [formerly b49ddfe75a] [formerly 914f2f7e2f] [formerly e9e3baa4df [formerly 914f2f7e2f [formerly a70fac10e48f1fc258a7756acb4d48560a54248d]]]
Former-commit-id: e9e3baa4df
Former-commit-id: 243a3b4f5bb1ab2d3bf98b3e738e06b86d9930de [formerly a7f431e526]
Former-commit-id: d67aa10275
2013-07-19 10:28:30 -05:00
Dave Hladky
d6a79d49be Issue #2209 Fixed un-serialized subscription in BandwidthManager
Change-Id: I7fd734cf360a55ab3d8f5869963dc50dd7d4f5a4

Former-commit-id: 5bb599bbfe [formerly e72a0afa66] [formerly 6da58160d6] [formerly e9b3030a6f [formerly 6da58160d6 [formerly 4107e8c2ab354d3bfb59b9c633cbd55bc0810066]]]
Former-commit-id: e9b3030a6f
Former-commit-id: 08fea8099b324bfb60699a31afbbf120225acc0e [formerly ca04bb6dd6]
Former-commit-id: 404087b14f
2013-07-19 10:08:09 -05:00
Richard Peter
e46425cd8d Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]
Former-commit-id: cc7189fcb7
Former-commit-id: d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343]
Former-commit-id: eefaf2c836
2013-07-18 21:46:25 -05:00
Nate Jensen
e0650650c9 Issue #2032 moving localization edex_static files to respective plugins, except colormaps
Change-Id: I287fe0a7d44782dc45265a9ffe2312549d95edbf

Former-commit-id: 3d226c0e69 [formerly 2ee87452db] [formerly da311b00a8] [formerly b7ea2ae30b [formerly da311b00a8 [formerly 69c812bb8f03844333497feba62951fbdcbc9e2b]]]
Former-commit-id: b7ea2ae30b
Former-commit-id: d21a0f2bca28d0f158a5d74da9f0d15c638ab7ac [formerly dce6c06174]
Former-commit-id: 41d3e45e60
2013-07-18 17:20:27 -05:00
Ben Steffensmeier
dcf44a8219 Issue #2194 Fix site override.
Former-commit-id: 63dfcb59da [formerly e01f3b5b0e] [formerly 1e9fe8ba48] [formerly ca6cba7b41 [formerly 1e9fe8ba48 [formerly b8a15544a205663adb4106453b4606d7f31f0423]]]
Former-commit-id: ca6cba7b41
Former-commit-id: 04b6aab49f71dc6f9a94c46624ebe5c357b2c720 [formerly 61cde4953c]
Former-commit-id: 1ebe55a213
2013-07-18 15:29:41 -05:00
Mike Duff
b8b8adfe89 Issue #1653 - Add a subscription summary
Change-Id: I677ae6d472a4de5bd8905650b2e13ffc1e2af149

Former-commit-id: 271959462c [formerly 3cac2bd4ba] [formerly 823f064ef8] [formerly d5ef7f056f [formerly 823f064ef8 [formerly d64a7895e08df47feedfb95edec033d0c87384c1]]]
Former-commit-id: d5ef7f056f
Former-commit-id: 8dcb19154786aa426856c5a801762302c07e0dc2 [formerly b4c9a0066a]
Former-commit-id: efea9b3739
2013-07-18 14:53:10 -05:00
Mike Duff
bc3471b3f7 Issue #2193 - Fix for DD data browser subscription column.
Change-Id: I1a76cdac15273b2e1b5b76095d9ae5f3ece8c1a3

Former-commit-id: 64c0321ac6 [formerly 997d195db6] [formerly 0ad0821d1c] [formerly 8229d5a23f [formerly 0ad0821d1c [formerly 344193f08e3ced288cd223a0ae295d13aa50e13a]]]
Former-commit-id: 8229d5a23f
Former-commit-id: 3c29b97739bff8c1739f10963f09157b93f9b97f [formerly 4495425388]
Former-commit-id: 22e08fc1bb
2013-07-18 14:30:39 -05:00
Dustin Johnson
a09755465b Merge "Issue #2191 Fixed spring error" into development
Former-commit-id: 9a3cfe6fec [formerly 45d84cf09f] [formerly 4bd8184d8a] [formerly 8b908afc8f [formerly 4bd8184d8a [formerly 8794f7763a3cb982c5c282b40cfc82b466f49e5f]]]
Former-commit-id: 8b908afc8f
Former-commit-id: 36bde70385adc9206b5ae2e0a721fef0e65b95ae [formerly c79352ae95]
Former-commit-id: 952dfd04f1
2013-07-18 13:21:01 -05:00