Greg Armendariz
b79ecc28e3
Removed merge code from the source code
...
Former-commit-id: 2bb407ea8b
[formerly 5511f0b3a6
] [formerly 2f9136843b
[formerly 9652fe27ae424cba83296a714a720e554390550a]]
Former-commit-id: 2f9136843b
Former-commit-id: 3a3486b0b7
2013-03-14 11:15:08 -05:00
Nate Jensen
e2e9a845d5
Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
...
Former-commit-id: 9dbb7660a7
[formerly 29b4cd2fb5
] [formerly 490ffe2772
[formerly 086546a518276d519aca779d55c160f4f8bcd577]]
Former-commit-id: 490ffe2772
Former-commit-id: a933532ad9
2013-03-14 09:48:16 -05:00
Roger Ferrel
3baa2e9220
Issue #1790 Changes for non-blocking PointDataControlDlg dialog.
...
Change-Id: Icf7a2f8f890d20c8b92fa2ed82331cdfe3e23908
Former-commit-id: c556928998
[formerly dae3fb5938
] [formerly 62b241a548
[formerly 930165c71745d13bd443afd71cf3b360a4c77fa5]]
Former-commit-id: 62b241a548
Former-commit-id: 09f4c18b5c
2013-03-14 08:22:05 -05:00
Ben Steffensmeier
2d622e6053
Issue #1792 Improve performance of gfe parm time weighted average.
...
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: a9695abb45
[formerly 22624ba5d3
] [formerly 52c167cf00
[formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]
Former-commit-id: 52c167cf00
Former-commit-id: 8f6a7c0746
2013-03-13 18:52:52 -05:00
Ron Anderson
de14cd0baa
Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
...
Former-commit-id: 0c881b4a85
[formerly 3b65608373
] [formerly 61f74305e2
[formerly 437a30971b299965540d47f572ad83cd0d7df120]]
Former-commit-id: 61f74305e2
Former-commit-id: a7b6e1689b
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
f5680beaa9
Issue #1791 Implement bulk getGrids to improve performance.
...
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: 37bae0988b
[formerly 4c150b0fd6
] [formerly 89eb902284
[formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]
Former-commit-id: 89eb902284
Former-commit-id: 7abf3cfb39
2013-03-13 17:09:20 -05:00
Dave Hladky
9e97fc9efe
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 765be278bb
[formerly 38b952a220
] [formerly 5dc454c7ef
[formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
2013-03-13 13:56:33 -05:00
Steve Harris
ed5f1dbab6
13.3.1-7 baseline
...
Former-commit-id: 97d2f521e4
[formerly a72254cc75
] [formerly e12ed113ae
[formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Greg Armendariz
f121df7e86
Merge "Issue #1638 fix build" into development
...
Former-commit-id: 28eec498f3
[formerly cc168cb94c
] [formerly a06a730696
[formerly 9c0fe6bf68406ef7fbcf6b68888acb24dabb8fd9]]
Former-commit-id: a06a730696
Former-commit-id: 12e912c548
2013-03-13 08:56:00 -05:00
Nate Jensen
5067a7b372
Issue #1638 fix build
...
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e
Former-commit-id: 975d044ba6
[formerly 192fe9a724
] [formerly 1cbc7bbfdc
[formerly fe7a28034739ec871528f041cfa7a488e5c71378]]
Former-commit-id: 1cbc7bbfdc
Former-commit-id: 733186900f
2013-03-13 08:50:26 -05:00
Dustin Johnson
f5a3b57107
Issue #1784 Move NCF bandwidth manager code to data delivery repo
...
Amend:
Publish JUnit test reports as XML, in support of Jenkins.
Fix build/merge of 13.3.1 code so it compiles.
Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4
Former-commit-id: 2983ed29e4
[formerly 71365cd945
] [formerly 1930183036
[formerly 60efd125706d618ae06eb84f959302213da2f7f1]]
Former-commit-id: 1930183036
Former-commit-id: 48a96911c8
2013-03-13 08:39:08 -05:00
Nate Jensen
a4a5a1e94f
Merge "Issue #1638 fix velocity on windows" into development
...
Former-commit-id: 37d996c64c
[formerly 4486bd9941
] [formerly 676b3c9d11
[formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]]
Former-commit-id: 676b3c9d11
Former-commit-id: 33f185d021
2013-03-12 16:43:13 -05:00
Nate Jensen
35d0187e3d
Issue #1638 fix velocity on windows
...
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a
Former-commit-id: 5e545cc9c4
[formerly 863d4cf3df
] [formerly cbf0343d72
[formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]
Former-commit-id: cbf0343d72
Former-commit-id: b00ccd2b77
2013-03-12 16:04:59 -05:00
Steve Harris
bca46a1354
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 36261cb095
[formerly 753a5213ab
] [formerly 0cd7e56e65
[formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]
Former-commit-id: 0cd7e56e65
Former-commit-id: d5bcdb0015
2013-03-12 16:04:23 -05:00
Dave Hladky
155903d135
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: 5c65862b8f
[formerly a1006667e0
] [formerly 4b08491880
[formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
2013-03-12 15:48:34 -05:00
Mike Duff
a712efa614
Issue #1760 - fix minutes on the y axis of 3 hour graph
...
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69
Former-commit-id: a6eea1874b
[formerly 714de645d5
] [formerly 7040daf472
[formerly 1c1c34c7eec36f378cfd2969779f68f9a1de4159]]
Former-commit-id: 7040daf472
Former-commit-id: b5bccd0bb2
2013-03-12 11:25:05 -05:00
Lee Venable
b471e3807f
Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
...
Former-commit-id: 9a69cd3524
[formerly d5af1f02c5
] [formerly 28d74d91b0
[formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]
Former-commit-id: 28d74d91b0
Former-commit-id: e080fb5106
2013-03-12 09:08:44 -05:00
Mike Duff
2df046d409
Issue #1781 - Fix Hydro Time Series slow table loads
...
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d
Former-commit-id: 492cf0f7e6
[formerly 6a6844fdaf
] [formerly cac9bd6119
[formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]
Former-commit-id: cac9bd6119
Former-commit-id: caed059e23
2013-03-12 09:03:08 -05:00
Steve Harris
6fe4b16924
13.3.1-6 baseline
...
Former-commit-id: 2e110bd151
[formerly 3a4c7931e1
] [formerly 566b677d09
[formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
2013-03-12 08:35:45 -05:00
Roger Ferrel
0deb290c24
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: 70bd9aafa7
[formerly 4deb731bd0
] [formerly b421c97d86
[formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]
Former-commit-id: b421c97d86
Former-commit-id: 334f2c4a57
2013-03-11 13:00:44 -05:00
Roger Ferrel
7e5bb824d9
Issue #1735 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: a73687c1b8
[formerly 6744238fce
] [formerly 9e8472bab6
[formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]
Former-commit-id: 9e8472bab6
Former-commit-id: 3684c7efed
2013-03-11 11:16:22 -05:00
Dave Hladky
dd446abd03
Issue #1769 Crashing FFMP caused by thread wait
...
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611
Former-commit-id: 50696bee89
[formerly 2a854d7c30
] [formerly bb4c54eff0
[formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]
Former-commit-id: bb4c54eff0
Former-commit-id: 73c21a6ead
2013-03-08 09:58:17 -06:00
Nate Jensen
c4175c161f
Issue #1753 log on user shutdown
...
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549
Former-commit-id: f101934a30
[formerly a7e9cfdb39
] [formerly 163f93019b
[formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]
Former-commit-id: 163f93019b
Former-commit-id: d6c3c84d30
2013-03-06 09:36:00 -06:00
Jonathan Sanchez
234d73c905
Issue #1600 Created a utility class for adjust angles.
...
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: 80ea3e1ec2
[formerly 8f70214f66
] [formerly 6a3281c878
[formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]
Former-commit-id: 6a3281c878
Former-commit-id: c2b021427b
2013-03-05 16:02:47 -06:00
Jonathan Sanchez
40f52ab049
Issue #1600 Created a utility class for adjust angles.
...
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: 3fface264c
[formerly 1a91fe52e7
] [formerly 1f2db32448
[formerly 14676fe089c0132febc3f533e6cbf2d00f117b90]]
Former-commit-id: 1f2db32448
Former-commit-id: 42bcef0be0
2013-03-05 15:05:19 -06:00
Steve Harris
4a0b8772ec
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 6b13492420
[formerly d5b80f9225
] [formerly aa0e9acefd
[formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: aa0e9acefd
Former-commit-id: b9563da8a8
2013-03-05 12:29:44 -06:00
Steve Harris
b423579e4a
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 61a19a460b
[formerly 305dd72969
] [formerly 57f42761d7
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 57f42761d7
Former-commit-id: a8e1557c62
2013-03-05 12:27:49 -06:00
Steve Harris
a240379588
13.3.1-5 baseline
...
Former-commit-id: 8123d5ac45
[formerly a89221c75b
] [formerly e26f7eb151
[formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
2013-03-05 10:47:06 -06:00
Steve Harris
3e0614b43a
13.3.1-4 baseline
...
Former-commit-id: d79303de13
[formerly 8c0b90f292
] [formerly 2edca90902
[formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
2013-03-05 10:39:59 -06:00
Nate Jensen
3c5ca0546f
Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
...
Former-commit-id: b393674ef3
[formerly b803ae3801
] [formerly a952d48b3e
[formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]
Former-commit-id: a952d48b3e
Former-commit-id: e3db522be4
2013-03-05 09:10:52 -06:00
Richard Peter
a4bf42628a
Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
...
Former-commit-id: e74f6074e7
[formerly 070f62d08e
] [formerly 784cd2145f
[formerly 01d727795063ff365f3209f44c223c707c3942ab]]
Former-commit-id: 784cd2145f
Former-commit-id: 180540eb47
2013-03-04 17:48:05 -06:00
Dave Hladky
0f3c9ba997
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
...
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: 22ebfe0ecb
[formerly 680317d9c4
] [formerly fc36146f48
[formerly ef45479b067655db8203f199502ea4e772a80e34]]
Former-commit-id: fc36146f48
Former-commit-id: 1260b40307
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
c99a17709e
Issue #1628 move xmx settings to linux so windows can override.
...
Former-commit-id: 5a88604ed6
[formerly fad56e32cc
] [formerly c1c5ac7926
[formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]
Former-commit-id: c1c5ac7926
Former-commit-id: b16399cfdb
2013-03-04 16:47:11 -06:00
Dustin Johnson
67d6a4ac99
Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
...
Amend:
Use isEmpty() where possible in BandwidthManager.
Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec
Former-commit-id: 73f884753a
[formerly 1161125c84
] [formerly 54c3980cba
[formerly 28c97849800c624bdaa161f05777703ee2a510ac]]
Former-commit-id: 54c3980cba
Former-commit-id: c0a1ae396a
2013-03-04 14:55:50 -06:00
Nate Jensen
e15d933ffb
Merge "Issue #1476 make fix for collaboration for issues with closing of views when detached" into omaha_13.3.1
...
Former-commit-id: 5d772a2228
[formerly 0542f04538
] [formerly 773b39548d
[formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]]
Former-commit-id: 773b39548d
Former-commit-id: aaac07f26c
2013-03-04 12:28:19 -06:00
Matt Nash
739a4ac2db
Issue #1476 make fix for collaboration for issues with closing of views when detached
...
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293
Former-commit-id: 311ac710ca
[formerly fdc6db0a50
] [formerly 1d25736871
[formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]
Former-commit-id: 1d25736871
Former-commit-id: 274becd212
2013-03-04 09:41:11 -06:00
Ron Anderson
fd86a481a7
Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
...
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8
Former-commit-id: f1d5ff7c9e
[formerly fdeb45705b
] [formerly e8f1b460ce
[formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]
Former-commit-id: e8f1b460ce
Former-commit-id: 78a8d8f1a1
2013-03-04 09:30:04 -06:00
Richard Peter
e00d5344b1
Issue #1740 : Baseline cave monitoring script
...
Former-commit-id: 1632bd2882
[formerly 163fb343de
] [formerly 783e9c1a25
[formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]
Former-commit-id: 783e9c1a25
Former-commit-id: 94d804a301
2013-03-01 16:17:25 -06:00
Bryan Kowal
c672931e5b
Issue #1638 - remove apache camel from the ncep feature. no plugin in the feature currently even imports
...
a package from apache camel
Change-Id: I88a91b8802d93e88b2fe66801ee336c3eb4bfd5a
Former-commit-id: ec2ca3f1f1
[formerly 62e7cca531
] [formerly bd7877a71e
[formerly e1bef5abe061a7dd550dc8e38318b275e6653470]]
Former-commit-id: bd7877a71e
Former-commit-id: 8fd24a3969
2013-03-01 14:32:31 -06:00
Ben Steffensmeier
8f4c2f2a39
Issue #1731 Optimize construction of scan resource.
...
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b
Former-commit-id: b0870c55f6
[formerly 86b9a4d8c2
] [formerly 9263ff1846
[formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]
Former-commit-id: 9263ff1846
Former-commit-id: 5a149c5dfa
2013-03-01 11:03:11 -06:00
Nate Jensen
a7cc38e3ba
Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
...
Former-commit-id: 308de6885f
[formerly d695473b0f
] [formerly 302e851b67
[formerly 94e54241b7e85c523e019603cd9e815c179dc584]]
Former-commit-id: 302e851b67
Former-commit-id: 0d0dfb474f
2013-03-01 10:15:46 -06:00
Bryan Kowal
c4709b1bfb
Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
...
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue
Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc
Former-commit-id: f806c880d3
[formerly d081a2afcd
] [formerly 4faf8aefbe
[formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]
Former-commit-id: 4faf8aefbe
Former-commit-id: 497bf33892
2013-02-28 18:09:25 -06:00
Ben Steffensmeier
334af0001b
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: d27d30c2db
[formerly f46686a6e2
] [formerly 2ca86633d6
[formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]
Former-commit-id: 2ca86633d6
Former-commit-id: 5068b18c6a
2013-02-28 17:00:56 -06:00
Ben Steffensmeier
f49b8cec68
Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
...
Former-commit-id: 74296b32db
[formerly df38a21e11
] [formerly aaffde9bf5
[formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]]
Former-commit-id: aaffde9bf5
Former-commit-id: 453723dc9d
2013-02-28 14:04:53 -06:00
Ben Steffensmeier
4bdd2946ee
Issue #1731 Remove unneccessary query in getDataStore.
...
Former-commit-id: 61875750c1
[formerly 52a64eda01
] [formerly 38728f3073
[formerly e78a920afcf25b94d5ea473f96d548ce227ea435]]
Former-commit-id: 38728f3073
Former-commit-id: 586438b393
2013-02-28 13:59:02 -06:00
Bryan Kowal
ecda5fe131
Issue #1638 - fix the build; temporarily copy features that are not built until the build
...
is capable of resolving its own dependencies.
Change-Id: Id6f31f6428178bf2174079e53f32ca522eeaa445
Former-commit-id: c099bc0df8
[formerly 30f59c4bcc
] [formerly 4f30dbb2b8
[formerly e2c597978c6559a4ef1d5eebb00328584745dae1]]
Former-commit-id: 4f30dbb2b8
Former-commit-id: 6a298318c5
2013-02-28 10:02:40 -06:00
Max Schenkelberg
fc58e7431a
Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
...
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62
Former-commit-id: 1769edc026
[formerly ec40d261e5
] [formerly 547c593dec
[formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]
Former-commit-id: 547c593dec
Former-commit-id: 13a4056335
2013-02-27 16:19:58 -06:00
Richard Peter
7adde5c3aa
Merge "Issue #1597 Moved some interpolation messages to Performance Log for consistency." into omaha_13.3.1
...
Former-commit-id: 2950dc9c42
[formerly 1ce1fb213b
] [formerly a9ffc8b170
[formerly f4e326c44178ab01b6c5a7c4514dbdd5c9e00cba]]
Former-commit-id: a9ffc8b170
Former-commit-id: c0e0a44e5f
2013-02-27 16:16:09 -06:00
Richard Peter
b3c0f56954
Merge "Issue #1659 Add time agnostic caching to grid derived parameters Change-Id: I59db267004a7acd51642c4360404e96d50378480" into omaha_13.3.1
...
Former-commit-id: 7c1c44c22f
[formerly 6535c1b6c7
] [formerly 656d9d74ae
[formerly ac6f072dbb19afe6dd76bfd368167ea60c2c8d00]]
Former-commit-id: 656d9d74ae
Former-commit-id: ba4a86de16
2013-02-27 14:46:49 -06:00
Ron Anderson
b2bffcf0de
Issue #1597 Moved some interpolation messages to Performance Log for consistency.
...
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8
Former-commit-id: f491d7f7c3
[formerly c9ca7a2943
] [formerly 079cdbcb29
[formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]
Former-commit-id: 079cdbcb29
Former-commit-id: a5195e137e
2013-02-27 14:45:30 -06:00