Commit graph

1419 commits

Author SHA1 Message Date
Dave Hladky
eefd544e4b Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]
Former-commit-id: 155903d135
2013-03-12 15:48:34 -05:00
Lee Venable
da5ff93f57 Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: 13d13428b7 [formerly 9a69cd3524] [formerly d5af1f02c5] [formerly 28d74d91b0 [formerly d5af1f02c5 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]]
Former-commit-id: 28d74d91b0
Former-commit-id: 6cbbc7b35f1af06bc44a23c6f7846a7c829b25b7 [formerly e080fb5106]
Former-commit-id: b471e3807f
2013-03-12 09:08:44 -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
0cec06c171 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]
Former-commit-id: 6fe4b16924
2013-03-12 08:35:45 -05:00
Roger Ferrel
7c6bd5aeb0 Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 0982485efe [formerly 70bd9aafa7] [formerly 4deb731bd0] [formerly b421c97d86 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]
Former-commit-id: b421c97d86
Former-commit-id: bfbd6592633352c9799a573f7b550fe350361788 [formerly 334f2c4a57]
Former-commit-id: 0deb290c24
2013-03-11 13:00:44 -05:00
Dave Hladky
f3c5756522 Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: b064d868db [formerly 50696bee89] [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 2a854d7c30 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]]
Former-commit-id: bb4c54eff0
Former-commit-id: 0d693e1163a146ba4b75d08a7448f53b6d3a905b [formerly 73c21a6ead]
Former-commit-id: dd446abd03
2013-03-08 09:58:17 -06:00
Nate Jensen
97172b7466 Issue #1753 log on user shutdown
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549

Former-commit-id: 2a34c5757a [formerly f101934a30] [formerly a7e9cfdb39] [formerly 163f93019b [formerly a7e9cfdb39 [formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]]
Former-commit-id: 163f93019b
Former-commit-id: 8af3fb81542f03f05402208a65fd3f1ea9cb1229 [formerly d6c3c84d30]
Former-commit-id: c4175c161f
2013-03-06 09:36:00 -06:00
Jonathan Sanchez
a5478559bc Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: edd4d9e02b [formerly 80ea3e1ec2] [formerly 8f70214f66] [formerly 6a3281c878 [formerly 8f70214f66 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]]
Former-commit-id: 6a3281c878
Former-commit-id: 3d49dc5085631dccfa4591b739f0f1e02b09ecee [formerly c2b021427b]
Former-commit-id: 234d73c905
2013-03-05 16:02:47 -06: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
aabd5cd51f 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]
Former-commit-id: e26f7eb151
Former-commit-id: 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]
Former-commit-id: a240379588
2013-03-05 10:47:06 -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
Nate Jensen
790eb9ef79 Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
Former-commit-id: d7bc5750ae [formerly b393674ef3] [formerly b803ae3801] [formerly a952d48b3e [formerly b803ae3801 [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]]
Former-commit-id: a952d48b3e
Former-commit-id: a901506e2ccdd1f021aa7b64beb4727c4a3b7241 [formerly e3db522be4]
Former-commit-id: 3c5ca0546f
2013-03-05 09:10:52 -06:00
Richard Peter
c7a4dcede6 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: 3cc3648b9b [formerly e74f6074e7] [formerly 070f62d08e] [formerly 784cd2145f [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]
Former-commit-id: 784cd2145f
Former-commit-id: 63aff6583f8761a1de816d6c0659c2736bd51159 [formerly 180540eb47]
Former-commit-id: a4bf42628a
2013-03-04 17:48:05 -06:00
Dave Hladky
f47935a03c Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly fc36146f48 [formerly 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]
Former-commit-id: fc36146f48
Former-commit-id: 88439cd2618a1c23c44807b5d72302de6137417a [formerly 1260b40307]
Former-commit-id: 0f3c9ba997
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
3a92dd3b6d Issue #1628 move xmx settings to linux so windows can override.
Former-commit-id: 9a8b585720 [formerly 5a88604ed6] [formerly fad56e32cc] [formerly c1c5ac7926 [formerly fad56e32cc [formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]]
Former-commit-id: c1c5ac7926
Former-commit-id: c2221c67d2e2345aa9b44715379eafeb2a87f000 [formerly b16399cfdb]
Former-commit-id: c99a17709e
2013-03-04 16:47:11 -06:00
Nate Jensen
300ec4fb40 Merge "Issue #1476 make fix for collaboration for issues with closing of views when detached" into omaha_13.3.1
Former-commit-id: f832e5949c [formerly 5d772a2228] [formerly 0542f04538] [formerly 773b39548d [formerly 0542f04538 [formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]]]
Former-commit-id: 773b39548d
Former-commit-id: 7ecaceea4b43ec1774bff495fb630d90c2281a3c [formerly aaac07f26c]
Former-commit-id: e15d933ffb
2013-03-04 12:28:19 -06:00
Matt Nash
b0a0086da1 Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: 999413b2e7 [formerly 311ac710ca] [formerly fdc6db0a50] [formerly 1d25736871 [formerly fdc6db0a50 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]]
Former-commit-id: 1d25736871
Former-commit-id: 04b14b2dd0b28e80f7bd47e6d8aa7a5e1bb12a5f [formerly 274becd212]
Former-commit-id: 739a4ac2db
2013-03-04 09:41:11 -06:00
Ron Anderson
29cf2d6ddd Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8

Former-commit-id: 3aba636666 [formerly f1d5ff7c9e] [formerly fdeb45705b] [formerly e8f1b460ce [formerly fdeb45705b [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]]
Former-commit-id: e8f1b460ce
Former-commit-id: 96dbec8a7d73075e3bd577828a3e622bb4ad9fbb [formerly 78a8d8f1a1]
Former-commit-id: fd86a481a7
2013-03-04 09:30:04 -06:00
Richard Peter
dd03372823 Issue #1740: Baseline cave monitoring script
Former-commit-id: e54d4ba855 [formerly 1632bd2882] [formerly 163fb343de] [formerly 783e9c1a25 [formerly 163fb343de [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]]
Former-commit-id: 783e9c1a25
Former-commit-id: a89d3bf559e31d9b30dc0a377f40e68385713756 [formerly 94d804a301]
Former-commit-id: e00d5344b1
2013-03-01 16:17:25 -06:00
Ben Steffensmeier
9eb0c3e778 Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b

Former-commit-id: f505cda0bf [formerly b0870c55f6] [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly 86b9a4d8c2 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]]
Former-commit-id: 9263ff1846
Former-commit-id: 33c36155057aba55daf29a51f9519c3aef6b6940 [formerly 5a149c5dfa]
Former-commit-id: 8f4c2f2a39
2013-03-01 11:03:11 -06:00
Nate Jensen
219bb543e9 Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
Former-commit-id: 4f9f0c29d2 [formerly 308de6885f] [formerly e3e075dd36c662191f6ad9082dfb09affee27852 [formerly d695473b0f]] [formerly 302e851b67 [formerly d695473b0f [formerly 94e54241b7e85c523e019603cd9e815c179dc584]]]
Former-commit-id: 302e851b67
Former-commit-id: 17d1c2aa06f8d4b7fa0a6d445508dd75428bbcf4 [formerly 0d0dfb474f]
Former-commit-id: a7cc38e3ba
2013-03-01 10:15:46 -06:00
Ben Steffensmeier
a8f39fdca4 Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
Former-commit-id: 1a87c84975 [formerly 74296b32db] [formerly df38a21e11] [formerly aaffde9bf5 [formerly df38a21e11 [formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]]]
Former-commit-id: aaffde9bf5
Former-commit-id: f9563e7cebad54220caad3834f5ca36d692dea86 [formerly 453723dc9d]
Former-commit-id: f49b8cec68
2013-02-28 14:04:53 -06:00
Ben Steffensmeier
49d61bd471 Issue #1731 Remove unneccessary query in getDataStore.
Former-commit-id: f7148f5a98 [formerly 61875750c1] [formerly 52a64eda01] [formerly 38728f3073 [formerly 52a64eda01 [formerly e78a920afcf25b94d5ea473f96d548ce227ea435]]]
Former-commit-id: 38728f3073
Former-commit-id: 6bdf9d288a06719bf4062080d72ce5ced97ff2a3 [formerly 586438b393]
Former-commit-id: 4bdd2946ee
2013-02-28 13:59:02 -06:00
Richard Peter
bbb5a8645a Merge "Issue #1597 Moved some interpolation messages to Performance Log for consistency." into omaha_13.3.1
Former-commit-id: a1fac92d05 [formerly 2950dc9c42] [formerly 1ce1fb213b] [formerly a9ffc8b170 [formerly 1ce1fb213b [formerly f4e326c44178ab01b6c5a7c4514dbdd5c9e00cba]]]
Former-commit-id: a9ffc8b170
Former-commit-id: 8dc79a2423c207ef96e5603edea8afe8a585ccd7 [formerly c0e0a44e5f]
Former-commit-id: 7adde5c3aa
2013-02-27 16:16:09 -06:00
Richard Peter
cd794fef64 Merge "Issue #1659 Add time agnostic caching to grid derived parameters Change-Id: I59db267004a7acd51642c4360404e96d50378480" into omaha_13.3.1
Former-commit-id: 47021a729d [formerly 7c1c44c22f] [formerly 6535c1b6c7] [formerly 656d9d74ae [formerly 6535c1b6c7 [formerly ac6f072dbb19afe6dd76bfd368167ea60c2c8d00]]]
Former-commit-id: 656d9d74ae
Former-commit-id: dd6610474414ec15f44a01e78340010a011fcac5 [formerly ba4a86de16]
Former-commit-id: b3c0f56954
2013-02-27 14:46:49 -06:00
Ron Anderson
ed6ca5734d Issue #1597 Moved some interpolation messages to Performance Log for consistency.
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8

Former-commit-id: bbf1f71873 [formerly f491d7f7c3] [formerly c9ca7a2943] [formerly 079cdbcb29 [formerly c9ca7a2943 [formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]]
Former-commit-id: 079cdbcb29
Former-commit-id: 846298e466d8aeb3c8339bc3ed51526767ad3154 [formerly a5195e137e]
Former-commit-id: b2bffcf0de
2013-02-27 14:45:30 -06:00
Ben Steffensmeier
8ca9ae2462 Issue #1659 Add time agnostic caching to grid derived parameters
Change-Id: I59db267004a7acd51642c4360404e96d50378480

Former-commit-id: 80ad26ea4a [formerly ebfedad360] [formerly db1028ee7a] [formerly 6d85856e60 [formerly db1028ee7a [formerly 9685d0b363f21afbb42df02e9871884123d75e2c]]]
Former-commit-id: 6d85856e60
Former-commit-id: 6743106851e0b13bd181170f2dd98ba1304bea6d [formerly 8112f669b3]
Former-commit-id: 0b2373ab4d
2013-02-27 12:37:14 -06:00
Ron Anderson
48d3f2e700 Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27

Former-commit-id: 36268bb1e2 [formerly 50f5e44b39] [formerly 36be1c5850] [formerly c35e06d82c [formerly 36be1c5850 [formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]]]
Former-commit-id: c35e06d82c
Former-commit-id: ec9f49b951e85cf9798a915887bf38d1be6b9eaf [formerly 5bd0dbcfca]
Former-commit-id: e240568bb9
2013-02-27 12:34:40 -06:00
Ron Anderson
e362632eca Issue #1708 Fix redundant excution of evaluateQuery.
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a

Former-commit-id: db805e2097 [formerly 2212f333a3] [formerly 8e1422f65ea479fdf23ed44e51e4289779d73417 [formerly a5a273c1c2]] [formerly 274ce762d8 [formerly a5a273c1c2 [formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]]
Former-commit-id: 274ce762d8
Former-commit-id: b2dd338df0ca4db81b2171b950912c2d66219f23 [formerly 84bd642290]
Former-commit-id: 93382aeed8
2013-02-26 19:00:56 -06:00
Ron Anderson
dc8d1dd95c Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: 547f0d086f [formerly d43afc8c67] [formerly bfe3c684df] [formerly f37999b1eb [formerly bfe3c684df [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: bf9a2b39ec50125619129c86673eb152b84b87e6 [formerly 77fbbb6a61]
Former-commit-id: 541557e0b0
2013-02-26 18:44:51 -06:00
Dustin Johnson
c23b8a58c3 Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7

Former-commit-id: 1d9690f299 [formerly 8038b840d8] [formerly 7852f88352] [formerly 88a9b953b6 [formerly 7852f88352 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]
Former-commit-id: 88a9b953b6
Former-commit-id: 188d47a162860963a3b8ee6af04bd72c07f6168a [formerly cc0254ba03]
Former-commit-id: 94300e0c1d
2013-02-26 15:06:04 -06:00
Lee Venable
923e4b413e Merge "Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down" into development
Former-commit-id: 41820c3632 [formerly a4b41e0309] [formerly 9cf3ca07b7] [formerly 46ff81108a [formerly 9cf3ca07b7 [formerly 26fa358838588643c003287d8125e58949c3648f]]]
Former-commit-id: 46ff81108a
Former-commit-id: eb05278da104f386aa87461ec56cd8a9b2591419 [formerly cb7fd87715]
Former-commit-id: 4212af7e8a
2013-02-26 14:11:35 -06:00
Mike Duff
9af05ad9b2 Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down
Change-Id: I92016564da48f7f736bebf58fdc0afca5cc1d9ff

Former-commit-id: dda044a519 [formerly fdd5e903c6] [formerly b48e70fff4] [formerly c77602652e [formerly b48e70fff4 [formerly 1d9c456b697a79f6093550a26cb3d2d4f972548d]]]
Former-commit-id: c77602652e
Former-commit-id: 1f9618136922328b8ba3926387a2723b1af8659d [formerly 3071eb8456]
Former-commit-id: 882c46dd85
2013-02-26 14:03:55 -06:00
Nate Jensen
a336b044bb Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development
Former-commit-id: 5ecc23350c [formerly f5ebeb1330] [formerly 1e50b3a0e8] [formerly 4e60fa682d [formerly 1e50b3a0e8 [formerly 698d1d88b5c67498046dcec558361797a01b07f5]]]
Former-commit-id: 4e60fa682d
Former-commit-id: 23d5874d2070097f18269874ad648fd0961e9e33 [formerly e1660e51f8]
Former-commit-id: 2b81ce6028
2013-02-26 13:46:30 -06:00
Dustin Johnson
78d88f4517 Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development
Former-commit-id: 5f4301cb7f [formerly 074fb0aa64] [formerly 47cb278c01] [formerly d31392d740 [formerly 47cb278c01 [formerly bf86849d284696553ed4cbc3f347afe2f791968d]]]
Former-commit-id: d31392d740
Former-commit-id: c8e8c462b09d5dae42fc85b112751c19ae6721cd [formerly a7d4b23597]
Former-commit-id: 8e4a990d1a
2013-02-26 13:41:46 -06:00
Dustin Johnson
6e3dfd6764 Merge "Issue #1588 - Fix match any/all in data browser dialog" into development
Former-commit-id: ab8506bab4 [formerly 3dd36d29cf] [formerly fb38cceecd] [formerly 76738dbf7d [formerly fb38cceecd [formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]]]
Former-commit-id: 76738dbf7d
Former-commit-id: b84a0916484c6fa68206e55b951062f4706a545c [formerly b77ebdc924]
Former-commit-id: bb5f6cc568
2013-02-26 13:37:14 -06:00
Matt Nash
ac795d4948 Issue #1506 fix deadlock and edit areas showing up from query
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49

Former-commit-id: f18955a1ed [formerly 4be89bdd43] [formerly c728f72ea3] [formerly b749edca54 [formerly c728f72ea3 [formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]]
Former-commit-id: b749edca54
Former-commit-id: 7fd44919b46c967d986955013a9d92fff46bb8e8 [formerly 51e6302178]
Former-commit-id: daea84a1e8
2013-02-26 12:20:08 -06:00
Dustin Johnson
c606b31379 Issue #1592 Don't submit adhoc query when X button clicked
Change-Id: I7a06857fa64a6d54279ec2dca1404062179fe279

Former-commit-id: 0ba5133583 [formerly 604a7c82b2] [formerly 598eb88a04] [formerly c6975aa379 [formerly 598eb88a04 [formerly 9cb2114c239e6782961e8127fe85b10a7ee38f06]]]
Former-commit-id: c6975aa379
Former-commit-id: 3f87c958340fba7c8c1875d78e5925e2eb83506a [formerly ab1dc2272b]
Former-commit-id: 898d7500aa
2013-02-26 12:07:36 -06:00
Steve Harris
e48cc61522 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 82d50b3eb6 [formerly 7ed1eacb6b] [formerly 9bcabe2c5d] [formerly 098b1e1579 [formerly 9bcabe2c5d [formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]]
Former-commit-id: 098b1e1579
Former-commit-id: becf9f6f60e4c46d8479291d783adafb70f1f495 [formerly 57440abebb]
Former-commit-id: 41e1594be7
2013-02-25 20:41:26 -06:00
Richard Peter
6f6c1b22c4 Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development
Former-commit-id: 2a69ad78b6 [formerly 2553955249] [formerly be9370576a] [formerly 1669945cdb [formerly be9370576a [formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]]]
Former-commit-id: 1669945cdb
Former-commit-id: 8cf852aa069619e371c2c57b44205b3c23c5a9cc [formerly aa5f3c80a0]
Former-commit-id: 56771955b4
2013-02-25 17:47:14 -06:00
Richard Peter
b5205f6b13 Merge "Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests." into development
Former-commit-id: 2e15dd3a75 [formerly af33dd1743] [formerly b98bdb3d81] [formerly 3b718bea52 [formerly b98bdb3d81 [formerly bedfb6a21680961421b42bcbcec470e41bb9523d]]]
Former-commit-id: 3b718bea52
Former-commit-id: 7ce74c902674348f2cef516514b2f29b684f8bc2 [formerly c21a1e9f61]
Former-commit-id: 25909b2ee1
2013-02-25 17:46:26 -06:00
Lee Venable
7fb13648f0 Merge "Issue #1625 Updated addOrRemoveCounty method." into development
Former-commit-id: 0be080c78b [formerly e54eb4ab55] [formerly e024e4e087] [formerly 7f769af427 [formerly e024e4e087 [formerly cda14b7c5e6563a9165fa734f35766816bccccf1]]]
Former-commit-id: 7f769af427
Former-commit-id: 0ab76cc18f600944e9a5f7f710dd240e73c4737f [formerly 0125935a7f]
Former-commit-id: 444a1f5d47
2013-02-25 17:25:56 -06:00
Jonathan Sanchez
c62a02700a Issue #1625 Updated addOrRemoveCounty method.
Former-commit-id: 4ee3a8d412 [formerly f59a08963c] [formerly cd6dd3c178] [formerly 8c2c7c97f7 [formerly cd6dd3c178 [formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]]
Former-commit-id: 8c2c7c97f7
Former-commit-id: 98a2ef23744e01ccb963e6b3513b3786a6c91d5c [formerly d4f4832d1a]
Former-commit-id: c861c71ae6
2013-02-25 17:15:09 -06:00
Ben Steffensmeier
b534254207 Issue #1659 Stop derived parameters from sending empty requests for cached times
Former-commit-id: ab23c25b35 [formerly ff232b87b4] [formerly 71652af086] [formerly 9edeadc966 [formerly 71652af086 [formerly 9605118022d378eb35c38d784729410d160d46df]]]
Former-commit-id: 9edeadc966
Former-commit-id: aa80a8187de2e4d543605366748b0f19a7a88e41 [formerly d6c59cb85a]
Former-commit-id: 9ec0008743
2013-02-25 17:08:12 -06:00
Ben Steffensmeier
483cff49ba Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests.
Former-commit-id: 92954639db [formerly f56b305581] [formerly fd2450c0df] [formerly 2fa5fb488e [formerly fd2450c0df [formerly 4826ccdd4db42342f913cfc9e9fef6bc276dcea9]]]
Former-commit-id: 2fa5fb488e
Former-commit-id: 68f149d87e2b399b7952382baa7c61797a67f3a4 [formerly e1e7a12ca2]
Former-commit-id: 5e1b9383a5
2013-02-25 16:58:25 -06:00
Ben Steffensmeier
abe93c1f6e Issue #1659 Cache station in StationUtils
Former-commit-id: 98ec05e12c [formerly 0ff907499c] [formerly 842437870e] [formerly 39bf907df7 [formerly 842437870e [formerly 5bd8303893ad59a23571c0564984b21da9ffe785]]]
Former-commit-id: 39bf907df7
Former-commit-id: 9e36b2f9b09d3f4dc4f9cdf074839d358f49c86a [formerly 5be0eab696]
Former-commit-id: 8ebeb61cea
2013-02-25 16:25:55 -06:00
Steve Harris
e4b9ef2cd3 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 650db426b9 [formerly cd99e680bb] [formerly b50e384a0f] [formerly e8135b9c14 [formerly b50e384a0f [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]
Former-commit-id: e8135b9c14
Former-commit-id: 516b4ee30c97e99a87f971673c76dd8b45556e63 [formerly 2398ef1e85]
Former-commit-id: 901cbbf56d
2013-02-25 16:05:22 -06:00
Steve Harris
f30d1cdf87 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1]
Former-commit-id: e46625f8f2
2013-02-25 15:58:48 -06:00
Mike Duff
f73faee133 Issue #1588 - Fix match any/all in data browser dialog
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49

Former-commit-id: af47a02e47 [formerly 0d2c817680] [formerly d00a790d7b] [formerly 086d24acc8 [formerly d00a790d7b [formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]]
Former-commit-id: 086d24acc8
Former-commit-id: f34a7712b345b1738f4e1c4927c8c43d0e321466 [formerly 1365596d4d]
Former-commit-id: dccb6b94b9
2013-02-25 15:53:55 -06:00
Dustin Johnson
6b5fdb5672 Merge "Issue #1620 - Fix set clean issue with job loader." into development
Former-commit-id: 81c261936f [formerly 79718b6a9c] [formerly 83a915210d] [formerly eff20112d2 [formerly 83a915210d [formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]]
Former-commit-id: eff20112d2
Former-commit-id: 77de144645b1acb61a1f55f57de766de97e3ddb8 [formerly 1255b87e2e]
Former-commit-id: b702146272
2013-02-25 09:43:19 -06:00