Ana Rivera
|
088ebd2ca2
|
VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55
Former-commit-id: 9c3460d34513dd2f54643b87cb8afd122d94ea9c
|
2014-07-21 21:41:17 +00:00 |
|
Steve Harris
|
7acd9ab2dd
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: d25ab509cb53d559edbd520dd1e3c036166f2e29
|
2014-07-01 11:08:46 -04:00 |
|
Steve Harris
|
ddc6f2092a
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 174fe6d66525229f328846a1f4564300d7603c10
|
2014-06-24 10:57:56 -05:00 |
|
Nate Jensen
|
65619399a0
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716])
Former-commit-id: f0ad63d2ccf347e92274701f9890e120b9e70140
|
2014-06-23 11:59:26 -05:00 |
|
Nate Jensen
|
97ef9fc343
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: c6ce72840a4ee0f44eacff46015b5382d86dd47f
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
419c5f4aba
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
8ecdd9a192
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 86dc406cd227362abc5274f4cd64813ceb91d00d
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
482f915b42
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Merge branch 'master_14.1.3_merge' into master_14.1.3
Former-commit-id: 4b317062ce5c35823210cbbf023c0f0fc8051ef3
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
81832d97e5
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: df99fcb0a4be27d5f2d22935847fb55b8bfbbb58
|
2014-06-13 13:21:19 -04:00 |
|
Brian.Dyke
|
6fcc2604e0
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 0d441b5eebad07acf51d6d5c28ee5ac7770d9733
|
2014-06-12 07:07:17 -04:00 |
|
Steve Harris
|
9510608b74
|
Merge branch 'master_14.2.2' (14.2.2-13) into omaha_14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: If5dae78936eddf1bc4ee63f35beb96a0cb9defb9
Former-commit-id: cf56d49dc5a197fa114fa6c468860d63621a9cdc
|
2014-06-11 12:55:44 -05:00 |
|
Ana Rivera
|
9da58db461
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Former-commit-id: 83640ccce75b600d53a0d44ae1528c312b7947b5
|
2014-06-11 17:35:55 +00:00 |
|
David Friedman
|
1c84c31e30
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: a3f4fd6537f3847011e199e0f043968d9f595937
|
2014-06-11 13:37:16 +00:00 |
|
dmsys
|
1f0a6112c7
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 161ffe72d115c7846697afa8be559d2f5fd199da
|
2014-06-10 17:17:26 -04:00 |
|
Brian.Dyke
|
9ab17ddecb
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
8874d41872
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: b859032bcec187616adfd414dd1ce5fe27829e9e
|
2014-06-10 12:52:59 -04:00 |
|
Steve Harris
|
bd98f04cde
|
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: 65793ec4d12626b2d3365c5a0e8c3e229972b289
|
2014-06-09 15:20:03 -05:00 |
|
Mike Duff
|
39173c380c
|
ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: 7fe0dae041cb68aba968e22d5895cce22a210ee6
|
2014-06-06 16:03:14 -04:00 |
|
Xuezhi.Wei
|
33b235a0a4
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: f7b5f3bbc71cc251e19f1764ee7756050895b7a3
|
2014-06-06 17:40:09 +00:00 |
|
Juliya Dynina
|
87216a87de
|
Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
Former-commit-id: 1e1c7cbcee94e782338d440d585a3217ad606725
|
2014-06-06 09:50:36 -05:00 |
|
Sean Webb
|
cb43d21243
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: 5556e19903965bea22ca2f11b51fcc1c95cb07f8
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
c5e6daa943
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: fc06896ae4d9adf0973522313f5e65df6ac67fa4
|
2014-06-05 15:49:27 -04:00 |
|
Chip Gobs
|
036d1c4d31
|
VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse.
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d
Former-commit-id: 6944361d04e7462f768bb74f00780dc8b8a51225
|
2014-06-05 13:37:02 -04:00 |
|
Stephen Gilbert
|
d49482965e
|
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b
Former-commit-id: c681ba369a486f3ff3c7a324837a78e9c5594b4b
|
2014-06-05 12:06:35 -04:00 |
|
Mike Duff
|
f5f101d416
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 3f1f9cf4fa6207edae642db5cffdc8284091f31a
|
2014-06-05 09:35:07 -05:00 |
|
Michael Gamazaychikov
|
50ab77046b
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: a38308fa5a6efe9a07ecd84bd93662bea32afc94
|
2014-06-05 13:43:04 +01:00 |
|
Brian.Dyke
|
7db87d6ccb
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements...modified spec file
Former-commit-id: f671db68bfab4b9c17eb25050468e5b6306e6359
|
2014-06-04 11:52:00 -04:00 |
|
Brian.Dyke
|
3919c9ec2f
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: 36fa86071fa492bd1d135b3ded6cde54d0567474
|
2014-06-04 07:46:16 -04:00 |
|
Brian.Dyke
|
329393d172
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 298cc5124ee8a8b12db45ae2d2c9505f0ae99857
|
2014-06-04 07:41:40 -04:00 |
|
Brian.Dyke
|
696bf39f26
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 785b4a8b95ad78d84b6e68f4d3917c7142d4a3ce
|
2014-06-04 07:41:28 -04:00 |
|
Kenneth Sperow
|
f2a738cc25
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8
Former-commit-id: b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5
|
2014-06-03 20:55:29 -07:00 |
|
brian.dyke
|
b3d95ca18d
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2d4751c000176447d28b284337fb23a60cb19cd1
|
2014-06-03 16:14:16 -04:00 |
|
Zhidong.Hao
|
71ab6b9ed0
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 74597b2630ffd8d984b193f72126a9a5d0b3a942
|
2014-06-03 11:55:32 -04:00 |
|
Sean.Webb
|
69c5318fe7
|
Merge "ASM #550 - Remove ITO call from monitor_qpid_hosts.sh" into asm_14.3.1
Former-commit-id: 1e0452f11fbbc45406b0652c0caa3ec800bfa6f7
|
2014-06-02 10:15:07 -05:00 |
|
Brian.Dyke
|
c6244e1950
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: dec7b6fa091cab098b89a51551fa46b9f28b959b
|
2014-06-02 07:01:37 -04:00 |
|
Sean.Webb
|
94f2a4ab2a
|
Merge "ASM #557 - Removed rh6 dependency from wxgtk rpm requirements" into asm_14.3.1
Former-commit-id: ca4cde97f7304f94bb990dcd53ac39e06c09c7de
|
2014-05-30 14:42:34 -05:00 |
|
Sean.Webb
|
73c2add28e
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements
Change-Id: I5a59edfb974c945a4d382fad109e513e3a51eeee
Former-commit-id: bba964bd6af7d307a27ee85b11bce03d79f52e97
|
2014-05-30 14:40:44 -04:00 |
|
Sean.Webb
|
75f8e82eeb
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 88147ed5e5cd84e40acf61ad46d1baa554fd4e28
|
2014-05-30 14:27:59 -04:00 |
|
Sean.Webb
|
42b78d7ec0
|
ASM #550 - Remove ITO call from monitor_qpid_hosts.sh
Change-Id: I685b7ea1f2ed6d1eeb91e933b76eee051a3332f8
Former-commit-id: 43c50503e9aadc3dc66cdbf6b50f18a642547f35
|
2014-05-30 14:09:16 -04:00 |
|
Brian.Dyke
|
3f1e12effc
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 9d7a819489480e119b65cb5643520818adeb1ebf
|
2014-05-30 10:46:25 -04:00 |
|
brian.dyke
|
03cc2fbbfb
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2e170e3e328804a56f65de7cec0f0e89d3f1aba4
|
2014-05-30 10:09:00 -04:00 |
|
brian.dyke
|
ee7c67f7b0
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: d7b707236a1ee3bca45dee26c10814d9e3c275c8
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
8375a2af3e
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: def2351f527613dd62a081161e5f3a87756493ec
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
5cf0579d20
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 626ee991cd7e9dbfe52342abd9e3fd41b973f72a
|
2014-05-29 16:56:46 -04:00 |
|
Steve Harris
|
9313e045bf
|
Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: 03b376033b3374694bc8a6e0a2c55b830db058e1
|
2014-05-29 07:45:24 -05:00 |
|
Brian.Dyke
|
574246b6d4
|
Merge remote-tracking branch 'remotes/origin/master_14.2.1' into master_14.2.2 CM-MERGE:14.2.1-30 into 14.2.2
Former-commit-id: f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da
|
2014-05-28 16:25:33 -04:00 |
|
Shawn Hooper
|
87d98c31fb
|
Merge "ASM #600 - the fixes for DR 17380" into asm_14.3.1
Former-commit-id: 25235d87722f50f4bd034002f2b9d7f1f9dfcd42
|
2014-05-28 13:04:45 -05:00 |
|
Brian.Dyke
|
ce81b44f32
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: b92ce0c1589c48de73387c142f1302409a3b0cb7
|
2014-05-28 09:36:15 -04:00 |
|
Steve Harris
|
048d3748b7
|
Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
Former-commit-id: 70398b6d6c43e8931d4d88660af2ba7a8b2668e2
|
2014-05-28 07:41:42 -05:00 |
|
Brian.Dyke
|
e852623f48
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: c85d4369600bfc24405386aa71713d7f2d58b201
|
2014-05-28 08:40:56 -04:00 |
|