Commit graph

1695 commits

Author SHA1 Message Date
Ben Steffensmeier
ad0078d2e9 Issue #1793 Performance improvements for TCMWindTool
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e

Former-commit-id: 3f0030521d [formerly 7335a2336e] [formerly 7aa8b2d3eb] [formerly 3f0030521d [formerly 7335a2336e] [formerly 7aa8b2d3eb] [formerly 45a5cffdf3 [formerly 7aa8b2d3eb [formerly 055873318a368301fc966501b27001f5ace0bcae]]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: 55d80d760f [formerly e5b9e0ca46] [formerly 628065abbf3e3e03dedca4f091459d9085169d1c [formerly 364d6fd9ee]]
Former-commit-id: 4fe3069a05c6bc069a0cd306a5134a66e8ba310c [formerly 153a7dbd7d]
Former-commit-id: 41e3ac3923
2013-03-14 13:26:08 -05:00
Greg Armendariz
166fcb78a9 Removed merge code from the source code
Former-commit-id: 05d7892c3b [formerly 2bb407ea8b] [formerly 5511f0b3a6] [formerly 05d7892c3b [formerly 2bb407ea8b] [formerly 5511f0b3a6] [formerly 2f9136843b [formerly 5511f0b3a6 [formerly 9652fe27ae424cba83296a714a720e554390550a]]]]
Former-commit-id: 2f9136843b
Former-commit-id: ef59159bb9 [formerly b79ecc28e3] [formerly 486130740373c00d6c7a8808665421ce577a9b77 [formerly 3a3486b0b7]]
Former-commit-id: 0fe252f9bf5b69a3471bb0b71197934ca6b0d155 [formerly 8ea2042456]
Former-commit-id: cfc53af85e
2013-03-14 11:15:08 -05:00
Nate Jensen
f046b23f9b Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 14da2b6cc3 [formerly 9dbb7660a7] [formerly 29b4cd2fb5] [formerly 14da2b6cc3 [formerly 9dbb7660a7] [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 29b4cd2fb5 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]]]
Former-commit-id: 490ffe2772
Former-commit-id: b74d6315a6 [formerly e2e9a845d5] [formerly bb1674d56d5f72528a3f2eb6ea51452dfd9a36b1 [formerly a933532ad9]]
Former-commit-id: 75207b52738316a6767eb046282fd34cc9c6c47c [formerly 363efaec00]
Former-commit-id: c710def06d
2013-03-14 09:48:16 -05:00
Roger Ferrel
be6fbede98 Issue #1790 Changes for non-blocking PointDataControlDlg dialog.
Change-Id: Icf7a2f8f890d20c8b92fa2ed82331cdfe3e23908

Former-commit-id: c6b64c828c [formerly c556928998] [formerly dae3fb5938] [formerly c6b64c828c [formerly c556928998] [formerly dae3fb5938] [formerly 62b241a548 [formerly dae3fb5938 [formerly 930165c71745d13bd443afd71cf3b360a4c77fa5]]]]
Former-commit-id: 62b241a548
Former-commit-id: 463545471a [formerly 3baa2e9220] [formerly 07c0e26a4def2d1580d95e8b371943bfc4d36663 [formerly 09f4c18b5c]]
Former-commit-id: 8d6e588257e9d52dfb94bca386cf5faa7e817a20 [formerly d808a33c51]
Former-commit-id: 80ee3e1d66
2013-03-14 08:22:05 -05:00
Ben Steffensmeier
6b3e6e703b Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead

Former-commit-id: dcf02199ea [formerly a9695abb45] [formerly 22624ba5d3] [formerly dcf02199ea [formerly a9695abb45] [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 22624ba5d3 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]]
Former-commit-id: 52c167cf00
Former-commit-id: a440445437 [formerly 2d622e6053] [formerly 48609b58bd2286f625bd7a23b14b9741685a71df [formerly 8f6a7c0746]]
Former-commit-id: e54de36cfb829c41843de14a87917d4b35e60c55 [formerly 60bb04a055]
Former-commit-id: 7266a995f9
2013-03-13 18:52:52 -05:00
Ron Anderson
86d85d75e8 Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: f9c7fa9613 [formerly 0c881b4a85] [formerly 3b65608373] [formerly f9c7fa9613 [formerly 0c881b4a85] [formerly 3b65608373] [formerly 61f74305e2 [formerly 3b65608373 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]]
Former-commit-id: 61f74305e2
Former-commit-id: 87cd340e38 [formerly de14cd0baa] [formerly f55bb3e367547583c32d5cc1463941491ec9c6b6 [formerly a7b6e1689b]]
Former-commit-id: 4487e4817e53af625104ab94ce05c0bd8071ba49 [formerly b1088415cd]
Former-commit-id: 39e2d27a89
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
1f4315a7ed Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: a6a1d9bec7 [formerly 37bae0988b] [formerly 4c150b0fd6] [formerly a6a1d9bec7 [formerly 37bae0988b] [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 4c150b0fd6 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]]
Former-commit-id: 89eb902284
Former-commit-id: 7e998aa197 [formerly f5680beaa9] [formerly 10a52ad4fbe4cb9ea324302c2ac6a32c3b3fad23 [formerly 7abf3cfb39]]
Former-commit-id: f38c474fb547944154f869716e7a195f17c008a5 [formerly 6d699f7713]
Former-commit-id: f012dd8b0a
2013-03-13 17:09:20 -05:00
Dave Hladky
b111edeb8b Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 68114535f2 [formerly 9e97fc9efe] [formerly b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]]
Former-commit-id: 39e44db397ec904e6c2a1254ad2d956f2cd9c180 [formerly cb5ee4a7b8]
Former-commit-id: b85e19282b
2013-03-13 13:56:33 -05:00
Steve Harris
352658125b 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
2013-03-13 09:50:28 -05:00
Greg Armendariz
f60b305f53 Merge "Issue #1638 fix build" into development
Former-commit-id: 4f29b438ac [formerly 28eec498f3] [formerly cc168cb94c] [formerly 4f29b438ac [formerly 28eec498f3] [formerly cc168cb94c] [formerly a06a730696 [formerly cc168cb94c [formerly 9c0fe6bf68406ef7fbcf6b68888acb24dabb8fd9]]]]
Former-commit-id: a06a730696
Former-commit-id: 065fb32918 [formerly f121df7e86] [formerly 637e19f33ae49ff55331c55f304ac4387824f758 [formerly 12e912c548]]
Former-commit-id: 1f3322859b5eb30167b2fc5873ed367c2801b6d4 [formerly 0e6e5cf53e]
Former-commit-id: 85b7388ef6
2013-03-13 08:56:00 -05:00
Nate Jensen
6105ce4ddc Issue #1638 fix build
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e

Former-commit-id: 84ea117d75 [formerly 975d044ba6] [formerly 192fe9a724] [formerly 84ea117d75 [formerly 975d044ba6] [formerly 192fe9a724] [formerly 1cbc7bbfdc [formerly 192fe9a724 [formerly fe7a28034739ec871528f041cfa7a488e5c71378]]]]
Former-commit-id: 1cbc7bbfdc
Former-commit-id: 58cc71f75d [formerly 5067a7b372] [formerly f53aed250ff25cfca29a3a019820f483de4707c6 [formerly 733186900f]]
Former-commit-id: 96929b6e6d7ce6e7469bb02ab01eac63ad777d7f [formerly e7658f710b]
Former-commit-id: f9baf824cb
2013-03-13 08:50:26 -05:00
Dustin Johnson
71d6d82042 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: 2676e08fdd [formerly 2983ed29e4] [formerly 71365cd945] [formerly 2676e08fdd [formerly 2983ed29e4] [formerly 71365cd945] [formerly 1930183036 [formerly 71365cd945 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]]]]
Former-commit-id: 1930183036
Former-commit-id: fdaa9b5ce7 [formerly f5a3b57107] [formerly 9459f282f836590ae975e73dd24d60edd299352a [formerly 48a96911c8]]
Former-commit-id: 2ca9f41c1f96efae5c1b40855b28f7c73b8e3f8b [formerly 06b39b848b]
Former-commit-id: be4fe08b9d
2013-03-13 08:39:08 -05:00
Nate Jensen
e2c7b0f918 Merge "Issue #1638 fix velocity on windows" into development
Former-commit-id: 33b73b008f [formerly 37d996c64c] [formerly 4486bd9941] [formerly 33b73b008f [formerly 37d996c64c] [formerly 4486bd9941] [formerly 676b3c9d11 [formerly 4486bd9941 [formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]]]]
Former-commit-id: 676b3c9d11
Former-commit-id: 8778e9f945 [formerly a4a5a1e94f] [formerly 6bbc851111461bca4aabeb7be09dfa13233066b8 [formerly 33f185d021]]
Former-commit-id: 5b75cd5f21c9b565338722888e0df16dec5de5d8 [formerly d0f70dafb3]
Former-commit-id: 40d5631842
2013-03-12 16:43:13 -05:00
Nate Jensen
80ccca5828 Issue #1638 fix velocity on windows
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a

Former-commit-id: 48170212cb [formerly 5e545cc9c4] [formerly 863d4cf3df] [formerly 48170212cb [formerly 5e545cc9c4] [formerly 863d4cf3df] [formerly cbf0343d72 [formerly 863d4cf3df [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]]]
Former-commit-id: cbf0343d72
Former-commit-id: f4b80d4b15 [formerly 35d0187e3d] [formerly 86f6a376c5bb355801995427243a8f6c4288aac8 [formerly b00ccd2b77]]
Former-commit-id: 3cc6c3a9b8804cff5c9f07d37b4eca224d0b9aba [formerly d8197235fe]
Former-commit-id: 52139d5bcf
2013-03-12 16:04:59 -05:00
Steve Harris
072065191b 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: 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: 47cde9bd09 [formerly bca46a1354] [formerly 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015]]
Former-commit-id: afba0e5b2a5a76c08ffa616eefd96f2ca6363113 [formerly 5232592cfa]
Former-commit-id: 346b22b196
2013-03-12 16:04:23 -05:00
Dave Hladky
87992329b4 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 e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]]
Former-commit-id: 4b08491880
Former-commit-id: eefd544e4b [formerly 155903d135] [formerly ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]]
Former-commit-id: 70f3f744097c668c89b07b6780fc8db6c04380d8 [formerly 29ed641a13]
Former-commit-id: cdfbcc7136
2013-03-12 15:48:34 -05:00
Mike Duff
369bcf9bd5 Issue #1760 - fix minutes on the y axis of 3 hour graph
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69

Former-commit-id: f5d8ba8b0f [formerly a6eea1874b] [formerly 714de645d5] [formerly f5d8ba8b0f [formerly a6eea1874b] [formerly 714de645d5] [formerly 7040daf472 [formerly 714de645d5 [formerly 1c1c34c7eec36f378cfd2969779f68f9a1de4159]]]]
Former-commit-id: 7040daf472
Former-commit-id: 7f42fb1818 [formerly a712efa614] [formerly 079adc9e9487fc0c7120ff74f0179911f122086a [formerly b5bccd0bb2]]
Former-commit-id: 764d29b6985f93b6a7d0e60026ca97f56f0983bf [formerly db2d5db8d9]
Former-commit-id: fd06d11e25
2013-03-12 11:25:05 -05:00
Lee Venable
514a102281 Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: 13d13428b7 [formerly 9a69cd3524] [formerly d5af1f02c5] [formerly 13d13428b7 [formerly 9a69cd3524] [formerly d5af1f02c5] [formerly 28d74d91b0 [formerly d5af1f02c5 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]]]
Former-commit-id: 28d74d91b0
Former-commit-id: da5ff93f57 [formerly b471e3807f] [formerly 6cbbc7b35f1af06bc44a23c6f7846a7c829b25b7 [formerly e080fb5106]]
Former-commit-id: 32365b9858d2738c4e5f0d906fdad1561c7cc170 [formerly b0e9ea9157]
Former-commit-id: ca95cb0fce
2013-03-12 09:08:44 -05:00
Mike Duff
d69f849739 Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d

Former-commit-id: 5704b2689e [formerly 492cf0f7e6] [formerly 6a6844fdaf] [formerly 5704b2689e [formerly 492cf0f7e6] [formerly 6a6844fdaf] [formerly cac9bd6119 [formerly 6a6844fdaf [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]]]
Former-commit-id: cac9bd6119
Former-commit-id: 848f7982d6 [formerly 2df046d409] [formerly b852cff98c7943089d4fa9240397aef285faa297 [formerly caed059e23]]
Former-commit-id: 5c6d69dbb036423dd0841051c987f711a3b18320 [formerly 659a2a4f4c]
Former-commit-id: 3eef80b3d1
2013-03-12 09:03:08 -05:00
Steve Harris
ed1788343e 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171 [formerly 6fe4b16924] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a]
Former-commit-id: c28f3aeb02
2013-03-12 08:35:45 -05:00
Roger Ferrel
590ef32dcb 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 0982485efe [formerly 70bd9aafa7] [formerly 4deb731bd0] [formerly b421c97d86 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]]
Former-commit-id: b421c97d86
Former-commit-id: 7c6bd5aeb0 [formerly 0deb290c24] [formerly bfbd6592633352c9799a573f7b550fe350361788 [formerly 334f2c4a57]]
Former-commit-id: 67c6f245a3e7e1a735bd5bfb5bb69221fe9e622b [formerly 0bbe51355e]
Former-commit-id: 241dfb9451
2013-03-11 13:00:44 -05:00
Roger Ferrel
21a51d1177 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: c0ee394e9c [formerly a73687c1b8] [formerly 6744238fce] [formerly c0ee394e9c [formerly a73687c1b8] [formerly 6744238fce] [formerly 9e8472bab6 [formerly 6744238fce [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]]]
Former-commit-id: 9e8472bab6
Former-commit-id: 47fa3496fb [formerly 7e5bb824d9] [formerly ff76a88839c216a130eb0e8c4e251734c7719b17 [formerly 3684c7efed]]
Former-commit-id: 7d566628343e1351cf48eeae57d0064db1054178 [formerly a8436c76ad]
Former-commit-id: 408663b2b4
2013-03-11 11:16:22 -05:00
Dave Hladky
b2fd11f9ba Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

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

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

Former-commit-id: edd4d9e02b [formerly 80ea3e1ec2] [formerly 8f70214f66] [formerly edd4d9e02b [formerly 80ea3e1ec2] [formerly 8f70214f66] [formerly 6a3281c878 [formerly 8f70214f66 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]]]
Former-commit-id: 6a3281c878
Former-commit-id: a5478559bc [formerly 234d73c905] [formerly 3d49dc5085631dccfa4591b739f0f1e02b09ecee [formerly c2b021427b]]
Former-commit-id: 20722369ae623501820dc3acb6a7289596f69a5b [formerly 1403713fab]
Former-commit-id: 852b61f7e1
2013-03-05 16:02:47 -06:00
Jonathan Sanchez
43699636a2 Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: f79907bf9f [formerly 3fface264c] [formerly 1a91fe52e7] [formerly f79907bf9f [formerly 3fface264c] [formerly 1a91fe52e7] [formerly 1f2db32448 [formerly 1a91fe52e7 [formerly 14676fe089c0132febc3f533e6cbf2d00f117b90]]]]
Former-commit-id: 1f2db32448
Former-commit-id: 0917628d1a [formerly 40f52ab049] [formerly 51bec9541946d539bda749f417d6c93398a63eb9 [formerly 42bcef0be0]]
Former-commit-id: bd9d63ecabb49e6cbdc69ab06ee9bafbea502490 [formerly 0caae30f26]
Former-commit-id: b24d6fa352
2013-03-05 15:05:19 -06:00
Steve Harris
b64731872c Merge branch 'omaha_13.3.1' into development
Former-commit-id: afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly aa0e9acefd [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 1709c34b8f [formerly 4a0b8772ec] [formerly 6d472393251484c670223cabe82285a18503dc7c [formerly b9563da8a8]]
Former-commit-id: ad6ef96c444820a88fa41f79cf60d91bc2c26386 [formerly 46d0c9fcee]
Former-commit-id: 2b489e4e40
2013-03-05 12:29:44 -06:00
Steve Harris
2104c8b533 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 7ff64bf8cc [formerly b423579e4a] [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]]
Former-commit-id: 276acc0cf2f69b884f078f338890570213eec929 [formerly b630339eb7]
Former-commit-id: d842ed88a7
2013-03-05 12:27:49 -06:00
Steve Harris
f20c87110e 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]
Former-commit-id: e26f7eb151
Former-commit-id: aabd5cd51f [formerly a240379588] [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]]
Former-commit-id: 8b4bd6790f2136380dbac557b452d873c77bacc6 [formerly 1f98e01c57]
Former-commit-id: 79ff805090
2013-03-05 10:47:06 -06:00
Steve Harris
52aae101cc 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]]
Former-commit-id: 2edca90902
Former-commit-id: 4bfbb518c0 [formerly 3e0614b43a] [formerly c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]]
Former-commit-id: e4eaa93661df211ab065d6c9dd5f042f5011f151 [formerly 0df35cc5ec]
Former-commit-id: 153aadc1d7
2013-03-05 10:39:59 -06:00
Nate Jensen
645dce36ab 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 d7bc5750ae [formerly b393674ef3] [formerly b803ae3801] [formerly a952d48b3e [formerly b803ae3801 [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]]]
Former-commit-id: a952d48b3e
Former-commit-id: 790eb9ef79 [formerly 3c5ca0546f] [formerly a901506e2ccdd1f021aa7b64beb4727c4a3b7241 [formerly e3db522be4]]
Former-commit-id: f3f69b1fabddb12a309c17a0dde94e92a62eb48f [formerly bb5553abb1]
Former-commit-id: 081284a2f8
2013-03-05 09:10:52 -06:00
Richard Peter
3ab85aa0f3 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 3cc3648b9b [formerly e74f6074e7] [formerly 070f62d08e] [formerly 784cd2145f [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]]
Former-commit-id: 784cd2145f
Former-commit-id: c7a4dcede6 [formerly a4bf42628a] [formerly 63aff6583f8761a1de816d6c0659c2736bd51159 [formerly 180540eb47]]
Former-commit-id: 1992cb2228c9c7acfe9a1445250fc5508b45c157 [formerly 6b08735982]
Former-commit-id: fa19a76a42
2013-03-04 17:48:05 -06:00
Dave Hladky
69e1b5f133 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly fc36146f48 [formerly 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]]
Former-commit-id: fc36146f48
Former-commit-id: f47935a03c [formerly 0f3c9ba997] [formerly 88439cd2618a1c23c44807b5d72302de6137417a [formerly 1260b40307]]
Former-commit-id: d37acb68d5f6f91395fa98f52c09dffd4dcce861 [formerly fc90d47619]
Former-commit-id: ac69f97305
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
35d841ce41 Issue #1628 move xmx settings to linux so windows can override.
Former-commit-id: 9a8b585720 [formerly 5a88604ed6] [formerly fad56e32cc] [formerly 9a8b585720 [formerly 5a88604ed6] [formerly fad56e32cc] [formerly c1c5ac7926 [formerly fad56e32cc [formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]]]
Former-commit-id: c1c5ac7926
Former-commit-id: 3a92dd3b6d [formerly c99a17709e] [formerly c2221c67d2e2345aa9b44715379eafeb2a87f000 [formerly b16399cfdb]]
Former-commit-id: b84baab4f2996b50ad6459d4ff02ad81cb71bf9c [formerly c631b538e7]
Former-commit-id: 94b6f646b3
2013-03-04 16:47:11 -06:00
Dustin Johnson
3036d45756 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: 7bfc28b6f8 [formerly 73f884753a] [formerly 1161125c84] [formerly 7bfc28b6f8 [formerly 73f884753a] [formerly 1161125c84] [formerly 54c3980cba [formerly 1161125c84 [formerly 28c97849800c624bdaa161f05777703ee2a510ac]]]]
Former-commit-id: 54c3980cba
Former-commit-id: 286d1c3d36 [formerly 67d6a4ac99] [formerly 0e044dbd4df754584a21481f1a73073d2a862d91 [formerly c0a1ae396a]]
Former-commit-id: 9edbfa25c43a48c1c5e2440029f285038e17bbaf [formerly 5da3043a97]
Former-commit-id: 2f7bdb18f9
2013-03-04 14:55:50 -06:00
Nate Jensen
25422ac783 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 f832e5949c [formerly 5d772a2228] [formerly 0542f04538] [formerly 773b39548d [formerly 0542f04538 [formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]]]]
Former-commit-id: 773b39548d
Former-commit-id: 300ec4fb40 [formerly e15d933ffb] [formerly 7ecaceea4b43ec1774bff495fb630d90c2281a3c [formerly aaac07f26c]]
Former-commit-id: 1af312afedb388d809c11d6cad5b5aaf71b22873 [formerly 4bc3496636]
Former-commit-id: 4c7d7bb7b9
2013-03-04 12:28:19 -06:00
Matt Nash
a12055eff6 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 999413b2e7 [formerly 311ac710ca] [formerly fdc6db0a50] [formerly 1d25736871 [formerly fdc6db0a50 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]]]
Former-commit-id: 1d25736871
Former-commit-id: b0a0086da1 [formerly 739a4ac2db] [formerly 04b14b2dd0b28e80f7bd47e6d8aa7a5e1bb12a5f [formerly 274becd212]]
Former-commit-id: 2008f23e609dbfef312c46bbc800643d207b4fab [formerly f02246ab07]
Former-commit-id: bad1cef443
2013-03-04 09:41:11 -06:00
Ron Anderson
ea3fea38dd Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8

Former-commit-id: 3aba636666 [formerly f1d5ff7c9e] [formerly fdeb45705b] [formerly 3aba636666 [formerly f1d5ff7c9e] [formerly fdeb45705b] [formerly e8f1b460ce [formerly fdeb45705b [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]]]
Former-commit-id: e8f1b460ce
Former-commit-id: 29cf2d6ddd [formerly fd86a481a7] [formerly 96dbec8a7d73075e3bd577828a3e622bb4ad9fbb [formerly 78a8d8f1a1]]
Former-commit-id: f7815b2071f640cadd3abe08a63c67a8804c1c11 [formerly 51d7975583]
Former-commit-id: 45e3384b2f
2013-03-04 09:30:04 -06:00
Richard Peter
2eb3dcec5e Issue #1740: Baseline cave monitoring script
Former-commit-id: e54d4ba855 [formerly 1632bd2882] [formerly 163fb343de] [formerly e54d4ba855 [formerly 1632bd2882] [formerly 163fb343de] [formerly 783e9c1a25 [formerly 163fb343de [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]]]
Former-commit-id: 783e9c1a25
Former-commit-id: dd03372823 [formerly e00d5344b1] [formerly a89d3bf559e31d9b30dc0a377f40e68385713756 [formerly 94d804a301]]
Former-commit-id: b03f7055bcdd495f2fa8cef70e67b8096a4ddb4a [formerly 9c63bea9d2]
Former-commit-id: 80eafa9676
2013-03-01 16:17:25 -06:00
Bryan Kowal
21b332d04e 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: 99ffceb3e4 [formerly ec2ca3f1f1] [formerly 62e7cca531] [formerly 99ffceb3e4 [formerly ec2ca3f1f1] [formerly 62e7cca531] [formerly bd7877a71e [formerly 62e7cca531 [formerly e1bef5abe061a7dd550dc8e38318b275e6653470]]]]
Former-commit-id: bd7877a71e
Former-commit-id: 55419c805c [formerly c672931e5b] [formerly 235faa80403f0802745cd4005882ecad4b2e6098 [formerly 8fd24a3969]]
Former-commit-id: 3f7a350cb7d61ed7ce6a8f79f7ce7b0014e25062 [formerly 40f3cbb7da]
Former-commit-id: 661c050480
2013-03-01 14:32:31 -06:00
Ben Steffensmeier
b487a896ae Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b

Former-commit-id: f505cda0bf [formerly b0870c55f6] [formerly 86b9a4d8c2] [formerly f505cda0bf [formerly b0870c55f6] [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly 86b9a4d8c2 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]]]
Former-commit-id: 9263ff1846
Former-commit-id: 9eb0c3e778 [formerly 8f4c2f2a39] [formerly 33c36155057aba55daf29a51f9519c3aef6b6940 [formerly 5a149c5dfa]]
Former-commit-id: 7b6491f72252fd10fa2101e74284719b65bbafb3 [formerly 77aef5f955]
Former-commit-id: c28a151884
2013-03-01 11:03:11 -06:00
Nate Jensen
8a54597c1f Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
Former-commit-id: 4f9f0c29d2 [formerly 308de6885f] [formerly d695473b0f] [formerly 4f9f0c29d2 [formerly 308de6885f] [formerly d695473b0f] [formerly 302e851b67 [formerly d695473b0f [formerly 94e54241b7e85c523e019603cd9e815c179dc584]]]]
Former-commit-id: 302e851b67
Former-commit-id: 219bb543e9 [formerly a7cc38e3ba] [formerly 17d1c2aa06f8d4b7fa0a6d445508dd75428bbcf4 [formerly 0d0dfb474f]]
Former-commit-id: a12306c2784585b697737108a31eab10f86b3118 [formerly d03d447447]
Former-commit-id: 65ae433077
2013-03-01 10:15:46 -06:00
Bryan Kowal
cfaaafbd5a 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: 875c17399a [formerly f806c880d3] [formerly d081a2afcd] [formerly 875c17399a [formerly f806c880d3] [formerly d081a2afcd] [formerly 4faf8aefbe [formerly d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: e005f18132 [formerly c4709b1bfb] [formerly 7cd233f6e540666556c9d7a93a89b4d6dfd51ec6 [formerly 497bf33892]]
Former-commit-id: a05976388b8f7d2005143e0d29a6962ef9b7b34e [formerly cb5a2677b9]
Former-commit-id: 4d50fec21f
2013-02-28 18:09:25 -06:00
Ben Steffensmeier
c903521884 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 2ca86633d6 [formerly f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 4936191404 [formerly 334af0001b] [formerly fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a]]
Former-commit-id: 387e3e95805ed9aa6efd193b1112d4ae6d8ac95a [formerly 0778375180]
Former-commit-id: 866c873f71
2013-02-28 17:00:56 -06:00
Ben Steffensmeier
bf50f7f871 Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
Former-commit-id: 1a87c84975 [formerly 74296b32db] [formerly df38a21e11] [formerly 1a87c84975 [formerly 74296b32db] [formerly df38a21e11] [formerly aaffde9bf5 [formerly df38a21e11 [formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]]]]
Former-commit-id: aaffde9bf5
Former-commit-id: a8f39fdca4 [formerly f49b8cec68] [formerly f9563e7cebad54220caad3834f5ca36d692dea86 [formerly 453723dc9d]]
Former-commit-id: 7e73c8169da1cde0a25dd8810a1036a321b1213d [formerly dbb965cf9d]
Former-commit-id: 12ce3faeb1
2013-02-28 14:04:53 -06:00
Ben Steffensmeier
a295c7abde Issue #1731 Remove unneccessary query in getDataStore.
Former-commit-id: f7148f5a98 [formerly 61875750c1] [formerly 52a64eda01] [formerly f7148f5a98 [formerly 61875750c1] [formerly 52a64eda01] [formerly 38728f3073 [formerly 52a64eda01 [formerly e78a920afcf25b94d5ea473f96d548ce227ea435]]]]
Former-commit-id: 38728f3073
Former-commit-id: 49d61bd471 [formerly 4bdd2946ee] [formerly 6bdf9d288a06719bf4062080d72ce5ced97ff2a3 [formerly 586438b393]]
Former-commit-id: 2f7ffd4a4eb0faed771ab38c9834ada70ff47c1b [formerly 303c30040d]
Former-commit-id: bec51951ec
2013-02-28 13:59:02 -06:00
Bryan Kowal
13ffe40b52 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: c042d3d31d [formerly c099bc0df8] [formerly 30f59c4bcc] [formerly c042d3d31d [formerly c099bc0df8] [formerly 30f59c4bcc] [formerly 4f30dbb2b8 [formerly 30f59c4bcc [formerly e2c597978c6559a4ef1d5eebb00328584745dae1]]]]
Former-commit-id: 4f30dbb2b8
Former-commit-id: 86ff2262b0 [formerly ecda5fe131] [formerly 10694ce03cdd06e8e954848cc190d39d10940fb3 [formerly 6a298318c5]]
Former-commit-id: d77726eb897d03c5b538900b6f365ccaf136c07d [formerly 7354f94d74]
Former-commit-id: 300e29bd30
2013-02-28 10:02:40 -06:00
Max Schenkelberg
805eacaa9a Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: 0fb8bb14d2 [formerly 1769edc026] [formerly ec40d261e5] [formerly 0fb8bb14d2 [formerly 1769edc026] [formerly ec40d261e5] [formerly 547c593dec [formerly ec40d261e5 [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]]
Former-commit-id: 547c593dec
Former-commit-id: b6a0a31731 [formerly fc58e7431a] [formerly 5b67b8fa2777f5d1c1e3d2378514221879eea2b9 [formerly 13a4056335]]
Former-commit-id: 984eb0a6ab87ef54eab69d0af6ddebb0e5af12f0 [formerly 0c8f3d2449]
Former-commit-id: 3dcfc90510
2013-02-27 16:19:58 -06:00
Richard Peter
11cee91c75 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 a1fac92d05 [formerly 2950dc9c42] [formerly 1ce1fb213b] [formerly a9ffc8b170 [formerly 1ce1fb213b [formerly f4e326c44178ab01b6c5a7c4514dbdd5c9e00cba]]]]
Former-commit-id: a9ffc8b170
Former-commit-id: bbb5a8645a [formerly 7adde5c3aa] [formerly 8dc79a2423c207ef96e5603edea8afe8a585ccd7 [formerly c0e0a44e5f]]
Former-commit-id: 6b16d5b6e61e83c66d3031d20530a687254cb1f5 [formerly 93494fcea0]
Former-commit-id: 014bf4250b
2013-02-27 16:16:09 -06:00
Richard Peter
01f1a377d6 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 47021a729d [formerly 7c1c44c22f] [formerly 6535c1b6c7] [formerly 656d9d74ae [formerly 6535c1b6c7 [formerly ac6f072dbb19afe6dd76bfd368167ea60c2c8d00]]]]
Former-commit-id: 656d9d74ae
Former-commit-id: cd794fef64 [formerly b3c0f56954] [formerly dd6610474414ec15f44a01e78340010a011fcac5 [formerly ba4a86de16]]
Former-commit-id: 925ac079efe64ab366bf76d4ad0603aff8fd786a [formerly 706ec91548]
Former-commit-id: 7585176f50
2013-02-27 14:46:49 -06:00