Brian.Dyke
|
1d9494a502
|
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 590e37a8f2 [formerly 301f3094be] [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: b9da27608c [formerly bbe6ec4d50] [formerly 4f6e23e0fe3a5044b75abe6a89c965ab32b19947 [formerly 37aacfcb96]]
Former-commit-id: ea25ca2fdedff8bbe1c901d0538886147f633e65 [formerly b9daa26f7d]
Former-commit-id: 803ceadaec
|
2014-08-04 13:10:13 -04:00 |
|
Jonathan Sanchez
|
1eebd8ac53
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: c479178882 [formerly 997485dd22] [formerly 86a8ca4a30] [formerly c479178882 [formerly 997485dd22] [formerly 86a8ca4a30] [formerly b991838494 [formerly 86a8ca4a30 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]]]
Former-commit-id: b991838494
Former-commit-id: 3d434c29c1 [formerly f7bc9a8023] [formerly 850ffbd991e733a0bd522e120fa37ad963197e14 [formerly 025c29acc0]]
Former-commit-id: 5b450f5b49602fd2a5be013c2018216984912a58 [formerly 56cbd23141]
Former-commit-id: e4268f814e
|
2014-07-22 15:32:12 -05:00 |
|
Fay.Liang
|
294e428e0d
|
ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Former-commit-id: 9bc5268f64 [formerly d57ebaad64] [formerly 0b9a011c58] [formerly 9bc5268f64 [formerly d57ebaad64] [formerly 0b9a011c58] [formerly f56d9511b8 [formerly 0b9a011c58 [formerly 445239c00cbe2147c014e180570085be6224da79]]]]
Former-commit-id: f56d9511b8
Former-commit-id: f89c9c34a8 [formerly 1411895d5d] [formerly 5f5885d7e2755ddd8b853891b3bd33394ac85b10 [formerly b77277b80e]]
Former-commit-id: 686f035ee54396179299e3a373b9a7bb09614269 [formerly 247f3817be]
Former-commit-id: b1f0d4db14
|
2014-05-27 16:04:22 -04:00 |
|
Brian.Dyke
|
90edefdb00
|
Issue #224
Former-commit-id: cd80c22b5c [formerly ed476a583f] [formerly 3f86a80d7e] [formerly cd80c22b5c [formerly ed476a583f] [formerly 3f86a80d7e] [formerly dad6f2896b [formerly 3f86a80d7e [formerly 043faa447b4fc15a996dfe6108093bed5f1b6497]]]]
Former-commit-id: dad6f2896b
Former-commit-id: 896375c47b [formerly 17e3464377] [formerly 70f7b0213878f981680926bd20a81de54dadf205 [formerly 610cf76a29]]
Former-commit-id: 24eddc155397c6806dc89bb2fd48417fee4403c3 [formerly 6e57eae922]
Former-commit-id: a9af4960f0
|
2014-02-04 17:05:12 -05:00 |
|
Richard Peter
|
8a6f8865ea
|
Merge branch 'omaha_13.5.3' (13.5.2-7) into development
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50
Former-commit-id: 21d44cc52a [formerly 75b0f19d87] [formerly bb9488bb92] [formerly 21d44cc52a [formerly 75b0f19d87] [formerly bb9488bb92] [formerly f4e71b65d3 [formerly bb9488bb92 [formerly 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e]]]]
Former-commit-id: f4e71b65d3
Former-commit-id: 1e05051167 [formerly 3514194d3b] [formerly 7e26aa18c7f56b191ba44b8bf661be4364edc8a9 [formerly 39ae6d437d]]
Former-commit-id: e746656ef69ab2826357b57acf74fda2ede8ad96 [formerly ddf07f8030]
Former-commit-id: 86c28e6e16
|
2013-10-01 15:06:34 -05:00 |
|
Richard Peter
|
1d08e54d43
|
Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
rpms/awips2.cave/deploy.builder/build.sh
Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: 4c53471f8e [formerly e7ec068c7e] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]]
Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b]
Former-commit-id: 2a9cfe51af
|
2013-07-22 09:40:18 -05:00 |
|
Nate Jensen
|
2d6737f52c
|
Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15
Former-commit-id: 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly b767760a9c [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]]
Former-commit-id: b767760a9c
Former-commit-id: 0509e362b9 [formerly 93713d9698] [formerly 85f35fc0d31289c55393eeee4cf0917b4eabadb0 [formerly c77936c6c0]]
Former-commit-id: 0d2fa08b78da80bd2050c50580bfb6d7564771fc [formerly 175a28da9a]
Former-commit-id: 06502f57ef
|
2013-07-18 09:53:53 -05:00 |
|