Bradley Mabe
|
48c980abe8
|
Merge remote branch 'origin/ncep_14.4.1-n' into ncep_15.1.1-n
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
Former-commit-id: 3d3cecdeb7bc191fa10e7bcb6e4791cab34daadc
|
2015-08-25 09:55:26 -04:00 |
|
Chin Chen
|
a3ed67b12f
|
VLab Issue #9961 CAVE>NSHARP - D2D changes to support replacement of uE code
Change-Id: Ia6ef7d43685d91f7bef6a491bb09723275d92fe7
Former-commit-id: 99cbf1fbb04733bfddb9c7fd1784c753ac8e36dc
|
2015-08-04 15:16:36 -04:00 |
|
Joshua Huber
|
5a79f1e01a
|
Merge branch 'master_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into ncep_14.4.1-n
Former-commit-id: 0704502642f510019deeef2ff60421a555cc4ee1
|
2015-06-11 15:32:26 +00:00 |
|
Joshua Huber
|
a8f3d295c9
|
Merging RM #7787 and #7788
Former-commit-id: e982930e89122c027984b6a14c3e75bf3451a63f
|
2015-06-11 15:30:24 +00:00 |
|
Fay.Liang
|
fd1e064cc5
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: fe68fc5a195cbad55f9717c9aaa1dbd06d400710
|
2015-06-09 11:05:15 -04:00 |
|
Rici.Yu
|
50ab0b2325
|
ASM #17487 - Fix gfeclient hanging due to lock file conflict
Change-Id: I8131c781d332135eaf9955fdf3e172b61c4e92da
Former-commit-id: d3c911a1f425a81d35ebd4184b626f256183206b
|
2015-06-08 16:27:47 -04:00 |
|
Joshua Huber
|
db3688da10
|
VLab Issue #4097 - Implement NCP VIIRS viz plugin
Former-commit-id: cd8be322b7d6f1cdcc0ee602523d1d66fb32ff42
|
2015-06-08 20:17:30 +00:00 |
|
Fay.Liang
|
c2db82ebcf
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 72c9980a188772b8c055b26ab5831772531df158
|
2015-06-05 17:05:09 -04:00 |
|
David Friedman
|
b8142209ee
|
ASM #17428 - WarnGen: Restart button incorrectly resets new product polygon lengths
Change-Id: I6da0c26fda99aa486b0e94fe9686b01a8705e49b
Former-commit-id: 9f11d72155dfb71c96c356ed4a7aa37d4c486662
|
2015-06-05 20:05:42 +00:00 |
|
Steve Harris
|
d0b6d48b74
|
Merge tag 'OB_15.1.1-16' into omaha_15.1.1
15.1.1-16
Former-commit-id: be04bc4173d6097f54100f1b033770fa96376689
|
2015-06-05 12:00:21 -05:00 |
|
Ron Anderson
|
57aacebeda
|
Omaha #4522 Fix dynamic serialization errors
Change-Id: I73c96d05d1381509b44b3bcd99907369da3e3259
Former-commit-id: 5d1ed08cb86930a3d0bfe16aacef215bf9a6004a
|
2015-06-04 18:08:53 -05:00 |
|
Fay.Liang
|
c0761ec77f
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 3740fdade37fca742f1082c6b14464e7be0d83b3
|
2015-06-04 15:09:48 -04:00 |
|
Steve Harris
|
de1ed8a388
|
Merge tag 'OB_15.1.1-14' into omaha_15.1.1
15.1.1-14
Former-commit-id: 4635dc7a46efb40c17b0f4170d39f09281847495
|
2015-06-04 09:15:18 -05:00 |
|
Matthew Howard
|
49ff6916f7
|
Merge "ASM #17533 - get all rules in AvnFPS Monitoring Criteria window" into asm_15.1.1
Former-commit-id: 34eb6e4644918e798ede647752be99c60a5edbe0
|
2015-06-02 14:50:18 -05:00 |
|
Yun.Teng
|
534d717b93
|
ASM #17533 - get all rules in AvnFPS Monitoring Criteria window
Change-Id: Icf1ffb6dd5849583e41ce3aab917df34006a4a22
Former-commit-id: 34987045d6e8df599d5f2ec0ca34c5ecabf5f4e8
|
2015-06-02 18:46:58 +01:00 |
|
Ben Steffensmeier
|
4658c92027
|
Omaha #4532 Thin client sync localization now goes through normal PathManager.
Former-commit-id: fb033fdb0c841af5aae3238310ae7315b34e744d
|
2015-06-01 10:30:46 -05:00 |
|
Fay.Liang
|
897194214e
|
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 6c8e5f9fba2f3f080287da9931dcbe1dee2545c6
|
2015-06-01 08:59:15 -04:00 |
|
Fay.Liang
|
631ab54208
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
Former-commit-id: 904d90b1eb028c677b6f62f9a244aa7fd061fef6
|
2015-05-29 16:17:18 -04:00 |
|
Fay.Liang
|
27043f6fb7
|
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1
Former-commit-id: f2b3a2fc2c1a5362673fed5b4841cd6d5d86ea5d
|
2015-05-29 15:43:59 -04:00 |
|
Fay.Liang
|
3a354bf7fb
|
Merge tag 'OB_14.4.1-47' into int_15.1.1
14.4.1-47
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
|
2015-05-29 15:42:40 -04:00 |
|
Ying-Lian.Shi
|
0d40ae6492
|
ASM #17500 GFE: Problem with CTAs for Heat Advisory (HT.Y) and Excessive Heat Warning (EH.W)
Change-Id: Ia5e8c7775deab23d689e7d9a987523536ff98e2b
Former-commit-id: e8cf281170f41e86c1d4bd643dbe92ee79b9adec
|
2015-05-29 18:18:08 +00:00 |
|
Fay.Liang
|
829623b5f9
|
Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1
Former-commit-id: 4141b2af7a1f42d839498251afda892fe7831d53
|
2015-05-28 22:28:53 -04:00 |
|
Fay.Liang
|
8019a014a8
|
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
Former-commit-id: 724d71bb4e456a9dd02633dc81bd8e26dca105f2
|
2015-05-28 22:25:58 -04:00 |
|
Yun.Teng
|
e18cbe38a5
|
ASM #17417 - Display complete AvnFPS station list instead of one
Change-Id: I6de2526250d5c0df553c60668b690574bc4ba1f8
Former-commit-id: 4db44b41db3b13ac55f77752dca1e5ebf458b999
|
2015-05-28 17:08:25 -04:00 |
|
David Lovely
|
ee34457d03
|
Omaha #4530 Use the same PID for the startup-shutdown log
Change-Id: Ie281558f1626c1f08ef54057c96190d11d7d78db
Former-commit-id: f644b90915ecae3fea88f9224d9e9b27d1229a61
|
2015-05-28 12:10:53 -05:00 |
|
Ron Anderson
|
44d955ceb5
|
Omaha #4467 Fix issue with unicode string from formatter
Change-Id: I4f5792953aef2bccecc7576d8282bcbd5d89671a
Former-commit-id: e95402f2b4bfef8bfb1de89b6ff58cf0e19a8daf
|
2015-05-27 15:28:29 -05:00 |
|
Fay.Liang
|
8662fa2c97
|
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: f757806dfa8a051edd45a36a3ba2e9f29fb424a3
|
2015-05-26 10:01:32 -04:00 |
|
Roger Ferrel
|
f780c688fc
|
Omaha #4510 - No longer send TAF when uable to obtain forecaster's ID.
Change-Id: I3abdc4ff7efe855ec03397ad64975ff821a7d9ac
Former-commit-id: 74b6383da97fc437307a515492862101fa0cbf61
|
2015-05-22 15:09:33 -05:00 |
|
Fay.Liang
|
9e651a81c3
|
Merge tag 'OB_14.3.4-2' into master_14.4.1
14.3.4-2
Former-commit-id: ab0f58ebd6b4ce61525b1ec768fb6b293098cd91
|
2015-05-22 14:52:28 -04:00 |
|
Ana Rivera
|
3873a7bc36
|
VLab Issue #8326 -DR17492 TCStormSurgeThreat Update 2; fixes #8326
Change-Id: Idac35a7a2465257147f9e4fb3f5e70d7e3713192
Former-commit-id: 377a104856ac009f465a534e9cec03754d5c2272
|
2015-05-22 18:28:22 +00:00 |
|
Ana Rivera
|
b5ac7fef0b
|
VLab Issue #8326 - DR17492 A new TCStormSurgeThreat procedure; fixes #8326
Change-Id: I70b38b4e6c21372a4522446e94e370e90e342334
Former-commit-id: bd4722e28a60504f610350ccc7c0b6eb9cd6898e
|
2015-05-21 23:30:28 +00:00 |
|
Ron Anderson
|
b111abbe9a
|
Omaha #4027 Fixes for GFE formatter auto tests
Change-Id: Ia59e2a7794f520538d056e2b4286d53b6317ab06
Former-commit-id: 093e1d721e130f690b15e821d6bb4f12f3b62913
|
2015-05-21 14:32:47 -05:00 |
|
Ana Rivera
|
9f6958d69b
|
Merge branch 'master_15.1.1'(master_15.1.1-12) into field_15.1.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9c737b735af5d1066448c71e1ffc09a1129f7435
Former-commit-id: 1f5ab00d137a3e5e75a20b15a65c4b34596a9b38
|
2015-05-21 13:39:59 +00:00 |
|
Ron Anderson
|
8f2c551485
|
Merge "Omaha #4509 added python time and dataaccess folders to include path" into omaha_15.1.1
Former-commit-id: 73f19eafac1c6c8de267847789aec6d389295a82
|
2015-05-20 18:45:36 -05:00 |
|
Nate Jensen
|
e3a4563739
|
Omaha #4509 added python time and dataaccess folders to include path
Change-Id: I377d742761e5043b240579ebcfb9a77b2a7118df
Former-commit-id: 846925e473072e6f5b9dcbfd2355e64c40627c4b
|
2015-05-20 18:19:34 -05:00 |
|
Richard Peter
|
963da59dd2
|
Omaha #4346 - Allow alertViz to load configuration from common_static
Change-Id: I121aa90f405f4c9deea7f9627bd2ed60f31a1a91
Former-commit-id: 41fcc19791a1c6ba725ebe38b51d87f8e1c9af7c
|
2015-05-20 16:28:56 -05:00 |
|
Roger Ferrel
|
ee32011be0
|
Omaha #4510 Sending TAF now uses forecaster ID instead of name.
Change-Id: If8dd7c6cbea2da7b5c392786e26e67c96eb616c4
Former-commit-id: 81e54aad427a151b1fd61a3d2ea25ecd50686a04
|
2015-05-20 15:57:56 -05:00 |
|
Ron Anderson
|
cbcd9bd2c4
|
Omaha #4027 Fix case of a couple of expected results
Change-Id: I066521c707d5b3f540d3d232f450a2a082e8180d
Former-commit-id: 52343f35781f39a9ad63a72d5f709d3d93a0279f
|
2015-05-20 08:29:02 -05:00 |
|
Steve Harris
|
090c3102f8
|
Merge tag 'OB_15.1.1-12' into omaha_15.1.1
15.1.1-12
Former-commit-id: 31ae0154fe4ad36aefb84f0210ce72172a31a9c2
|
2015-05-19 17:00:31 -05:00 |
|
Jingtao Deng
|
0dea4811cd
|
VLab Issue #8200 - DR17493 Saving a Selected Preset in Hydro PDC does not function; fixes #8200
Change-Id: I3fb9a7e43057f374a3d055a3ab294eca094a16cb
Former-commit-id: f4cfa77511b9d887006582da8dc7dd4f044b4d3e
|
2015-05-15 16:04:48 -04:00 |
|
Fay.Liang
|
18d35764ab
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 104b1db29f896a152e46094c4c5b22f844a7de0e
|
2015-05-14 19:18:49 -04:00 |
|
Ron Anderson
|
c645c4ea7d
|
Omaha #4027 Fix Hazard_AQA formatter
Change-Id: I0ac47efce8c3023f1ddbcaefc1bcb7538cca5224
Former-commit-id: 56020a1ae788746f4a40c43d8478334a171706af
|
2015-05-14 17:44:14 -05:00 |
|
Matthew Howard
|
dcae2daa72
|
Merge "ASM #15660 Fixed issues with array not setup in Disagg6hr." into asm_14.4.1
Former-commit-id: b4345d3d2be525233c80ad00bf44ae8f9c61e04a
|
2015-05-14 17:18:31 -05:00 |
|
steve.naples
|
1b87f3fb09
|
ASM #15660 Fixed issues with array not setup in Disagg6hr.
Change-Id: Ie94bdbb75164d45ac971ea4005b25903180f4057
Former-commit-id: 04930514d6398bc9ac8bbbcefa7f2ed544b0321b
|
2015-05-14 21:21:41 +00:00 |
|
Ron Anderson
|
2304e45d74
|
Omaha #4027 Changes to match draft mixed case guidelines from Phase I
Change-Id: I2af2a2742f99c8a97976cafd451057b7e7137efe
Former-commit-id: b9d9063e56939b558eee3f64b65ddc28f6478c38
|
2015-05-14 14:58:07 -05:00 |
|
Fay.Liang
|
6e3b05f1ec
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: a282c0b3fac70f99abd8f734771fc8805d8b8a13
|
2015-05-14 14:05:04 -04:00 |
|
Fay.Liang
|
3e63965908
|
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
Former-commit-id: fb0b41ff7b119e80d81e028bd8a768d6df335cf3
|
2015-05-13 15:11:13 -04:00 |
|
Fay.Liang
|
e568ee4b4c
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into int_15.1.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 53eed5ee0c73100c13f7fef013bff6061db4815b
|
2015-05-13 15:08:24 -04:00 |
|
David Friedman
|
a3a6bf3192
|
ASM #17438 - WarnGen: improve performance logging
Change-Id: If0635087e542642883238e28481d8577c9d05f44
Former-commit-id: 9955a64e0d6902e50e6bc62c8e857e5d68451017
|
2015-05-13 17:24:27 +00:00 |
|
Ron Anderson
|
eb7f2bd5de
|
Merge "Omaha #4027 Get GFE Formatter auto tests working with mixed case" into omaha_15.1.1
Former-commit-id: d3728e8ce648601b1d16dc3ee7e5afc9b52a65c1
|
2015-05-13 11:28:39 -05:00 |
|