Steve Harris
|
0b4c9be77c
|
Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 9ff8a94193 [formerly 85104939ac [formerly e71c69c383] [formerly 9ff8a94193 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]
Former-commit-id: 85104939ac [formerly e71c69c383]
Former-commit-id: 85104939ac
Former-commit-id: 8d1903034b
|
2013-03-26 12:44:24 -05:00 |
|
Steve Harris
|
3cbbb23b28
|
13.3.1-13 baseline
Former-commit-id: c65f3e68e5 [formerly 792171756f [formerly c77a452f5a] [formerly c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]
Former-commit-id: 792171756f [formerly c77a452f5a]
Former-commit-id: 792171756f
Former-commit-id: 0f2ebb8f10
|
2013-03-26 12:43:07 -05:00 |
|
Mike Duff
|
20438994e6
|
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
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
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: 9ebc7606b1 [formerly c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]
Former-commit-id: c1f7d33bb8 [formerly 5d72795e1b]
Former-commit-id: c1f7d33bb8
Former-commit-id: f767014e9a
|
2013-03-26 09:19:39 -05:00 |
|
Steve Harris
|
76903d9542
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: be96282207 [formerly 0be473728a]
Former-commit-id: be96282207
Former-commit-id: 6f374b35d0
|
2013-03-25 13:27:13 -05:00 |
|
David Gillingham
|
3befa8f57b
|
Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 4aeeb1ce25 [formerly 8438c5af87 [formerly 79a1520baf] [formerly 4aeeb1ce25 [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]]
Former-commit-id: 8438c5af87 [formerly 79a1520baf]
Former-commit-id: 8438c5af87
Former-commit-id: 1f44720008
|
2013-03-22 10:39:13 -05:00 |
|
Steve Harris
|
5604d8e291
|
Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: dc419068f0 [formerly a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]
Former-commit-id: a9ced3a7ef [formerly fa15f03e1b]
Former-commit-id: a9ced3a7ef
Former-commit-id: ea052b14bb
|
2013-03-20 16:06:20 -05:00 |
|
Steve Harris
|
d010cf9a24
|
13.3.1-10 baseline
Former-commit-id: 7078eec1b1 [formerly 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 57f4676b6c [formerly 073687d9a9]
Former-commit-id: 57f4676b6c
Former-commit-id: 76ea9120d8
|
2013-03-20 15:53:01 -05:00 |
|
Steve Harris
|
467717c08b
|
Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: c18b96dc4c [formerly 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: 27c418812f [formerly 1a999fee5a]
Former-commit-id: 27c418812f
Former-commit-id: 3e69490ab2
|
2013-03-18 16:43:22 -05:00 |
|
Steve Harris
|
5a5bad47ff
|
13.3.1-8 baseline
Former-commit-id: c15b3ffe20 [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: bc9df0a8f9 [formerly f97d78994b]
Former-commit-id: bc9df0a8f9
Former-commit-id: dd30a5f940
|
2013-03-18 15:43:32 -05:00 |
|
Nate Jensen
|
63b223dfa6
|
Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 490ffe2772 [formerly 9dbb7660a7 [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]]
Former-commit-id: 9dbb7660a7 [formerly 29b4cd2fb5]
Former-commit-id: 9dbb7660a7
Former-commit-id: 14da2b6cc3
|
2013-03-14 09:48:16 -05:00 |
|
Ben Steffensmeier
|
a2fe357097
|
Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: 52c167cf00 [formerly a9695abb45 [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]
Former-commit-id: a9695abb45 [formerly 22624ba5d3]
Former-commit-id: a9695abb45
Former-commit-id: dcf02199ea
|
2013-03-13 18:52:52 -05:00 |
|
Ron Anderson
|
30c134f7c8
|
Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: 61f74305e2 [formerly 0c881b4a85 [formerly 3b65608373] [formerly 61f74305e2 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]
Former-commit-id: 0c881b4a85 [formerly 3b65608373]
Former-commit-id: 0c881b4a85
Former-commit-id: f9c7fa9613
|
2013-03-13 17:16:37 -05:00 |
|
Ben Steffensmeier
|
22550d153b
|
Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: 89eb902284 [formerly 37bae0988b [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]
Former-commit-id: 37bae0988b [formerly 4c150b0fd6]
Former-commit-id: 37bae0988b
Former-commit-id: a6a1d9bec7
|
2013-03-13 17:09:20 -05:00 |
|
Dave Hladky
|
bc6eb5ce34
|
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 5dc454c7ef [formerly 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 765be278bb [formerly 38b952a220]
Former-commit-id: 765be278bb
Former-commit-id: 7d2c1bc4d5
|
2013-03-13 13:56:33 -05:00 |
|
Steve Harris
|
eadcc05c19
|
13.3.1-7 baseline
Former-commit-id: e12ed113ae [formerly 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: 97d2f521e4 [formerly a72254cc75]
Former-commit-id: 97d2f521e4
Former-commit-id: 23faf84455
|
2013-03-13 09:50:28 -05:00 |
|
Ron Anderson
|
107fd64306
|
Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8
Former-commit-id: e8f1b460ce [formerly f1d5ff7c9e [formerly fdeb45705b] [formerly e8f1b460ce [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]]
Former-commit-id: f1d5ff7c9e [formerly fdeb45705b]
Former-commit-id: f1d5ff7c9e
Former-commit-id: 3aba636666
|
2013-03-04 09:30:04 -06:00 |
|
Ron Anderson
|
40291dad3d
|
Issue #1597 Moved some interpolation messages to Performance Log for consistency.
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8
Former-commit-id: 079cdbcb29 [formerly f491d7f7c3 [formerly c9ca7a2943] [formerly 079cdbcb29 [formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]]
Former-commit-id: f491d7f7c3 [formerly c9ca7a2943]
Former-commit-id: f491d7f7c3
Former-commit-id: bbf1f71873
|
2013-02-27 14:45:30 -06:00 |
|
Ron Anderson
|
aee70e292e
|
Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27
Former-commit-id: c35e06d82c [formerly 50f5e44b39 [formerly 36be1c5850] [formerly c35e06d82c [formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]]]
Former-commit-id: 50f5e44b39 [formerly 36be1c5850]
Former-commit-id: 50f5e44b39
Former-commit-id: 36268bb1e2
|
2013-02-27 12:34:40 -06:00 |
|
Ron Anderson
|
50d9ad76e8
|
Issue #1708 Fix redundant excution of evaluateQuery.
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a
Former-commit-id: 274ce762d8 [formerly 2212f333a3 [formerly a5a273c1c2] [formerly 274ce762d8 [formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]]
Former-commit-id: 2212f333a3 [formerly a5a273c1c2]
Former-commit-id: 2212f333a3
Former-commit-id: db805e2097
|
2013-02-26 19:00:56 -06:00 |
|
Ron Anderson
|
387d92aa8b
|
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: f37999b1eb [formerly d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: d43afc8c67 [formerly bfe3c684df]
Former-commit-id: d43afc8c67
Former-commit-id: 547f0d086f
|
2013-02-26 18:44:51 -06:00 |
|
Matt Nash
|
9d012b8ea6
|
Issue #1506 fix deadlock and edit areas showing up from query
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49
Former-commit-id: b749edca54 [formerly 4be89bdd43 [formerly c728f72ea3] [formerly b749edca54 [formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]]
Former-commit-id: 4be89bdd43 [formerly c728f72ea3]
Former-commit-id: 4be89bdd43
Former-commit-id: f18955a1ed
|
2013-02-26 12:20:08 -06:00 |
|
Steve Harris
|
5b77c04943
|
Merge branch 'development' into omaha_13.3.1
Former-commit-id: 6ec9e73035 [formerly 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 0a4564eb97 [formerly 67f090638f]
Former-commit-id: 0a4564eb97
Former-commit-id: 90b0bab156
|
2013-02-25 15:58:48 -06:00 |
|
Steve Harris
|
e4a0759555
|
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: 2641d578e2 [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 64744fdb19 [formerly a0573644c4]
Former-commit-id: 64744fdb19
Former-commit-id: abdc733151
|
2013-02-21 15:41:39 -06:00 |
|
Matt Nash
|
de7ae90447
|
Issue #1506 fix for GFE evaluateRefSet() for non-queries
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7
Former-commit-id: 492df9c238 [formerly 6f9621adb2 [formerly 2001d916ac] [formerly 492df9c238 [formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]]
Former-commit-id: 6f9621adb2 [formerly 2001d916ac]
Former-commit-id: 6f9621adb2
Former-commit-id: 0531052a2e
|
2013-02-21 09:01:33 -06:00 |
|
Steve Harris
|
6ffa036f05
|
13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: 8ae397085e [formerly 71e8990021]
Former-commit-id: 8ae397085e
Former-commit-id: e0406d3183
|
2013-02-20 16:19:40 -06:00 |
|
Ron Anderson
|
7abe94c6cf
|
Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
Former-commit-id: 884d9ff787 [formerly 70050ac749 [formerly f1ad632c3f] [formerly 884d9ff787 [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]]
Former-commit-id: 70050ac749 [formerly f1ad632c3f]
Former-commit-id: 70050ac749
Former-commit-id: 9c2caa95a0
|
2013-02-19 18:46:16 -06:00 |
|
Steve Harris
|
693758586d
|
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: d123c044c3 [formerly c2327ce33d [formerly ea50a5db77] [formerly d123c044c3 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: c2327ce33d [formerly ea50a5db77]
Former-commit-id: c2327ce33d
Former-commit-id: f1f5359a2f
|
2013-02-19 12:22:00 -06:00 |
|
Steve Harris
|
9decfb43b6
|
13.2.1-8 baseline
Former-commit-id: 053156f02e [formerly 18da2e93d7 [formerly f81b382c04] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 18da2e93d7 [formerly f81b382c04]
Former-commit-id: 18da2e93d7
Former-commit-id: d176ec1f38
|
2013-02-18 09:09:41 -06:00 |
|
Ron Anderson
|
da2edaea74
|
Merge "Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing UIControllers to be constructed at startup, not on demand." into development
Former-commit-id: a6d87cdd7e [formerly cf0fc8d921 [formerly e70cfc5825] [formerly a6d87cdd7e [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]]
Former-commit-id: cf0fc8d921 [formerly e70cfc5825]
Former-commit-id: cf0fc8d921
Former-commit-id: 7d09df8468
|
2013-02-18 08:31:50 -06:00 |
|
Richard Peter
|
a36209d4ff
|
Merge "Issue #1506 move away from using QueryScript on the UI thread, except where absolutely necessary we can run a synchronous operation" into development
Former-commit-id: 70f270ff16 [formerly 5bf0e0e999 [formerly 51533ccab2] [formerly 70f270ff16 [formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]]
Former-commit-id: 5bf0e0e999 [formerly 51533ccab2]
Former-commit-id: 5bf0e0e999
Former-commit-id: c8d46448bf
|
2013-02-15 16:40:04 -06:00 |
|
David Gillingham
|
f4346e7082
|
Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing
UIControllers to be constructed at startup, not on demand.
Change-Id: Ifb492171ac4720e36f68da082c38d31c1de08132
Former-commit-id: da091b723d [formerly 9fae6695e2 [formerly 871364d630] [formerly da091b723d [formerly 463af46e64ed667efbc840d85f9babf3449780cc]]]
Former-commit-id: 9fae6695e2 [formerly 871364d630]
Former-commit-id: 9fae6695e2
Former-commit-id: 65b1aeb7f3
|
2013-02-15 12:50:48 -06:00 |
|
Ben Steffensmeier
|
4d5577a9d0
|
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: 8c0e9d3d9e [formerly 1940a92596 [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 1940a92596 [formerly aa4c7526ff]
Former-commit-id: 1940a92596
Former-commit-id: bd6e0f8462
|
2013-02-14 15:34:25 -06:00 |
|
Matt Nash
|
38320a90ad
|
Issue #1506 move away from using QueryScript on the UI thread, except where
absolutely necessary we can run a synchronous operation
Change-Id: I4503d4e18e3f458b7df7c2d187e8880d5a3d2cc7
Former-commit-id: 5b136272a3 [formerly 75f51be7b2 [formerly bc954889eb] [formerly 5b136272a3 [formerly f6ef0f0ebc9002caad9a632515402b84280892fc]]]
Former-commit-id: 75f51be7b2 [formerly bc954889eb]
Former-commit-id: 75f51be7b2
Former-commit-id: 2a42ae7a47
|
2013-02-14 11:47:34 -06:00 |
|
David Gillingham
|
1968e18f53
|
Issue #1515: Better handle notifications received after disposing VCParms.
Change-Id: Ia73102329755303b504871ed55f2a294ef390126
Former-commit-id: ddcc84262a [formerly 02f2539433 [formerly 5b4de19ebd] [formerly ddcc84262a [formerly ef9d97a4d0886df2072672b1cebc9b77e689308b]]]
Former-commit-id: 02f2539433 [formerly 5b4de19ebd]
Former-commit-id: 02f2539433
Former-commit-id: 5dc773e1d8
|
2013-02-13 11:08:20 -06:00 |
|
Steve Harris
|
f645d7220c
|
13.2.1-6 baseline
Former-commit-id: a46e33f06e [formerly d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: d66ad2f77b [formerly d0752de66c]
Former-commit-id: d66ad2f77b
Former-commit-id: 52f48669f6
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
500ae1befd
|
Merge branch '13.2.1_delivery' into development
Former-commit-id: 5ee47e098d [formerly da43a7a8ca [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]
Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c]
Former-commit-id: da43a7a8ca
Former-commit-id: 953bec4467
|
2013-02-06 11:12:01 -06:00 |
|
Steve Harris
|
60fbe3c4a0
|
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: 6c6b53679b [formerly 14f23d4227 [formerly a16ac7819c] [formerly 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]
Former-commit-id: 14f23d4227 [formerly a16ac7819c]
Former-commit-id: 14f23d4227
Former-commit-id: 44a4287812
|
2013-02-06 11:08:53 -06:00 |
|
Steve Harris
|
0ec5bbe0b0
|
13.2.1-5 baseline
Former-commit-id: 146fcc6da8 [formerly a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]
Former-commit-id: a6b3cde1ff [formerly 232734091d]
Former-commit-id: a6b3cde1ff
Former-commit-id: 7e1236c17c
|
2013-02-06 11:02:32 -06:00 |
|
Steve Harris
|
be03a61085
|
13.2.1-5 baseline
Former-commit-id: d26a488ee4 [formerly d6a9d68c10 [formerly a11ab8f26e] [formerly d26a488ee4 [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]]
Former-commit-id: d6a9d68c10 [formerly a11ab8f26e]
Former-commit-id: d6a9d68c10
Former-commit-id: e2b47a728a
|
2013-02-04 16:31:26 -06:00 |
|
Steve Harris
|
8dd3505b4b
|
13.2.1-4 baseline
Former-commit-id: 0d7f53b6f4 [formerly ae2859d5a2 [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]]
Former-commit-id: ae2859d5a2 [formerly 8f2e7d4437]
Former-commit-id: ae2859d5a2
Former-commit-id: ed224fde88
|
2013-01-31 11:40:31 -06:00 |
|
Steve Harris
|
12c8d91429
|
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: ec56acde81 [formerly c218786986 [formerly 658bea377b] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: c218786986 [formerly 658bea377b]
Former-commit-id: c218786986
Former-commit-id: f207d282bc
|
2013-01-31 10:19:14 -06:00 |
|
Steve Harris
|
7281fb78c1
|
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: 6040272573 [formerly e655d297f7 [formerly 0505ed0a72] [formerly 6040272573 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: e655d297f7 [formerly 0505ed0a72]
Former-commit-id: e655d297f7
Former-commit-id: e6093b159e
|
2013-01-29 15:57:21 -06:00 |
|
Steve Harris
|
9a27dc8e8b
|
13.2.1-3 baseline
Former-commit-id: 7a739c6a5b [formerly 283147571f [formerly f45120a1f4] [formerly 7a739c6a5b [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 283147571f [formerly f45120a1f4]
Former-commit-id: 283147571f
Former-commit-id: b84acc06da
|
2013-01-29 15:52:43 -06:00 |
|
Ron Anderson
|
562a969600
|
Issue #1535 Fix GFE saving last block of grids twice
Change-Id: I3411e27c96b5f0dd79c24e7ba75361582cb6652c
Former-commit-id: 5738910b71 [formerly ed7784818a [formerly aa2c0ffb60] [formerly 5738910b71 [formerly 16eedd6d46196d08d02abc674c81ed95c403457c]]]
Former-commit-id: ed7784818a [formerly aa2c0ffb60]
Former-commit-id: ed7784818a
Former-commit-id: c070b55324
|
2013-01-28 19:23:23 -06:00 |
|
Steve Harris
|
8e0d065695
|
Merge branch '13.2.1_delivery' into development
Former-commit-id: 827611474f [formerly 618cf868c5 [formerly f673583915] [formerly 827611474f [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]
Former-commit-id: 618cf868c5 [formerly f673583915]
Former-commit-id: 618cf868c5
Former-commit-id: d6aeabad12
|
2013-01-25 10:54:51 -06:00 |
|
Steve Harris
|
058c402b6e
|
13.2.1-2 baseline
Former-commit-id: c3e4551dfa [formerly 0006a2b6cb [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca]
Former-commit-id: 0006a2b6cb
Former-commit-id: 74bfe9595c
|
2013-01-25 09:07:12 -06:00 |
|
Ron Anderson
|
82d4473baf
|
Issue #1524 Fix discrete color bar.
Former-commit-id: 358c8bdf07 [formerly 3d838584ed [formerly 718f1da85b] [formerly 358c8bdf07 [formerly 7edd57ef71e8a22aa25870477844ba063da0b9d3]]]
Former-commit-id: 3d838584ed [formerly 718f1da85b]
Former-commit-id: 3d838584ed
Former-commit-id: 001770beb7
|
2013-01-23 16:37:56 -06:00 |
|
Steve Harris
|
090d5f3d3b
|
13.2.1-3 baseline
Former-commit-id: 2b6ac028bd [formerly a5a0da5c02 [formerly 7435527b25] [formerly 2b6ac028bd [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]
Former-commit-id: a5a0da5c02 [formerly 7435527b25]
Former-commit-id: a5a0da5c02
Former-commit-id: 7d2e979c51
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
79c717ca60
|
13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 33bc5fd816 [formerly 83e9157df7]
Former-commit-id: 33bc5fd816
Former-commit-id: a4fa438a41
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
4b7d7080da
|
13.2.1-1 baseline
Former-commit-id: c63f9bcae0 [formerly 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b]
Former-commit-id: 48d1aa7732
Former-commit-id: 11b05eedeb
|
2013-01-23 11:13:03 -05:00 |
|