Steve Harris
|
027eda5dce
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
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/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde]
Former-commit-id: 2a26783ba7
|
2013-03-18 16:52:00 -05:00 |
|
Steve Harris
|
0e9919f6be
|
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: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]
Former-commit-id: ea27f9cd17
|
2013-03-18 16:43:22 -05:00 |
|
Steve Harris
|
2fd4ac9397
|
13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]
Former-commit-id: 81a3f29afc
|
2013-03-18 15:43:32 -05:00 |
|
Dustin Johnson
|
d8880e29b6
|
Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: 65f87506b7 [formerly fff7e7983f] [formerly ecb0d2c826] [formerly 43a9f608ef [formerly ecb0d2c826 [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]]
Former-commit-id: 43a9f608ef
Former-commit-id: 32cf95aeffa94b88b3254eb1bbd479d2d9247fa2 [formerly 1b82ad0dc4]
Former-commit-id: 7adf94e9f6
|
2013-03-15 11:51:58 -05:00 |
|
Nate Jensen
|
b74d6315a6
|
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 490ffe2772 [formerly 29b4cd2fb5 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]]
Former-commit-id: 490ffe2772
Former-commit-id: bb1674d56d5f72528a3f2eb6ea51452dfd9a36b1 [formerly a933532ad9]
Former-commit-id: e2e9a845d5
|
2013-03-14 09:48:16 -05:00 |
|
Ben Steffensmeier
|
a440445437
|
Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: dcf02199ea [formerly a9695abb45] [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 22624ba5d3 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]
Former-commit-id: 52c167cf00
Former-commit-id: 48609b58bd2286f625bd7a23b14b9741685a71df [formerly 8f6a7c0746]
Former-commit-id: 2d622e6053
|
2013-03-13 18:52:52 -05:00 |
|
Ron Anderson
|
87cd340e38
|
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 61f74305e2 [formerly 3b65608373 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]
Former-commit-id: 61f74305e2
Former-commit-id: f55bb3e367547583c32d5cc1463941491ec9c6b6 [formerly a7b6e1689b]
Former-commit-id: de14cd0baa
|
2013-03-13 17:16:37 -05:00 |
|
Ben Steffensmeier
|
7e998aa197
|
Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: a6a1d9bec7 [formerly 37bae0988b] [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 4c150b0fd6 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]
Former-commit-id: 89eb902284
Former-commit-id: 10a52ad4fbe4cb9ea324302c2ac6a32c3b3fad23 [formerly 7abf3cfb39]
Former-commit-id: f5680beaa9
|
2013-03-13 17:09:20 -05:00 |
|
Dave Hladky
|
68114535f2
|
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]
Former-commit-id: 9e97fc9efe
|
2013-03-13 13:56:33 -05:00 |
|
Steve Harris
|
45a2d0501d
|
13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]
Former-commit-id: ed5f1dbab6
|
2013-03-13 09:50:28 -05:00 |
|
Steve Harris
|
1709c34b8f
|
Merge branch 'omaha_13.3.1' into development
Former-commit-id: afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly aa0e9acefd [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 6d472393251484c670223cabe82285a18503dc7c [formerly b9563da8a8]
Former-commit-id: 4a0b8772ec
|
2013-03-05 12:29:44 -06:00 |
|
Ron Anderson
|
29cf2d6ddd
|
Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8
Former-commit-id: 3aba636666 [formerly f1d5ff7c9e] [formerly fdeb45705b] [formerly e8f1b460ce [formerly fdeb45705b [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]]
Former-commit-id: e8f1b460ce
Former-commit-id: 96dbec8a7d73075e3bd577828a3e622bb4ad9fbb [formerly 78a8d8f1a1]
Former-commit-id: fd86a481a7
|
2013-03-04 09:30:04 -06:00 |
|
Ben Steffensmeier
|
4936191404
|
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 2ca86633d6 [formerly f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a]
Former-commit-id: 334af0001b
|
2013-02-28 17:00:56 -06:00 |
|
Ron Anderson
|
ed6ca5734d
|
Issue #1597 Moved some interpolation messages to Performance Log for consistency.
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8
Former-commit-id: bbf1f71873 [formerly f491d7f7c3] [formerly c9ca7a2943] [formerly 079cdbcb29 [formerly c9ca7a2943 [formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]]
Former-commit-id: 079cdbcb29
Former-commit-id: 846298e466d8aeb3c8339bc3ed51526767ad3154 [formerly a5195e137e]
Former-commit-id: b2bffcf0de
|
2013-02-27 14:45:30 -06:00 |
|
Ron Anderson
|
48d3f2e700
|
Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27
Former-commit-id: 36268bb1e2 [formerly 50f5e44b39] [formerly 36be1c5850] [formerly c35e06d82c [formerly 36be1c5850 [formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]]]
Former-commit-id: c35e06d82c
Former-commit-id: ec9f49b951e85cf9798a915887bf38d1be6b9eaf [formerly 5bd0dbcfca]
Former-commit-id: e240568bb9
|
2013-02-27 12:34:40 -06:00 |
|
Max Schenkelberg
|
2aef608c3f
|
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: d0b7850775 [formerly 2611980ca4] [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 4ed4ef8d71 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]
Former-commit-id: e0ba97d547
Former-commit-id: c22d83de78a7efcb6e70f98b882e95d6a6e64ae6 [formerly 6b1426dd34]
Former-commit-id: 5617dfaa67
|
2013-02-27 11:50:38 -06:00 |
|
Ron Anderson
|
e362632eca
|
Issue #1708 Fix redundant excution of evaluateQuery.
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a
Former-commit-id: db805e2097 [formerly 2212f333a3] [formerly 8e1422f65ea479fdf23ed44e51e4289779d73417 [formerly a5a273c1c2]] [formerly 274ce762d8 [formerly a5a273c1c2 [formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]]
Former-commit-id: 274ce762d8
Former-commit-id: b2dd338df0ca4db81b2171b950912c2d66219f23 [formerly 84bd642290]
Former-commit-id: 93382aeed8
|
2013-02-26 19:00:56 -06:00 |
|
Ron Anderson
|
dc8d1dd95c
|
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: 547f0d086f [formerly d43afc8c67] [formerly bfe3c684df] [formerly f37999b1eb [formerly bfe3c684df [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: bf9a2b39ec50125619129c86673eb152b84b87e6 [formerly 77fbbb6a61]
Former-commit-id: 541557e0b0
|
2013-02-26 18:44:51 -06:00 |
|
Matt Nash
|
ac795d4948
|
Issue #1506 fix deadlock and edit areas showing up from query
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49
Former-commit-id: f18955a1ed [formerly 4be89bdd43] [formerly c728f72ea3] [formerly b749edca54 [formerly c728f72ea3 [formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]]
Former-commit-id: b749edca54
Former-commit-id: 7fd44919b46c967d986955013a9d92fff46bb8e8 [formerly 51e6302178]
Former-commit-id: daea84a1e8
|
2013-02-26 12:20:08 -06:00 |
|
Steve Harris
|
f30d1cdf87
|
Merge branch 'development' into omaha_13.3.1
Former-commit-id: 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1]
Former-commit-id: e46625f8f2
|
2013-02-25 15:58:48 -06:00 |
|
Steve Harris
|
7e48d3e684
|
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: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
|
2013-02-21 15:41:39 -06:00 |
|
Matt Nash
|
eec2ea4c29
|
Issue #1506 fix for GFE evaluateRefSet() for non-queries
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7
Former-commit-id: 0531052a2e [formerly 6f9621adb2] [formerly 2001d916ac] [formerly 492df9c238 [formerly 2001d916ac [formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]]
Former-commit-id: 492df9c238
Former-commit-id: 210f7f89643e818406eeea19775de2c66f16305d [formerly 5d6a7a6140]
Former-commit-id: 84f3da4828
|
2013-02-21 09:01:33 -06:00 |
|
Steve Harris
|
db712e1fcf
|
13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
|
2013-02-20 16:19:40 -06:00 |
|
Ron Anderson
|
c0364ee665
|
Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
Former-commit-id: 9c2caa95a0 [formerly 70050ac749] [formerly f1ad632c3f] [formerly 884d9ff787 [formerly f1ad632c3f [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]]
Former-commit-id: 884d9ff787
Former-commit-id: 0135351e11c5776ecfe36b40d5d95a0c1101bb82 [formerly 2c8d14406b]
Former-commit-id: 744391e3f6
|
2013-02-19 18:46:16 -06:00 |
|
Steve Harris
|
bca88ba9c7
|
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]
Former-commit-id: 81f1fb83a0
|
2013-02-19 12:22:00 -06:00 |
|
Steve Harris
|
db02d32440
|
13.2.1-8 baseline
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]
Former-commit-id: 8cffb55371
|
2013-02-18 09:09:41 -06:00 |
|
Ron Anderson
|
d09967b88e
|
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: 7d09df8468 [formerly cf0fc8d921] [formerly e70cfc5825] [formerly a6d87cdd7e [formerly e70cfc5825 [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]]
Former-commit-id: a6d87cdd7e
Former-commit-id: a76fdb7843d8fd407d0de1a07b1a83103ec4b3cb [formerly 999ac02aea]
Former-commit-id: 292614bc25
|
2013-02-18 08:31:50 -06:00 |
|
Richard Peter
|
67a541c54a
|
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: c8d46448bf [formerly 5bf0e0e999] [formerly 51533ccab2] [formerly 70f270ff16 [formerly 51533ccab2 [formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]]
Former-commit-id: 70f270ff16
Former-commit-id: 5a84f9cf95566309fac283f2dc58dcbbe30280d4 [formerly 2299503559]
Former-commit-id: 1b112227a8
|
2013-02-15 16:40:04 -06:00 |
|
David Gillingham
|
67c98b866c
|
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: 65b1aeb7f3 [formerly 9fae6695e2] [formerly 871364d630] [formerly da091b723d [formerly 871364d630 [formerly 463af46e64ed667efbc840d85f9babf3449780cc]]]
Former-commit-id: da091b723d
Former-commit-id: 2d27bf86785994cdfd9f88f8093afe2f1d435b78 [formerly 244bc9b270]
Former-commit-id: cc05bdae4e
|
2013-02-15 12:50:48 -06:00 |
|
Ben Steffensmeier
|
4140260659
|
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: bd6e0f8462 [formerly 1940a92596] [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly aa4c7526ff [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: badd785e8aa7a433093d24b4c4bf0d45450daf4a [formerly 455aa4628f]
Former-commit-id: 086f6aabe9
|
2013-02-14 15:34:25 -06:00 |
|
Matt Nash
|
1844303e5d
|
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: 2a42ae7a47 [formerly 75f51be7b2] [formerly bc954889eb] [formerly 5b136272a3 [formerly bc954889eb [formerly f6ef0f0ebc9002caad9a632515402b84280892fc]]]
Former-commit-id: 5b136272a3
Former-commit-id: f620d70c55f78938b7e41137630295768daa3ffe [formerly d29162c654]
Former-commit-id: 126537966c
|
2013-02-14 11:47:34 -06:00 |
|
David Gillingham
|
965feb571b
|
Issue #1515: Better handle notifications received after disposing VCParms.
Change-Id: Ia73102329755303b504871ed55f2a294ef390126
Former-commit-id: 5dc773e1d8 [formerly 02f2539433] [formerly 5b4de19ebd] [formerly ddcc84262a [formerly 5b4de19ebd [formerly ef9d97a4d0886df2072672b1cebc9b77e689308b]]]
Former-commit-id: ddcc84262a
Former-commit-id: 54fad731f6b5bba1bf4ee023995c413a2ff321cd [formerly 874434cea9]
Former-commit-id: a6883700ee
|
2013-02-13 11:08:20 -06:00 |
|
Steve Harris
|
5027d2365b
|
13.2.1-6 baseline
Former-commit-id: 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]
Former-commit-id: a46e33f06e
Former-commit-id: 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d [formerly 30d38334cc]
Former-commit-id: bbe92e6824
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
3ee627253f
|
Merge branch '13.2.1_delivery' into development
Former-commit-id: 953bec4467 [formerly da43a7a8ca] [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 4bc8e9ab5c [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]
Former-commit-id: 5ee47e098d
Former-commit-id: 0d3c30007ccec08e7c869bfdb97fef5b71783b3b [formerly 3ad515e28f]
Former-commit-id: b119d66cda
|
2013-02-06 11:12:01 -06:00 |
|
Steve Harris
|
63b36d8670
|
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: 44a4287812 [formerly 14f23d4227] [formerly a16ac7819c] [formerly 6c6b53679b [formerly a16ac7819c [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]
Former-commit-id: 6c6b53679b
Former-commit-id: 5a2f1703799bcf7b130380bb73001e518a88ee6d [formerly 28ddc9bad8]
Former-commit-id: 48a0ffda4d
|
2013-02-06 11:08:53 -06:00 |
|
Steve Harris
|
5d64cfc298
|
13.2.1-5 baseline
Former-commit-id: 7e1236c17c [formerly a6b3cde1ff] [formerly 232734091d] [formerly 146fcc6da8 [formerly 232734091d [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 49d71a590915a63b8746aa7ff8b66241cdada3aa [formerly 1c602ec3a7]
Former-commit-id: 7497a15e22
|
2013-02-06 11:02:32 -06:00 |
|
Steve Harris
|
8c890bc52d
|
13.2.1-5 baseline
Former-commit-id: e2b47a728a [formerly d6a9d68c10] [formerly a11ab8f26e] [formerly d26a488ee4 [formerly a11ab8f26e [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]]
Former-commit-id: d26a488ee4
Former-commit-id: 38010bc7076d42c73fff1e588beb826187f9ac6b [formerly 4a745c9483]
Former-commit-id: 72ca459f76
|
2013-02-04 16:31:26 -06:00 |
|
Steve Harris
|
d6b48ca411
|
13.2.1-4 baseline
Former-commit-id: ed224fde88 [formerly ae2859d5a2] [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly 8f2e7d4437 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 10a61c775941bb43691425e06f2cf4ac1116da55 [formerly 2998f750f4]
Former-commit-id: 3f25b862c8
|
2013-01-31 11:40:31 -06:00 |
|
Steve Harris
|
41b14f0fa2
|
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: f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]
Former-commit-id: 73d9455c65
|
2013-01-31 10:19:14 -06:00 |
|
Steve Harris
|
c9bc690eca
|
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f]
Former-commit-id: 75f6e61e6f
|
2013-01-29 15:57:21 -06:00 |
|
Steve Harris
|
03989493ae
|
13.2.1-3 baseline
Former-commit-id: b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be]
Former-commit-id: daca1c3e73
|
2013-01-29 15:52:43 -06:00 |
|
Ron Anderson
|
5ffbbdd699
|
Issue #1535 Fix GFE saving last block of grids twice
Change-Id: I3411e27c96b5f0dd79c24e7ba75361582cb6652c
Former-commit-id: c070b55324 [formerly ed7784818a] [formerly aa2c0ffb60] [formerly 5738910b71 [formerly aa2c0ffb60 [formerly 16eedd6d46196d08d02abc674c81ed95c403457c]]]
Former-commit-id: 5738910b71
Former-commit-id: 9ad86a93f01dfa8394e229e86a96b7f7e7dcd020 [formerly d61a24410a]
Former-commit-id: 670f23e1c2
|
2013-01-28 19:23:23 -06:00 |
|
Steve Harris
|
1397f8a811
|
Merge branch '13.2.1_delivery' into development
Former-commit-id: d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly 827611474f [formerly f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]
Former-commit-id: 827611474f
Former-commit-id: b9760adfb36650f58aa4202fbbd5beedb40f8529 [formerly 25fecb8b4f]
Former-commit-id: a85c81289e
|
2013-01-25 10:54:51 -06:00 |
|
Steve Harris
|
0f4fcd0ba8
|
13.2.1-2 baseline
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]
Former-commit-id: 251a9c0195
|
2013-01-25 09:07:12 -06:00 |
|
Ron Anderson
|
250fd1d223
|
Issue #1524 Fix discrete color bar.
Former-commit-id: 001770beb7 [formerly 3d838584ed] [formerly 718f1da85b] [formerly 358c8bdf07 [formerly 718f1da85b [formerly 7edd57ef71e8a22aa25870477844ba063da0b9d3]]]
Former-commit-id: 358c8bdf07
Former-commit-id: d49ec924e070578e004c1ea1c0c50d561de56ceb [formerly 3ccfdbc4bb]
Former-commit-id: 6f7fa3e4e5
|
2013-01-23 16:37:56 -06:00 |
|
Steve Harris
|
d069467e81
|
13.2.1-3 baseline
Former-commit-id: 7d2e979c51 [formerly a5a0da5c02] [formerly 7435527b25] [formerly 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: 32e4736725f3f6d880854f4dba7503e4939e28b7 [formerly cc0fdef15c]
Former-commit-id: 9d248cff7a
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
ce726fadc7
|
13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]
Former-commit-id: d9be4dce21
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
1d1791b3b4
|
13.2.1-1 baseline
Former-commit-id: 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf]
Former-commit-id: 8ed6a53113
|
2013-01-23 11:13:03 -05:00 |
|
David Gillingham
|
b96532e8ba
|
Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads.
Change-Id: I1c3c46dde051802fb79b7ead6fb63d766d1d00a6
Former-commit-id: a8bc4575bc [formerly eab83c0f63] [formerly bf6230441f] [formerly 88e518725e [formerly bf6230441f [formerly 9cd87997f7ae7b51608ac56fcdf4d282339526aa]]]
Former-commit-id: 88e518725e
Former-commit-id: 9daae29bca1ae2c2c15295eb3aeae98bbeae7fa5 [formerly a1fd2bd32f]
Former-commit-id: faedefb85d
|
2013-01-23 10:09:39 -06:00 |
|
Steve Harris
|
7d6a1a7e3a
|
Merge branch '13.2.1_delivery' into development
Former-commit-id: f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly 1af055a04b [formerly 11b9bfc187 [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]
Former-commit-id: 1af055a04b
Former-commit-id: cdda32a5afb54d36ca6dc56ab5842aa9a04bf651 [formerly 29b9077291]
Former-commit-id: 8b578c10dc
|
2013-01-22 16:45:48 -06:00 |
|