Brian.Dyke
|
d2d085aa39
|
Merged 13.5.5-1 into 1412
Former-commit-id: 9075808d0a [formerly 65ad515a6e] [formerly 188d84cc87] [formerly 9075808d0a [formerly 65ad515a6e] [formerly 188d84cc87] [formerly 35ad867281 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]]]
Former-commit-id: 35ad867281
Former-commit-id: 4808bb32bb [formerly c0266e8988] [formerly 8837283d998164da174b3d8f18d42dbebeeb1257 [formerly 72618c4214]]
Former-commit-id: 856567af7814ca29ea4e90337f3ec6c13981ce04 [formerly 737283b94a]
Former-commit-id: 73efa466f9
|
2014-04-16 12:09:12 -04:00 |
|
Nate Jensen
|
c40115ef80
|
Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
Former-commit-id: 52e4a94bb3 [formerly 9ebedf0b98] [formerly d121f07e76] [formerly 52e4a94bb3 [formerly 9ebedf0b98] [formerly d121f07e76] [formerly e0ae9e5f8f [formerly d121f07e76 [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]]]]
Former-commit-id: e0ae9e5f8f
Former-commit-id: ef5448e8f9 [formerly 736c2cc764] [formerly 77ce898f6def28352aefa08188156dd2bc89176b [formerly e0ffa7b6b4]]
Former-commit-id: 652809268dc177578cdc57e167bee3c9e728fe1b [formerly 700080e879]
Former-commit-id: 7031f73fe2
|
2014-04-16 08:41:54 -05:00 |
|
Ron Anderson
|
861aaf0dfa
|
Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly 9f085a0856 [formerly 6e0147169f [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]]
Former-commit-id: 9f085a0856
Former-commit-id: c263058e63 [formerly a6fa60f40d] [formerly 4b1dcfa5f1e94d0867e4b137f8e3643f96ecc196 [formerly 4622ad9b8a]]
Former-commit-id: c311f1a789e254f3b8d8c63514a373eb8b409c06 [formerly 56a1b8b682]
Former-commit-id: 072102dff0
|
2014-04-15 17:22:12 -05:00 |
|
Ben Steffensmeier
|
76c12afbfe
|
Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 2c5ef01980 [formerly 49ca556b33] [formerly ecbe6fd2d7] [formerly 2c5ef01980 [formerly 49ca556b33] [formerly ecbe6fd2d7] [formerly 6ea38cfbb2 [formerly ecbe6fd2d7 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]]]]
Former-commit-id: 6ea38cfbb2
Former-commit-id: 68df2b0d29 [formerly 2f51d63032] [formerly 305f259935e7d3b0c4aa6d31fb2c63c47d11a7ad [formerly 3eebc7a864]]
Former-commit-id: 003a747a5ae4b41830eb3012aa75e88ce095a4b1 [formerly af826302a1]
Former-commit-id: 7dc8709a5b
|
2014-04-15 13:29:05 -05:00 |
|
Steve Harris
|
1c13496912
|
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: 9ff3077435 [formerly 9132d9004e] [formerly eb2f2865fe] [formerly 9ff3077435 [formerly 9132d9004e] [formerly eb2f2865fe] [formerly 5bf5bdb6b0 [formerly eb2f2865fe [formerly f4c8ce899d312b389aff32d052564559e79904be]]]]
Former-commit-id: 5bf5bdb6b0
Former-commit-id: 1f3584ce15 [formerly 6ed279d306] [formerly 336570a6f023ec3889bbe8c27489ce1f1e14b5f5 [formerly c361ccd531]]
Former-commit-id: 6ae45c7f072308154e9a43cc9868ef69a835f969 [formerly 9be8c87f87]
Former-commit-id: ac077b24a1
|
2014-04-15 09:39:33 -05:00 |
|
Benjamin Phillippe
|
372ecda418
|
Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 575caa6238 [formerly 490413551b] [formerly 3db751fc5b] [formerly 575caa6238 [formerly 490413551b] [formerly 3db751fc5b] [formerly 62062bf288 [formerly 3db751fc5b [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]]]]
Former-commit-id: 62062bf288
Former-commit-id: f731dbc847 [formerly 0b149f92d9] [formerly 9f938a2b9dba7afb0360199c813d48ea9302801b [formerly 035272360b]]
Former-commit-id: 001d47f93bc4e0c26d0f78e7d14ece5b5ef7a34f [formerly f6f51d3575]
Former-commit-id: f026a17b07
|
2014-04-15 09:15:12 -05:00 |
|
brian.dyke
|
16be9500b9
|
Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: 33274850e3 [formerly 5fc07cafc8] [formerly fb1c399d4d] [formerly 33274850e3 [formerly 5fc07cafc8] [formerly fb1c399d4d] [formerly a6708cc174 [formerly fb1c399d4d [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]]]]
Former-commit-id: a6708cc174
Former-commit-id: 627004af0a [formerly e8dffad9cb] [formerly c50a848c670c4b4d84b5ed17c503151cf6c6b7f1 [formerly 5b27f2987f]]
Former-commit-id: 4e673bda45fe4b6268410b72231d4d0d2ad7d4bb [formerly d148fbe645]
Former-commit-id: 6a5c7d7684
|
2014-04-14 15:29:23 -04:00 |
|
Zhidong.Hao
|
0f1a1e52a7
|
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: a153f7218e [formerly f5877f5fb0] [formerly 0b499061da] [formerly a153f7218e [formerly f5877f5fb0] [formerly 0b499061da] [formerly 9c18f60924 [formerly 0b499061da [formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]]]]
Former-commit-id: 9c18f60924
Former-commit-id: a8eaf88994 [formerly 3adcd5bca5] [formerly 0eb35c20c9f879386db51a895123b7b5435e2d64 [formerly 13808687c1]]
Former-commit-id: a1c719e81d4d018bd8ddb252c1e0303980194856 [formerly 7996e95745]
Former-commit-id: 2b0fd93679
|
2014-04-11 15:51:12 -04:00 |
|
Zhidong.Hao
|
ac40440ce5
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 8e54cb2958 [formerly 48ee7712c7] [formerly 009c6e067a] [formerly 8e54cb2958 [formerly 48ee7712c7] [formerly 009c6e067a] [formerly 1a91b820d9 [formerly 009c6e067a [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]]]]
Former-commit-id: 1a91b820d9
Former-commit-id: 531eea30e1 [formerly ab0c9a65d2] [formerly 3276287380788647756570a048989a84fecfcd89 [formerly c6d9a3926e]]
Former-commit-id: 2be119384e43516b510a208409a4f3c49e88e8d7 [formerly a94bf1a110]
Former-commit-id: a846d4c4f5
|
2014-04-11 15:34:06 -04:00 |
|
Brian.Dyke
|
a9395dfffa
|
ASM #465 - Update capture script to prevent hanging when running psql
Change-Id: I74c9fe349509850522a8bee37f34664559435d3c
Former-commit-id: 2cb1541fe9 [formerly af5cbe3321] [formerly 192a5513df] [formerly 2cb1541fe9 [formerly af5cbe3321] [formerly 192a5513df] [formerly deff8ed340 [formerly 192a5513df [formerly 17ab69323dd1b420662db25e09b05e3408d3f2ab]]]]
Former-commit-id: deff8ed340
Former-commit-id: ef617f4b14 [formerly 4efe23ee2c] [formerly 0ef8524bde7ad6668bf5b80a53c989f07ef35dbe [formerly 97687e7217]]
Former-commit-id: 6f9575ccbac358f67a37524ffefb858676644ab7 [formerly 52efde1ca0]
Former-commit-id: 8cc1d09d35
|
2014-04-11 11:18:06 -04:00 |
|
brian.dyke
|
e205810cba
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: c75dba32e9 [formerly 6a9ccba393] [formerly 6575f77fe3] [formerly c75dba32e9 [formerly 6a9ccba393] [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 6575f77fe3 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]]
Former-commit-id: a8d6d58f31
Former-commit-id: 16a261d7f6 [formerly 88ddd667b6] [formerly f4680f6e78d8dd9f6a0ede6791f8e2273054f211 [formerly ad63114f16]]
Former-commit-id: d5b0d90245289f70419c05b7aae730f0ee5d4f80 [formerly 1c4e02168c]
Former-commit-id: f299a28f9b
|
2014-04-11 10:58:48 -04:00 |
|
Brian.Dyke
|
f77319aa5b
|
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: 70e228a893 [formerly afc1da9015] [formerly 460c0f2c903a9254ae079d95afd674824e6d6212 [formerly ff51498036]]
Former-commit-id: 9404d535e7a6fa45f9825f9c281883c24eedc7c4 [formerly f051b95a7a]
Former-commit-id: fbefee3e1d
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
52a54f5e9f
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
|
2014-04-09 16:00:54 -05:00 |
|
Steve Harris
|
5a8fc26d52
|
Merge branch 'master_14.2.2' (14.2.2-3) into omaha_14.2.2
Former-commit-id: 72d410e74a [formerly 842e355cc7] [formerly ae196946b9] [formerly 72d410e74a [formerly 842e355cc7] [formerly ae196946b9] [formerly 2ea3d45ecc [formerly ae196946b9 [formerly 0b9acf9e28c1048bd3b98af7c04e6953c8425e81]]]]
Former-commit-id: 2ea3d45ecc
Former-commit-id: ea6d8ae184 [formerly cf3bc163b6] [formerly 8e513f10ddbee68e5bba5df62ddbfb95a58225de [formerly 2efe4d5c6f]]
Former-commit-id: c5f713e50a2bf54f11ce391145786ae2ac871c0c [formerly d2f3b72736]
Former-commit-id: bab730727e
|
2014-04-09 13:24:52 -05:00 |
|
Brian.Dyke
|
38a8f60a43
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]]
Former-commit-id: 929b736038
Former-commit-id: a6ebdbfc3a [formerly d76d3a26cb] [formerly ef99224ab38fbdf6c62ed3f358f4c50051cbc248 [formerly 5163a31a66]]
Former-commit-id: 281a7b2833a1dc51969eab1f2b614dfd6fa8f7eb [formerly 462952ce65]
Former-commit-id: 8ef50f023b
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
44ef143788
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 518167e0bb [formerly 529059851a] [formerly 20fef0f15b] [formerly 518167e0bb [formerly 529059851a] [formerly 20fef0f15b] [formerly 79c7ec7ae9 [formerly 20fef0f15b [formerly 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35]]]]
Former-commit-id: 79c7ec7ae9
Former-commit-id: 824e1f6d14 [formerly 20c27a479d] [formerly 05c5a8903cdbc8d381e7bf1456acac3943c3855e [formerly 538b02e42b]]
Former-commit-id: 969a16a0dd7b9f15428b7ccd55f960f38e507c9a [formerly c58835a7e3]
Former-commit-id: c99b4f3027
|
2014-04-08 13:05:12 -04:00 |
|
Ben Steffensmeier
|
bcfffbe1ed
|
Issue #2973 Use correct area for expanding subgrid requests.
Former-commit-id: 4e60abfd33 [formerly 5b3a8dccbf] [formerly 90f1750691] [formerly 4e60abfd33 [formerly 5b3a8dccbf] [formerly 90f1750691] [formerly 000f259cf4 [formerly 90f1750691 [formerly 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b]]]]
Former-commit-id: 000f259cf4
Former-commit-id: ffa4a7a73e [formerly d52be1875d] [formerly f24e95d25af89a1897da1baf888c6a2256e1ca6b [formerly 7b2f82ff30]]
Former-commit-id: 27cb98a4deac572f1aa264ac9da1057a2f3fc43d [formerly 7bd153a696]
Former-commit-id: 5306c9969d
|
2014-04-04 13:17:36 -05:00 |
|
Brian.Dyke
|
ae3f5dbff6
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
|
2014-04-04 12:57:32 -04:00 |
|
steve.naples
|
ec7e7b856e
|
ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5
Former-commit-id: 5d7cf6c098 [formerly 75be620d0d] [formerly f6636a3dd7] [formerly 5d7cf6c098 [formerly 75be620d0d] [formerly f6636a3dd7] [formerly 7624f7ab75 [formerly f6636a3dd7 [formerly 1c71a34944c7d823742b98dc65e19fe1f478eef0]]]]
Former-commit-id: 7624f7ab75
Former-commit-id: 86c06b5632 [formerly cfa9c6f01c] [formerly 1cf8539d045c95be911973c6773035bb176dd49d [formerly 050238ee44]]
Former-commit-id: da98d1d22c51d71497b6b15f804653483de7aa7c [formerly 571efe3596]
Former-commit-id: 32e931cead
|
2014-04-04 15:30:18 +00:00 |
|
Steve Harris
|
451d155050
|
Merge branch 'master_14.2.2' (14.2.2-1,2) into omaha_14.2.2
Former-commit-id: 7275a6c1b5 [formerly 4e65ecbf48] [formerly 15bc450e94] [formerly 7275a6c1b5 [formerly 4e65ecbf48] [formerly 15bc450e94] [formerly 58b8f72755 [formerly 15bc450e94 [formerly dd2ee3c6bb1fa1e3f1cde475da50d5e545446ed8]]]]
Former-commit-id: 58b8f72755
Former-commit-id: 6a09dbf5de [formerly 0bb0d02522] [formerly 744d22bfe1d40e3fa2a478a38c6b264d6f0bce72 [formerly 01bdd24b6c]]
Former-commit-id: 4e948d7ff71165e542fe3f61aab22c3b734d38fa [formerly ab51128b44]
Former-commit-id: fecb1acc59
|
2014-04-03 13:08:28 -05:00 |
|
Steve Harris
|
21c17565c5
|
Merge branch 'master_14.2.1' (14.2.1-16) into omaha_14.2.1
Former-commit-id: 8715e0edc8 [formerly 4b96900460] [formerly acd5392e9a] [formerly 8715e0edc8 [formerly 4b96900460] [formerly acd5392e9a] [formerly cb2d69e338 [formerly acd5392e9a [formerly ce1a2d441c1c882209f56fcb82f79edad51ff114]]]]
Former-commit-id: cb2d69e338
Former-commit-id: 7caec074e5 [formerly 4e8a672c77] [formerly a365a1ace05ee0f5e530a8ec7eccdc5590cc1eca [formerly 09285db2d4]]
Former-commit-id: 30c6e6efd1c48e31e4fabec4fcc5d4e9c7d8a7f3 [formerly 9bece467e0]
Former-commit-id: f1c20fbc92
|
2014-04-03 13:00:11 -05:00 |
|
Ron Anderson
|
f60398861b
|
Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly d556055299 [formerly 11fbd86558 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]]
Former-commit-id: d556055299
Former-commit-id: 5001c1f2be [formerly 3ac3d5de1b] [formerly dec5605ca65dcc7794d7aa2a917294e93e71160b [formerly ac7c5460f6]]
Former-commit-id: 1dcb3833d22665a093272a2766e36a92adf65c41 [formerly 4e88052beb]
Former-commit-id: 0033d7d3ef
|
2014-04-02 09:07:22 -05:00 |
|
Greg Armendariz
|
91ae9fc8aa
|
Merge "Issue #2949 Updated scripts Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80" into omaha_14.2.1
Former-commit-id: 7f46616b73 [formerly 50fb1ec68a] [formerly 6b339bcb86] [formerly 7f46616b73 [formerly 50fb1ec68a] [formerly 6b339bcb86] [formerly 0d0d7bd513 [formerly 6b339bcb86 [formerly 8d8277705568c04ac37bbe8f09bf7f38f2f0521f]]]]
Former-commit-id: 0d0d7bd513
Former-commit-id: 65caa7fbec [formerly 380542d2eb] [formerly 5d2be330fd164266561e4522dd2b953d25b27839 [formerly cef70f2168]]
Former-commit-id: 4eb9ce3a50b60c8a0709fa26b13bff614f50114d [formerly 1ae96a358d]
Former-commit-id: cd8507faf2
|
2014-04-01 19:33:30 -05:00 |
|
Richard Peter
|
0f5b3cac88
|
Issue #2509: Fix stitched grid notifications
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: 9536a08425 [formerly bfba75f73f] [formerly 53d5000261] [formerly 9536a08425 [formerly bfba75f73f] [formerly 53d5000261] [formerly f99875040c [formerly 53d5000261 [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]]]]
Former-commit-id: f99875040c
Former-commit-id: e5d60b407e [formerly b32eff04be] [formerly 3bea8ffc56d67fe6dc2c1ddee99339d81e83daf9 [formerly 9ac8af6ccd]]
Former-commit-id: 9575cdb8abaeca9e6ef7c1d01a633480180e775b [formerly 154034d653]
Former-commit-id: 034e62d64e
|
2014-04-01 14:44:05 -05:00 |
|
Brian.Dyke
|
a30b45174a
|
Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
Former-commit-id: 411457248b [formerly 3186434368] [formerly 6e515eb334] [formerly 411457248b [formerly 3186434368] [formerly 6e515eb334] [formerly 1f5c6139e3 [formerly 6e515eb334 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]]]]
Former-commit-id: 1f5c6139e3
Former-commit-id: f5ed39a8d9 [formerly d163d9d190] [formerly d9da3cc373b8f207d487dbe28227905b8a81846e [formerly c013460db1]]
Former-commit-id: 57e818053f3d573b96db0f187009034ddd6fab8c [formerly 5345add58d]
Former-commit-id: c2a3ec6f04
|
2014-04-01 14:29:33 -04:00 |
|
Dave Hladky
|
a2dfde5712
|
Issue #2949 Updated scripts
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80
Former-commit-id: daa2f2ba43 [formerly 41e43a169b] [formerly 3d6ebf498e] [formerly daa2f2ba43 [formerly 41e43a169b] [formerly 3d6ebf498e] [formerly ede510dd91 [formerly 3d6ebf498e [formerly afcfc72329522c2d731a4afe9353632effb9cb23]]]]
Former-commit-id: ede510dd91
Former-commit-id: 0b5059d6aa [formerly b202d62214] [formerly ef0f92e418f1be10b9211b5d53757234b102506e [formerly be18d1f63c]]
Former-commit-id: 0001a7448852b3c1979c9e8030be312102e13bfb [formerly a3ac9604e6]
Former-commit-id: 24724a8819
|
2014-04-01 12:33:48 -05:00 |
|
David Gillingham
|
be6e42d91b
|
Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: d14aee89aa [formerly 402adfeddb] [formerly a529bc8cad] [formerly d14aee89aa [formerly 402adfeddb] [formerly a529bc8cad] [formerly 70b28b4e1e [formerly a529bc8cad [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]]]]
Former-commit-id: 70b28b4e1e
Former-commit-id: 13017ce731 [formerly 64981356c8] [formerly a8749ff88e3ad01c4b1fec62d193a19acac4a3ef [formerly 22266d36b9]]
Former-commit-id: b2a35016bf9e27eefdf55483242773ab74367055 [formerly 3ad0872bda]
Former-commit-id: 14f927fe54
|
2014-03-31 15:49:33 -05:00 |
|
David Friedman
|
8ea6e0b064
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1e4ac84f99 [formerly 1168a3eae5] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]]
Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3]
Former-commit-id: 8f8f55dd3c
|
2014-03-27 19:17:03 +00:00 |
|
Brian.Dyke
|
dedbdef64c
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 7ca114f7f1 [formerly a1b980a15d] [formerly 6346c9776b] [formerly 7ca114f7f1 [formerly a1b980a15d] [formerly 6346c9776b] [formerly 3b639347f8 [formerly 6346c9776b [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]]
Former-commit-id: 3b639347f8
Former-commit-id: bded86a35f [formerly 519ec3071a] [formerly 38694ae3f3f4b7b74544ffa190d887b7c937b26b [formerly 76625c2238]]
Former-commit-id: b11ad5967e376b34076f85e49fab9f19d3ad22e5 [formerly 9fa73765f9]
Former-commit-id: 102414db3a
|
2014-03-27 10:22:26 -04:00 |
|
Steve Harris
|
1b2aaf6387
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: ef7ebd22b4 [formerly d940427408] [formerly 53f91fdeea] [formerly ef7ebd22b4 [formerly d940427408] [formerly 53f91fdeea] [formerly e5910b6c60 [formerly 53f91fdeea [formerly b0b18895aa445ee9b29674443529558b2141c042]]]]
Former-commit-id: e5910b6c60
Former-commit-id: 46efda0c29 [formerly 9d4f24da7b] [formerly 81756753feb5c4701663ee447ac1a92dcfa9676d [formerly 1b9ebbddcc]]
Former-commit-id: 5fea27f243c9eecb35421417c3ad89c087bf92ae [formerly 7a7a9cc18e]
Former-commit-id: 76def67552
|
2014-03-26 16:13:59 -05:00 |
|
Steve Harris
|
9659705737
|
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: e621e81f20 [formerly 9cf3600ff6] [formerly 4879520391] [formerly e621e81f20 [formerly 9cf3600ff6] [formerly 4879520391] [formerly a7efde7cf4 [formerly 4879520391 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 3b8569a1ac [formerly 311c8d67af] [formerly 9e1c5536bf5208e6e617f1b651bab6961954548a [formerly 55440888fd]]
Former-commit-id: 3aca6b03a25eacf45ba5d9bfa520a245475f2946 [formerly af32adebc5]
Former-commit-id: ef058152a0
|
2014-03-26 15:51:32 -05:00 |
|
Brian.Dyke
|
dc35ed8fe1
|
Fixed comment merge conflicts added .gitignore
Former-commit-id: 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 6476c4fb85 [formerly 412a7eb2c2] [formerly 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f [formerly d8256c4226]]
Former-commit-id: 8a69e5f0509d10278a9c81d31ec5d2e0a9d1f376 [formerly c19fc33493]
Former-commit-id: e7aea77979
|
2014-03-25 15:41:58 -04:00 |
|
Brian.Dyke
|
fbba012c20
|
OB_14.1.1-25 baseline
Former-commit-id: c66bac30c7 [formerly c085bc6879] [formerly c67833407c] [formerly c66bac30c7 [formerly c085bc6879] [formerly c67833407c] [formerly 074abeb0fa [formerly c67833407c [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]]
Former-commit-id: 074abeb0fa
Former-commit-id: 5b848e5480 [formerly 95ada25b65] [formerly ec4f283a91b4ae374dc7edc0c06351378f44b61f [formerly 36fdf6bfe4]]
Former-commit-id: 01adcc7557cfbd24c6477e8cc858ba353ef8328c [formerly 05ab17425c]
Former-commit-id: 2ba9b8825b
|
2014-03-25 13:55:54 -04:00 |
|
Richard Peter
|
989ac3147f
|
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
Former-commit-id: d4c67a0f8c [formerly 6236137635] [formerly 390e73af44] [formerly d4c67a0f8c [formerly 6236137635] [formerly 390e73af44] [formerly 897980da08 [formerly 390e73af44 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]]]
Former-commit-id: 897980da08
Former-commit-id: 5dd2d089bb [formerly a910870531] [formerly d757b784318130cb248a48533db6e16ad9554e32 [formerly 780b504251]]
Former-commit-id: 1d59c583c016450694956f5445ba6500a32927d7 [formerly 9060aab6dd]
Former-commit-id: 631aa74a10
|
2014-03-24 09:53:13 -05:00 |
|
Dave Hladky
|
a6d07e82a6
|
Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 3ac04dd071 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: c978694653 [formerly e464a1d8f8] [formerly 52a66b8f177ba3fcebbd8fee9b4e8b300ae9ba10 [formerly 43cbcff538]]
Former-commit-id: a34ec85b7be5311fc6e20f3d93ca82b2276e2023 [formerly 3d61ca32f6]
Former-commit-id: a37f87968c
|
2014-03-24 08:27:12 -05:00 |
|
Mike Duff
|
b1e31e388d
|
Issue #2941 - Sort data before returning
Former-commit-id: d7d06e18fd [formerly ff07b90659] [formerly 73a011b940] [formerly d7d06e18fd [formerly ff07b90659] [formerly 73a011b940] [formerly 4db73e42a5 [formerly 73a011b940 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]]]
Former-commit-id: 4db73e42a5
Former-commit-id: b26be09c49 [formerly 8d1347d1f7] [formerly c59574ba2d086ee6c90dd15718f0f7b5869fb8e2 [formerly 43eccead7c]]
Former-commit-id: cb740913b5439b8346144311c9578671ffd048c4 [formerly 8f00b37688]
Former-commit-id: 05fbcc61ca
|
2014-03-24 08:19:21 -05:00 |
|
Brian.Dyke
|
91da395a71
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 06ee9a6384 [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: 402035e7f9 [formerly d97b88f433] [formerly 1a63c19999c01830d72a5d605c2cc1247fc3b4eb [formerly 14567f20a7]]
Former-commit-id: 2c253da743c15a00910b72d8aac49c5cbb6f5609 [formerly f540c6fb2d]
Former-commit-id: aea0544eec
|
2014-03-24 07:01:29 -04:00 |
|
Brian.Dyke
|
1f96787564
|
OB_14.1.1-24 baseline
Former-commit-id: 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly face1ebeeb [formerly 37b6368268 [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]]
Former-commit-id: face1ebeeb
Former-commit-id: 49f7c81de1 [formerly cfa058a345] [formerly 96a438276ab6f5a4af7ac304e214e79258c0ea3d [formerly 6b2175da93]]
Former-commit-id: bd70e5cfe36861d8349138232ac519963886caa3 [formerly 2fda566cfb]
Former-commit-id: 7aeb9af309
|
2014-03-21 12:43:50 -04:00 |
|
Ben Steffensmeier
|
05a5ec1cb9
|
Issue #2932 improve compatibility of pop skewT and blended resources.
Former-commit-id: 12d5339c48 [formerly 14907292da] [formerly 933b172ca0] [formerly 12d5339c48 [formerly 14907292da] [formerly 933b172ca0] [formerly effb0bfcd8 [formerly 933b172ca0 [formerly 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737]]]]
Former-commit-id: effb0bfcd8
Former-commit-id: 4d284e5780 [formerly 99d9ba9645] [formerly 181bf9e15da48dfb7597e793bcef70990b517993 [formerly ee3cb7e69a]]
Former-commit-id: dabcb37bdf912273c1bd4907d33758ae655f4417 [formerly b8d6663e15]
Former-commit-id: ebd80c4d49
|
2014-03-20 13:18:40 -05:00 |
|
Nate Jensen
|
8ad61a23c0
|
Issue #2919 fix windows error due to gempak library missing
Former-commit-id: a3220cf170 [formerly 6edec10edc] [formerly 747ac58166] [formerly a3220cf170 [formerly 6edec10edc] [formerly 747ac58166] [formerly 82ee3e7104 [formerly 747ac58166 [formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]]]]
Former-commit-id: 82ee3e7104
Former-commit-id: 0dd42bbdc2 [formerly 07d2a4f40c] [formerly 8865ef5c8523a5ad4eab9d7ab74db2f4ee390b98 [formerly 24eadadffd]]
Former-commit-id: 7ebb0aa7faa5174e83081cdcc16795ddf83ed95e [formerly 557c180e6d]
Former-commit-id: 8ac503de37
|
2014-03-20 09:38:07 -05:00 |
|
steve.naples
|
3c82d305bb
|
ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204
Former-commit-id: 20399400cb [formerly 64b19f2e41] [formerly d0f4df4ad9] [formerly 20399400cb [formerly 64b19f2e41] [formerly d0f4df4ad9] [formerly 1aa970164f [formerly d0f4df4ad9 [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]]]]
Former-commit-id: 1aa970164f
Former-commit-id: 8d9a51770d [formerly 885ceb834b] [formerly 5c8cd26c00210e720cf38e0d3c939e91ef07f9f2 [formerly 9c9ddaba6a]]
Former-commit-id: 1011ac2cb09f5dc6ca3423e02ff585fc80846ef1 [formerly 47e1a3627f]
Former-commit-id: f0b105bbdf
|
2014-03-19 18:16:41 +00:00 |
|
Juliya Dynina
|
c588ad7d30
|
Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2
Former-commit-id: a7d0d73bfb [formerly 34b6972f79] [formerly 9aa170ca5f] [formerly a7d0d73bfb [formerly 34b6972f79] [formerly 9aa170ca5f] [formerly 7a14dfb5a9 [formerly 9aa170ca5f [formerly 8f842b0defba552ebbbe980b42dfb7618a2a7ccd]]]]
Former-commit-id: 7a14dfb5a9
Former-commit-id: 32997f7a35 [formerly f4c1f51b2c] [formerly e26d0c0ec46bd618d59506f7d808f031aee442d2 [formerly e939d718e5]]
Former-commit-id: 59261315661eb88d9a2275bdd814fbcfd26eb8ba [formerly b5c93d06e6]
Former-commit-id: 668c24997d
|
2014-03-18 13:52:48 -05:00 |
|
steve.naples
|
891325ca18
|
ASM #338 Updated HRAPCoordinates to not parse whitespace
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6
Former-commit-id: e9e171be78 [formerly 46675eec43] [formerly 309ff4e7f7] [formerly e9e171be78 [formerly 46675eec43] [formerly 309ff4e7f7] [formerly 75e8a907fe [formerly 309ff4e7f7 [formerly 220ef7b1195366834c9f85b828862f128dd3fea1]]]]
Former-commit-id: 75e8a907fe
Former-commit-id: 2e7668a201 [formerly 2ff30dac48] [formerly ca9ed947fcb58c1cba6a54ae689f4ca7ac1fadc6 [formerly 54cc3397ee]]
Former-commit-id: dc2cff8e9f7209d5a18c8a575b066886ec16ee3a [formerly 72d6b1f1a5]
Former-commit-id: 2d22f976f4
|
2014-03-18 15:40:13 +00:00 |
|
Juliya Dynina
|
09610757c8
|
Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2
Former-commit-id: 83e355b778 [formerly 30545f79c5] [formerly 85fd3b3888] [formerly 83e355b778 [formerly 30545f79c5] [formerly 85fd3b3888] [formerly ef873880b6 [formerly 85fd3b3888 [formerly 0d338537015e8e8a98fa67bc658fa3a4ed0f15f0]]]]
Former-commit-id: ef873880b6
Former-commit-id: 1973f957f9 [formerly bd6ae766c2] [formerly 1a8bc7b0588d89b907431859c6cd96619f6b85f4 [formerly 67f8f79e9f]]
Former-commit-id: 74172528c406eb260ab44cda0a1ae2efcea9022d [formerly cc3e0b3360]
Former-commit-id: 5505320aa3
|
2014-03-18 08:47:22 -05:00 |
|
Juliya Dynina
|
9296d1aba2
|
Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
Former-commit-id: 0691c153f7 [formerly d6e2b7f741] [formerly c735051e00] [formerly 0691c153f7 [formerly d6e2b7f741] [formerly c735051e00] [formerly 867f00b438 [formerly c735051e00 [formerly 669d66d3b8279833df4a361c961c113e653a542d]]]]
Former-commit-id: 867f00b438
Former-commit-id: 5f3c6c617e [formerly ed07060240] [formerly f3ff22bda2c35c61c7a757023a9acddcadcbc749 [formerly c54631024a]]
Former-commit-id: b7d2487394f68eb266f5d106c9eb4af2160dd92b [formerly d34b5c1a2c]
Former-commit-id: de68dcfeb4
|
2014-03-18 08:13:51 -05:00 |
|
David Friedman
|
5aafddf3de
|
ASM #330 - Fix reloading of TextDB static files
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5
Former-commit-id: 4492bf353d [formerly fd203b5999] [formerly 15ca9f4dcc] [formerly 4492bf353d [formerly fd203b5999] [formerly 15ca9f4dcc] [formerly decdadce01 [formerly 15ca9f4dcc [formerly 0a94094f0f140de68da634cbc6c79039507712ca]]]]
Former-commit-id: decdadce01
Former-commit-id: 07828421c2 [formerly f19895db07] [formerly 47dd084f53fe1100ab28828ac109cf98015fb0a1 [formerly 9beaf9be16]]
Former-commit-id: 2822ae604c3dfc8fafbbe0b95b440c6bcfa04a19 [formerly 5fe3990a9e]
Former-commit-id: cf85796def
|
2014-03-18 13:12:40 +00:00 |
|
Qinglu.Lin
|
b0cf607329
|
ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: a62e75e8b5 [formerly 09e90dfe43] [formerly 4b3c821ce0] [formerly a62e75e8b5 [formerly 09e90dfe43] [formerly 4b3c821ce0] [formerly af82143e84 [formerly 4b3c821ce0 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]]
Former-commit-id: af82143e84
Former-commit-id: 2b4ab71782 [formerly 1b352b8600] [formerly a5da7a6ab2edf30dc691e926f832381fb33cc183 [formerly bd7d68bd16]]
Former-commit-id: 8b795eb68de0b31c9a7c09c0052c419f92830442 [formerly 72b8b32e25]
Former-commit-id: 119fc9840e
|
2014-03-17 18:17:49 -04:00 |
|
Steve Harris
|
157a9ed352
|
Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 2db52dab8e [formerly 951c9b0d31] [formerly d087c8c31e] [formerly 2db52dab8e [formerly 951c9b0d31] [formerly d087c8c31e] [formerly 24fe6a248f [formerly d087c8c31e [formerly 543090e28936ce680e21cda802cfac73ff31ca58]]]]
Former-commit-id: 24fe6a248f
Former-commit-id: 78afbbe325 [formerly 5abea804af] [formerly a54cf16be99c26422929ca49bb4ae500bc503e48 [formerly f878fe8729]]
Former-commit-id: cfa704622f94511321108ca762111c90fac4bd03 [formerly 6cc8f3a295]
Former-commit-id: a612c4e6dd
|
2014-03-17 15:53:31 -05:00 |
|
Matthew Howard
|
27ad8c1d9b
|
Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2
Former-commit-id: b1bf3db462 [formerly 30e8d76f50] [formerly c1433db0fb] [formerly b1bf3db462 [formerly 30e8d76f50] [formerly c1433db0fb] [formerly 1d15cda9fd [formerly c1433db0fb [formerly 1b46d5c169709a9498a5eb9963286a6223089af4]]]]
Former-commit-id: 1d15cda9fd
Former-commit-id: 164c6d6003 [formerly 4ec6bd0a21] [formerly 7661cebb31c2c2ec1e71eb1058895b1e4789c68a [formerly 6b5bbb1270]]
Former-commit-id: 53e500b60439c5656d25403605e2d9776bfbd27a [formerly 930eb52d95]
Former-commit-id: ab71d9e4d4
|
2014-03-14 19:47:32 -05:00 |
|
Rici.Yu
|
cd49835497
|
ASM #84 - fix default time range for smart tools
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99
Former-commit-id: 777bd46d68 [formerly c559ade333] [formerly 74b1c827ee] [formerly 777bd46d68 [formerly c559ade333] [formerly 74b1c827ee] [formerly 58f9857344 [formerly 74b1c827ee [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]]]]
Former-commit-id: 58f9857344
Former-commit-id: a3e865e011 [formerly e877c81c88] [formerly 8ff482b2584775bc71dc4df96949f7260608e124 [formerly 0ee8baf0c3]]
Former-commit-id: 679e5fa6043cfd72296cbdd819ff457a1c6da449 [formerly 1684740d02]
Former-commit-id: f32491f913
|
2014-03-14 14:39:56 -04:00 |
|