Steve Harris
|
346b22b196
|
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 36261cb095 [formerly 753a5213ab ] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: bca46a1354 [formerly d5bcdb0015 ]
Former-commit-id: 5232592cfa
|
2013-03-12 16:04:23 -05:00 |
|
Dave Hladky
|
cdfbcc7136
|
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 5c65862b8f [formerly a1006667e0 ] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: 155903d135 [formerly 6ea95002de ]
Former-commit-id: 29ed641a13
|
2013-03-12 15:48:34 -05:00 |
|
Steve Harris
|
c28f3aeb02
|
13.3.1-6 baseline
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1 ] [formerly 2e110bd151 [formerly 3a4c7931e1 ] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: 6fe4b16924 [formerly 4ed21b702b ]
Former-commit-id: c6f379f59a
|
2013-03-12 08:35:45 -05:00 |
|
Roger Ferrel
|
241dfb9451
|
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 70bd9aafa7 [formerly 4deb731bd0 ] [formerly b421c97d86 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]
Former-commit-id: b421c97d86
Former-commit-id: 0deb290c24 [formerly 334f2c4a57 ]
Former-commit-id: 0bbe51355e
|
2013-03-11 13:00:44 -05:00 |
|
Roger Ferrel
|
408663b2b4
|
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 a73687c1b8 [formerly 6744238fce ] [formerly 9e8472bab6 [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]]
Former-commit-id: 9e8472bab6
Former-commit-id: 7e5bb824d9 [formerly 3684c7efed ]
Former-commit-id: a8436c76ad
|
2013-03-11 11:16:22 -05:00 |
|
Steve Harris
|
2b489e4e40
|
Merge branch 'omaha_13.3.1' into development
Former-commit-id: 6b13492420 [formerly d5b80f9225 ] [formerly 6b13492420 [formerly d5b80f9225 ] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 4a0b8772ec [formerly b9563da8a8 ]
Former-commit-id: 46d0c9fcee
|
2013-03-05 12:29:44 -06:00 |
|
Richard Peter
|
80eafa9676
|
Issue #1740: Baseline cave monitoring script
Former-commit-id: 1632bd2882 [formerly 163fb343de ] [formerly 1632bd2882 [formerly 163fb343de ] [formerly 783e9c1a25 [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]]
Former-commit-id: 783e9c1a25
Former-commit-id: e00d5344b1 [formerly 94d804a301 ]
Former-commit-id: 9c63bea9d2
|
2013-03-01 16:17:25 -06:00 |
|
Bryan Kowal
|
4d50fec21f
|
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 f806c880d3 [formerly d081a2afcd ] [formerly 4faf8aefbe [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: c4709b1bfb [formerly 497bf33892 ]
Former-commit-id: cb5a2677b9
|
2013-02-28 18:09:25 -06:00 |
|
Bryan Kowal
|
300e29bd30
|
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 c099bc0df8 [formerly 30f59c4bcc ] [formerly 4f30dbb2b8 [formerly e2c597978c6559a4ef1d5eebb00328584745dae1]]]
Former-commit-id: 4f30dbb2b8
Former-commit-id: ecda5fe131 [formerly 6a298318c5 ]
Former-commit-id: 7354f94d74
|
2013-02-28 10:02:40 -06:00 |
|
Max Schenkelberg
|
3dcfc90510
|
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 1769edc026 [formerly ec40d261e5 ] [formerly 547c593dec [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]
Former-commit-id: 547c593dec
Former-commit-id: fc58e7431a [formerly 13a4056335 ]
Former-commit-id: 0c8f3d2449
|
2013-02-27 16:19:58 -06:00 |
|
Ron Anderson
|
59c7ee5120
|
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: d43afc8c67 [formerly bfe3c684df ] [formerly d43afc8c67 [formerly bfe3c684df ] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: 541557e0b0 [formerly 77fbbb6a61 ]
Former-commit-id: 92abcad349
|
2013-02-26 18:44:51 -06:00 |
|
Steve Harris
|
b5d9e75b95
|
Merge branch 'development' into omaha_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: 64744fdb19 [formerly a0573644c4 ] [formerly 64744fdb19 [formerly a0573644c4 ] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1 ]
Former-commit-id: f3c3191a1c
|
2013-02-21 15:41:39 -06:00 |
|
Steve Harris
|
8c828dbd75
|
13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021 ] [formerly 8ae397085e [formerly 71e8990021 ] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4 ]
Former-commit-id: b3b56830b0
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
77a66598fe
|
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: c2327ce33d [formerly ea50a5db77 ] [formerly c2327ce33d [formerly ea50a5db77 ] [formerly d123c044c3 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: 81f1fb83a0 [formerly 1c08acab38 ]
Former-commit-id: 5a33182da5
|
2013-02-19 12:22:00 -06:00 |
|
Steve Harris
|
32ad300b47
|
13.2.1-8 baseline
Former-commit-id: 18da2e93d7 [formerly f81b382c04 ] [formerly 18da2e93d7 [formerly f81b382c04 ] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 8cffb55371 [formerly c6d584758f ]
Former-commit-id: edac913af7
|
2013-02-18 09:09:41 -06:00 |
|
Mike Duff
|
2aee18ea9d
|
Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c
Former-commit-id: 897262630c [formerly 0b044dba9c ] [formerly 897262630c [formerly 0b044dba9c ] [formerly 9c1e0ab639 [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 3e59308771 [formerly 079ec4b6dd ]
Former-commit-id: 72f6e95a67
|
2013-02-18 08:16:57 -06:00 |
|
Roger Ferrel
|
8e376de359
|
Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away.
Change-Id: I7716af97c3a94f2243be1b219ed9f91c7b67c0d8
Former-commit-id: bfb9f9f156 [formerly 2b509cf7de ] [formerly bfb9f9f156 [formerly 2b509cf7de ] [formerly e26689a487 [formerly 9ac5a199108a1e1d106a79e67cd6209bd46134cb]]]
Former-commit-id: e26689a487
Former-commit-id: 951e5b237d [formerly e7bae3c272 ]
Former-commit-id: b47d03b1bc
|
2013-02-13 16:45:52 -06:00 |
|
Steve Harris
|
dc55ef579a
|
13.2.1-6 baseline
Former-commit-id: d66ad2f77b [formerly d0752de66c ] [formerly d66ad2f77b [formerly d0752de66c ] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: a46e33f06e
Former-commit-id: bbe92e6824 [formerly 30d38334cc ]
Former-commit-id: 0c128dd8f0
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
a11c8dff6d
|
Merge branch '13.2.1_delivery' into development
Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c ] [formerly da43a7a8ca [formerly 4bc8e9ab5c ] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]
Former-commit-id: 5ee47e098d
Former-commit-id: b119d66cda [formerly 3ad515e28f ]
Former-commit-id: d73efe8e86
|
2013-02-06 11:12:01 -06:00 |
|
Steve Harris
|
f997ecea38
|
Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 14f23d4227 [formerly a16ac7819c ] [formerly 14f23d4227 [formerly a16ac7819c ] [formerly 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]
Former-commit-id: 6c6b53679b
Former-commit-id: 48a0ffda4d [formerly 28ddc9bad8 ]
Former-commit-id: f028c16f79
|
2013-02-06 11:08:53 -06:00 |
|
Steve Harris
|
f36867a520
|
13.2.1-5 baseline
Former-commit-id: a6b3cde1ff [formerly 232734091d ] [formerly a6b3cde1ff [formerly 232734091d ] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 7497a15e22 [formerly 1c602ec3a7 ]
Former-commit-id: bb0759d5ad
|
2013-02-06 11:02:32 -06:00 |
|
David Gillingham
|
54e5481d09
|
Issue #1559: Fix port error in SmartScript.getGridCellSwath().
Change-Id: If435423a8277f852b3ceb0a7299332ece800696f
Former-commit-id: 6f6534649a [formerly 292bd811a0 ] [formerly 6f6534649a [formerly 292bd811a0 ] [formerly 49a4e1c39d [formerly 2e2be1d031a93f0fe13c17788eabff34ab428caa]]]
Former-commit-id: 49a4e1c39d
Former-commit-id: 3a13421305 [formerly 62f30014f0 ]
Former-commit-id: d8eb0b96dd
|
2013-01-31 12:00:38 -06:00 |
|
Steve Harris
|
5ae95b956b
|
13.2.1-4 baseline
Former-commit-id: ae2859d5a2 [formerly 8f2e7d4437 ] [formerly ae2859d5a2 [formerly 8f2e7d4437 ] [formerly 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 3f25b862c8 [formerly 2998f750f4 ]
Former-commit-id: 0a4ef8c084
|
2013-01-31 11:40:31 -06:00 |
|
Steve Harris
|
2107a54161
|
Merge branch '13.2.1_delivery' into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: c218786986 [formerly 658bea377b ] [formerly c218786986 [formerly 658bea377b ] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 73d9455c65 [formerly 6383bf8ed2 ]
Former-commit-id: a74d58ce6f
|
2013-01-31 10:19:14 -06:00 |
|
Steve Harris
|
99bc358644
|
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e655d297f7 [formerly 0505ed0a72 ] [formerly e655d297f7 [formerly 0505ed0a72 ] [formerly 6040272573 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 75f6e61e6f [formerly 513d49939f ]
Former-commit-id: ba97151132
|
2013-01-29 15:57:21 -06:00 |
|
Steve Harris
|
9ab34b7aeb
|
13.2.1-3 baseline
Former-commit-id: 283147571f [formerly f45120a1f4 ] [formerly 283147571f [formerly f45120a1f4 ] [formerly 7a739c6a5b [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: daca1c3e73 [formerly 3edfa1e0be ]
Former-commit-id: dbaf4a3e39
|
2013-01-29 15:52:43 -06:00 |
|
Steve Harris
|
eafa141b90
|
13.2.1-2 baseline
Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca ] [formerly 0006a2b6cb [formerly 7a7f7c45ca ] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 251a9c0195 [formerly 1153d80c5b ]
Former-commit-id: 27706b8dcb
|
2013-01-25 09:07:12 -06:00 |
|
Ben Steffensmeier
|
2c863705f7
|
Issue #1479 fix mod families
Former-commit-id: 735add55ba [formerly 13fd813660 ] [formerly 735add55ba [formerly 13fd813660 ] [formerly a7989d4638 [formerly 76b5a4fcf313e2a028662a1e07871fff2e328d48]]]
Former-commit-id: a7989d4638
Former-commit-id: 3dfe43caac [formerly fbd614258f ]
Former-commit-id: d5e0e015b3
|
2013-01-23 15:47:30 -06:00 |
|
Steve Harris
|
ab562e22a4
|
13.2.1-3 baseline
Former-commit-id: a5a0da5c02 [formerly 7435527b25 ] [formerly a5a0da5c02 [formerly 7435527b25 ] [formerly 2b6ac028bd [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: 9d248cff7a [formerly cc0fdef15c ]
Former-commit-id: 082e66584a
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
2779f5c6d9
|
13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7 ] [formerly 33bc5fd816 [formerly 83e9157df7 ] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79 ]
Former-commit-id: 547c1dedd1
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
08bf724a6c
|
13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b ] [formerly 48d1aa7732 [formerly 9771dfae6b ] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113 [formerly f6670806bf ]
Former-commit-id: 9146e727f9
|
2013-01-23 11:13:03 -05:00 |
|
Ben Steffensmeier
|
8d6d821ac0
|
Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: a9654f859a [formerly f0af056d97 ] [formerly a9654f859a [formerly f0af056d97 ] [formerly ec199ad7d1 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]]
Former-commit-id: ec199ad7d1
Former-commit-id: 50d1561165 [formerly 3bfba5b771 ]
Former-commit-id: ca6ab4a945
|
2013-01-18 10:59:43 -06:00 |
|
Steve Harris
|
18b7633b70
|
13.1.2-10 baseline
Former-commit-id: 683193255d [formerly 68dde17de2 ] [formerly 683193255d [formerly 68dde17de2 ] [formerly 86ea0b666e [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]]
Former-commit-id: 86ea0b666e
Former-commit-id: 39f9dc931a [formerly d148beb4ca ]
Former-commit-id: 5c488932d9
|
2013-01-18 10:37:25 -05:00 |
|
Steve Harris
|
b9cd443717
|
13.1.2-9 baseline
Former-commit-id: 6fd587d08d [formerly 0878a7ea57 ] [formerly 6fd587d08d [formerly 0878a7ea57 ] [formerly ddc6aec013 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]]
Former-commit-id: ddc6aec013
Former-commit-id: 5b752c12c4 [formerly 5e0a9a8fd2 ]
Former-commit-id: 3f93a9eb2e
|
2013-01-18 10:29:52 -05:00 |
|
David Gillingham
|
9266b39ced
|
Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it.
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc
Former-commit-id: 9e3999a427 [formerly c6e64d83a2 ] [formerly 9e3999a427 [formerly c6e64d83a2 ] [formerly d16760c73e [formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]]
Former-commit-id: d16760c73e
Former-commit-id: 09836dacca [formerly a40383de3b ]
Former-commit-id: 74bd042c3f
|
2013-01-17 17:42:05 -06:00 |
|
Bryan Kowal
|
0b8e0ac970
|
Issue #1494 - the com.raytheon.viz.dataaccess feature will now be built
Former-commit-id: 846d860eb2 [formerly 68491bee01 ] [formerly 846d860eb2 [formerly 68491bee01 ] [formerly 08c2faaabe [formerly 796f9e15632bf3491c68702be5e7135c51b99fec]]]
Former-commit-id: 08c2faaabe
Former-commit-id: ef232c483f [formerly 7dbe52a47a ]
Former-commit-id: dfe8b8b291
|
2013-01-17 09:57:58 -06:00 |
|
Ben Steffensmeier
|
1b6523f7fa
|
Issue #1479 fix mod families
Former-commit-id: da98f8e176 [formerly 244f55e1f9 ] [formerly da98f8e176 [formerly 244f55e1f9 ] [formerly 65b11cf54c [formerly 4678cbf7764cae77683d357f0ac1bf6ff95bc63e]]]
Former-commit-id: 65b11cf54c
Former-commit-id: 0fe033c64c [formerly 0d8a901d07 ]
Former-commit-id: 82bb31a603
|
2013-01-16 10:56:21 -06:00 |
|
Lee Venable
|
ed28295ec1
|
Merge "Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates." into development
Former-commit-id: a3c5aded12 [formerly 32692a6def ] [formerly a3c5aded12 [formerly 32692a6def ] [formerly f63da5aba6 [formerly 517b6e6652b75801928cbb8f2f6899916e8dd988]]]
Former-commit-id: f63da5aba6
Former-commit-id: c4291fcb2a [formerly 5a733e465d ]
Former-commit-id: b8c01b939b
|
2013-01-15 14:47:49 -06:00 |
|
Richard Peter
|
e838f2db25
|
Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a966546e31 [formerly 3fb7d96ec1 ] [formerly a966546e31 [formerly 3fb7d96ec1 ] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 79ef100838 [formerly 345dfd2ca9 ]
Former-commit-id: cd2014bf8d
|
2013-01-14 18:07:17 -06:00 |
|
Ben Steffensmeier
|
88ac5805b6
|
Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: da79be73a2 [formerly f49e77f7df ] [formerly da79be73a2 [formerly f49e77f7df ] [formerly 2e10a8408b [formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]]
Former-commit-id: 2e10a8408b
Former-commit-id: 3d63fa24a1 [formerly 0a0d230091 ]
Former-commit-id: fcc71cc31d
|
2013-01-14 17:44:46 -06:00 |
|
Steve Harris
|
b4556ea28f
|
13.2.1-1 baseline
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7 ] [formerly 5dfe4d10f1 [formerly e62172c8c7 ] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d [formerly 8713dfc5ca ]
Former-commit-id: ebff2a6275
|
2013-01-14 18:42:21 -05:00 |
|
Richard Peter
|
ef2dc06b69
|
Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: ae3ea75cbf [formerly 1318f53902 ] [formerly ae3ea75cbf [formerly 1318f53902 ] [formerly b8e42dabc0 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: fa6247baf7 [formerly aa9e16b038 ]
Former-commit-id: 096134d917
|
2013-01-14 17:38:38 -06:00 |
|
Steve Harris
|
1ef10eaf2c
|
13.1.2-7 baseline
Former-commit-id: a8d90da9c0 [formerly 4f86b07eb0 ] [formerly a8d90da9c0 [formerly 4f86b07eb0 ] [formerly 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: f1256f2a9e [formerly b7f1dbe72b ]
Former-commit-id: 775a338b90
|
2013-01-11 16:12:09 -05:00 |
|
Nate Jensen
|
3fff3b0d0b
|
Merge "Issue #1467 - updated the memory settings for 64-bit GFE" into development
Former-commit-id: d02e1ff0a7 [formerly a3e10f6dcd ] [formerly d02e1ff0a7 [formerly a3e10f6dcd ] [formerly 62f89e6189 [formerly 5f262d2cb46ad8ff0ec355e64ee73b6deb7ed454]]]
Former-commit-id: 62f89e6189
Former-commit-id: ef3468acd4 [formerly 5733a44770 ]
Former-commit-id: 4d91741212
|
2013-01-10 10:31:05 -06:00 |
|
Richard Peter
|
398b47967d
|
Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a ] [formerly d0a6ba23e5 [formerly 029ebaa63a ] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28 [formerly 6a5a0d7d09 ]
Former-commit-id: 709af3b25e
|
2013-01-09 17:55:05 -06:00 |
|
Bryan Kowal
|
b6ceffe69a
|
Issue #1467 - updated the memory settings for 64-bit GFE
Change-Id: I40df3faed89bd23c5e37b81f3a4e6b256b5a2cc3
Former-commit-id: 6129a00225 [formerly 0645a9fe40 ] [formerly 6129a00225 [formerly 0645a9fe40 ] [formerly 73bdd66283 [formerly 2d6bf1e42cb628a5b5af6a261202d01c7fa236fb]]]
Former-commit-id: 73bdd66283
Former-commit-id: 777b804edc [formerly e9dd794082 ]
Former-commit-id: 4f1a822578
|
2013-01-09 13:03:38 -06:00 |
|
Bryan Kowal
|
2ec11e041a
|
Issue #1460 - Merge 4.7-GIS_Viewer into AWIPS2_baseline
Former-commit-id: 87d0821429 [formerly 76fe910606 ] [formerly 87d0821429 [formerly 76fe910606 ] [formerly 03f108f80b [formerly 9e0eae1725af06ce834c926a4d70195a075e8152]]]
Former-commit-id: 03f108f80b
Former-commit-id: 7dd7d1cfa7 [formerly bbeb6b5101 ]
Former-commit-id: 74f4811f07
|
2013-01-07 18:14:07 -06:00 |
|
Bryan Kowal
|
1996f92f7e
|
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: ab8b346489 [formerly c8a43edd9e ] [formerly ab8b346489 [formerly c8a43edd9e ] [formerly d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 6d7f57c62a [formerly 146c43a606 ]
Former-commit-id: 0136f9d5a3
|
2013-01-07 12:16:01 -06:00 |
|
Steve Harris
|
b7f180d9d3
|
13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c ] [formerly efd3392abe [formerly 8e5f9e0e6c ] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57 ]
Former-commit-id: 05bdc0ecd2
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
f52ec0b0a0
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a ] [formerly 51208e5515 [formerly c0c1d56f3a ] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553 ]
Former-commit-id: b6fa9b4858
|
2013-01-06 14:32:24 -06:00 |
|