Steve Harris
|
984b7b1df4
|
Merge branch 'master_14.1.3' into master_14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 4882158177 [formerly 483a69c58d] [formerly 4882158177 [formerly 483a69c58d] [formerly fcecd75dfd [formerly f947df2bf87c0df3e461be5c6dd72e13a0743f61]]]
Former-commit-id: fcecd75dfd
Former-commit-id: c59b92895c [formerly 29c2cc0c29]
Former-commit-id: 998c9a4084
|
2014-07-01 18:05:43 -05:00 |
|
Ron Anderson
|
ac6b3b0b10
|
Omaha #3296 A few more minor performance tweaks and some addtional logging.
Change-Id: Iab603f6f7420a11c5c5cae82df7ebb96f66b0945
(cherry picked from commit 9e6a14877578177e4cfb0c5698097750bde6f280)
Former-commit-id: c7a74ab5b1 [formerly 2c5f910f90] [formerly c7a74ab5b1 [formerly 2c5f910f90] [formerly 4123073c4e [formerly a0384ccfb30a877f14893c6cfa62d92117c0bb87]]]
Former-commit-id: 4123073c4e
Former-commit-id: 0329b4d8f4 [formerly 892eb70952]
Former-commit-id: bb91362572
|
2014-07-01 13:56:41 -04:00 |
|
Ron Anderson
|
2b33bfac7d
|
Omaha #3296 Added performance logging. Moved backup and purging to separate java thread. Cached PythonScript.
Change-Id: I9814345b512674269f17f4bf61bd615f0a50b059
(cherry picked from commit a11bcadd76eb9f9597e23ee609fd9cb364ad26ac)
Former-commit-id: 9818d9b485 [formerly beee08c32b] [formerly 9818d9b485 [formerly beee08c32b] [formerly 487c7ee30a [formerly 49638ba1e9561dea7b318b7adc0f1ab9571170f5]]]
Former-commit-id: 487c7ee30a
Former-commit-id: 699f2aa9bf [formerly c16fc8ee7f]
Former-commit-id: 8314f40ec3
|
2014-07-01 13:56:05 -04:00 |
|
Steve Harris
|
2841134c60
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 3f2058a1ab [formerly 89606076ec] [formerly 3f2058a1ab [formerly 89606076ec] [formerly ddc6f2092a [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]
Former-commit-id: ddc6f2092a
Former-commit-id: 304d918a7c [formerly 1f033d22e6]
Former-commit-id: 323c240f59
|
2014-06-24 10:57:56 -05:00 |
|
Nate Jensen
|
e62629413d
|
Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor
Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit e8d704968a2a87105489ad9cb51cd8aea78401aa [formerly 65eb76ff66] [formerly 4558fe5862 [formerly 845483346f] [formerly 4558fe5862 [formerly 845483346f] [formerly 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]])
Former-commit-id: 333f8317bb [formerly ca27873204] [formerly 333f8317bb [formerly ca27873204] [formerly 65619399a0 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]]
Former-commit-id: 65619399a0
Former-commit-id: 3add021413 [formerly f9fce25836]
Former-commit-id: e717dbfeb1
|
2014-06-23 11:59:26 -05:00 |
|
Nate Jensen
|
b1ab93a361
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: c7c0d9cb4b [formerly 51da67dd3f] [formerly c7c0d9cb4b [formerly 51da67dd3f] [formerly 97ef9fc343 [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]]
Former-commit-id: 97ef9fc343
Former-commit-id: 416e6fc85d [formerly a3c20eb98a]
Former-commit-id: 9a3a4d5bfd
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
196f53e609
|
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: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 419c5f4aba
Former-commit-id: af06c5a890 [formerly 66d30e59a3]
Former-commit-id: 935542914d
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
b602d29456
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: be589ceb9b [formerly 399c06820a] [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: e28febcf27 [formerly 9031f58d02]
Former-commit-id: 3e10995d87
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
03f8202ff2
|
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: 06c565d74f [formerly 30d8644fa5] [formerly 06c565d74f [formerly 30d8644fa5] [formerly 482f915b42 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]]
Former-commit-id: 482f915b42
Former-commit-id: c1bd7a0c55 [formerly 072a4a9d63]
Former-commit-id: ce9ebc90f5
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
3da13f3d12
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 5064d24e26 [formerly 346bf852cd] [formerly 5064d24e26 [formerly 346bf852cd] [formerly 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]
Former-commit-id: 81832d97e5
Former-commit-id: 764b729546 [formerly 4bca0769fb]
Former-commit-id: 766974a05d
|
2014-06-13 13:21:19 -04:00 |
|
Steve Harris
|
435da06069
|
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: 3a3277c469 [formerly ad6e9fa5ee] [formerly 3a3277c469 [formerly ad6e9fa5ee] [formerly 9510608b74 [formerly cf56d49dc5a197fa114fa6c468860d63621a9cdc]]]
Former-commit-id: 9510608b74
Former-commit-id: f78bc57920 [formerly 23dea36a2c]
Former-commit-id: 5a86a00518
|
2014-06-11 12:55:44 -05:00 |
|
David Friedman
|
3b686ca052
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: 6d0d3f5ba5 [formerly b8542c1332] [formerly 6d0d3f5ba5 [formerly b8542c1332] [formerly 1c84c31e30 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]]
Former-commit-id: 1c84c31e30
Former-commit-id: 0ba91c6c28 [formerly 8c8f54994b]
Former-commit-id: d50646b479
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
1ae1410e46
|
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: 0f07e14bf1 [formerly f72380ad60] [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 816dcf74e4 [formerly 49cd9574d9]
Former-commit-id: a4b39dfca5
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
a39afc1dfa
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: ef5c74dece [formerly c1b3f9d180] [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]
Former-commit-id: 8874d41872
Former-commit-id: 4f0fc67b1f [formerly f568b5606a]
Former-commit-id: 81d732477e
|
2014-06-10 12:52:59 -04:00 |
|
Steve Harris
|
67b4501d9b
|
Merge branch 'master_14.2.2' (14.2.2-12) into omaha_14.2.2
Former-commit-id: 6e09bce335 [formerly 14370245fd] [formerly 6e09bce335 [formerly 14370245fd] [formerly bd98f04cde [formerly 65793ec4d12626b2d3365c5a0e8c3e229972b289]]]
Former-commit-id: bd98f04cde
Former-commit-id: 2445542f10 [formerly c11a44259e]
Former-commit-id: 2569e13053
|
2014-06-09 15:20:03 -05:00 |
|
Mike Duff
|
bb122607cc
|
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: b876d9755a [formerly 81ab64d7ff] [formerly b876d9755a [formerly 81ab64d7ff] [formerly 39173c380c [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]]
Former-commit-id: 39173c380c
Former-commit-id: 60fe02137f [formerly b880d171d4]
Former-commit-id: 4b9f707a06
|
2014-06-06 16:03:14 -04:00 |
|
Xuezhi.Wei
|
6911a1f357
|
ASM #579 - shef-ingest.xml updates for performance tracking
Change-Id: If3b24f8385e955d003d79e22605d4536321c73b2
Former-commit-id: 81ec03e291 [formerly bdbeec662c] [formerly 81ec03e291 [formerly bdbeec662c] [formerly 33b235a0a4 [formerly f7b5f3bbc71cc251e19f1764ee7756050895b7a3]]]
Former-commit-id: 33b235a0a4
Former-commit-id: e2f7548351 [formerly 445d58699a]
Former-commit-id: ae0a348358
|
2014-06-06 17:40:09 +00:00 |
|
Juliya Dynina
|
c5d4d8308e
|
Merge "ASM #114 - Problem with Distance Speed Tool." into asm_14.2.2
Former-commit-id: 21cd415434 [formerly 80a83bd44c] [formerly 21cd415434 [formerly 80a83bd44c] [formerly 87216a87de [formerly 1e1c7cbcee94e782338d440d585a3217ad606725]]]
Former-commit-id: 87216a87de
Former-commit-id: 8d89e35985 [formerly b6a4959e21]
Former-commit-id: 93c2e97e2e
|
2014-06-06 09:50:36 -05:00 |
|
Sean Webb
|
45d5701876
|
Merge "ASM #611 fix to MHS issues in DR_17297" into asm_14.2.2
Former-commit-id: e0f9eabb45 [formerly 016648ffaf] [formerly e0f9eabb45 [formerly 016648ffaf] [formerly cb43d21243 [formerly 5556e19903965bea22ca2f11b51fcc1c95cb07f8]]]
Former-commit-id: cb43d21243
Former-commit-id: b35f945bec [formerly c52983ab68]
Former-commit-id: 4e6fa39e5e
|
2014-06-05 15:03:11 -05:00 |
|
Fay.Liang
|
1ddb7a2b0b
|
ASM #611 fix to MHS issues in DR_17297
Change-Id: Ie32edc0bac5458e3d356a0b6b3deea0f8d520cb7
Former-commit-id: fa2cdbfac1 [formerly d1aa160aa7] [formerly fa2cdbfac1 [formerly d1aa160aa7] [formerly c5e6daa943 [formerly fc06896ae4d9adf0973522313f5e65df6ac67fa4]]]
Former-commit-id: c5e6daa943
Former-commit-id: 40eeef7fd1 [formerly 39efc11cb3]
Former-commit-id: ce1e19955e
|
2014-06-05 15:49:27 -04:00 |
|
Mike Duff
|
c2751cf532
|
Issue #3222 - Fix for SHEF posting times
Former-commit-id: 28a42f3f10 [formerly 8a5acd085d] [formerly 28a42f3f10 [formerly 8a5acd085d] [formerly f5f101d416 [formerly 3f1f9cf4fa6207edae642db5cffdc8284091f31a]]]
Former-commit-id: f5f101d416
Former-commit-id: 8e6a50e2ee [formerly 87d41ff302]
Former-commit-id: a615c41a57
|
2014-06-05 09:35:07 -05:00 |
|
Michael Gamazaychikov
|
94595e6af4
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: e5a9fa0827 [formerly c07bcacbf8] [formerly e5a9fa0827 [formerly c07bcacbf8] [formerly 50ab77046b [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]
Former-commit-id: 50ab77046b
Former-commit-id: a2423cfadc [formerly 5efb82ea3e]
Former-commit-id: 29e197404f
|
2014-06-05 13:43:04 +01:00 |
|
Zhidong.Hao
|
33086a8085
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: ccbda4db4f [formerly 26c6801620] [formerly ccbda4db4f [formerly 26c6801620] [formerly 71ab6b9ed0 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: 9094e822e0 [formerly e5c47a51eb]
Former-commit-id: 3a9abec04b
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
a5b2f384bf
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 2f53c2e385 [formerly 7dde6e1d04] [formerly 2f53c2e385 [formerly 7dde6e1d04] [formerly ee7c67f7b0 [formerly d7b707236a1ee3bca45dee26c10814d9e3c275c8]]]
Former-commit-id: ee7c67f7b0
Former-commit-id: 8b93c973d6 [formerly cf49a7217f]
Former-commit-id: 05f691d0cd
|
2014-05-30 10:07:12 -04:00 |
|
Matthew Howard
|
db35baefc8
|
Merge "ASM #209 - Fix Svcbu cleanup script" into asm_14.2.2
Former-commit-id: 099185c960 [formerly 781d0331ab] [formerly 099185c960 [formerly 781d0331ab] [formerly 8375a2af3e [formerly def2351f527613dd62a081161e5f3a87756493ec]]]
Former-commit-id: 8375a2af3e
Former-commit-id: 11216ced25 [formerly f68748bd63]
Former-commit-id: 04c0631701
|
2014-05-29 15:54:37 -05:00 |
|
Shawn.Hooper
|
a4de244bdb
|
ASM #209 - Fix Svcbu cleanup script
Change-Id: I4da44d4c410c03769e556dc6abca62db52880997
Former-commit-id: 08ad9a66cc [formerly fe567b2a5b] [formerly 08ad9a66cc [formerly fe567b2a5b] [formerly 5cf0579d20 [formerly 626ee991cd7e9dbfe52342abd9e3fd41b973f72a]]]
Former-commit-id: 5cf0579d20
Former-commit-id: 0fe034cc8b [formerly 2c476e2bb4]
Former-commit-id: 3cb14aecd9
|
2014-05-29 16:56:46 -04:00 |
|
Steve Harris
|
0571a7877b
|
Merge branch 'master_14.2.2' (14.2.2-9,10,11) into omaha_14.2.2
Former-commit-id: 53645445fe [formerly c7ef7878f5] [formerly 53645445fe [formerly c7ef7878f5] [formerly 9313e045bf [formerly 03b376033b3374694bc8a6e0a2c55b830db058e1]]]
Former-commit-id: 9313e045bf
Former-commit-id: 947d44c945 [formerly e92b927c5a]
Former-commit-id: ba06fa79f9
|
2014-05-29 07:45:24 -05:00 |
|
Brian.Dyke
|
1bae94a61a
|
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: 47a37b112a [formerly b7ef9420e1] [formerly 47a37b112a [formerly b7ef9420e1] [formerly 574246b6d4 [formerly f2763f73cf3e5f2d9e66efa6e481dbf66f16e7da]]]
Former-commit-id: 574246b6d4
Former-commit-id: 45d59380ea [formerly 2c1fabb0f8]
Former-commit-id: 551def9f1a
|
2014-05-28 16:25:33 -04:00 |
|
Brian.Dyke
|
992186e641
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-10 into 14.2.1
Former-commit-id: 6f64664e70 [formerly 4c010cf27a] [formerly 6f64664e70 [formerly 4c010cf27a] [formerly ce81b44f32 [formerly b92ce0c1589c48de73387c142f1302409a3b0cb7]]]
Former-commit-id: ce81b44f32
Former-commit-id: 4f434e1bf9 [formerly 73ec45c5b2]
Former-commit-id: f5bc17ef24
|
2014-05-28 09:36:15 -04:00 |
|
Brian.Dyke
|
befec4cf01
|
CM-MERGE:OB13.5.5-11 into 14.1.2
Former-commit-id: 089b2559bb [formerly e95ee60224] [formerly 089b2559bb [formerly e95ee60224] [formerly e852623f48 [formerly c85d4369600bfc24405386aa71713d7f2d58b201]]]
Former-commit-id: e852623f48
Former-commit-id: f07b83ce91 [formerly b745ac5926]
Former-commit-id: 21112face5
|
2014-05-28 08:40:56 -04:00 |
|
Brian.Dyke
|
d078a2630e
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-9 into 14.2.1
Former-commit-id: ea618935d0 [formerly 575cebda84] [formerly ea618935d0 [formerly 575cebda84] [formerly 638acc2c06 [formerly 34c582add16be1620f400d78d2f37da8c534f71a]]]
Former-commit-id: 638acc2c06
Former-commit-id: 2ab1fc6ddf [formerly 290b85b556]
Former-commit-id: 09f2d8b8b1
|
2014-05-27 13:42:09 -04:00 |
|
Brian.Dyke
|
7e5475923c
|
CM-MERGE:OB13.5.5-10 into 14.1.2
Former-commit-id: 4a1b6d70c4 [formerly 89a8caddbb] [formerly 4a1b6d70c4 [formerly 89a8caddbb] [formerly ba8d7dbbb7 [formerly d57f7989982a59a546116b63a406294573844039]]]
Former-commit-id: ba8d7dbbb7
Former-commit-id: bb5d88be66 [formerly ebdd53742c]
Former-commit-id: 1a69aaf89a
|
2014-05-27 13:30:35 -04:00 |
|
Fay.Liang
|
2ac429bff7
|
ASM #596 - Watch wording not properly inserted into some warning products
Change-Id: I7dc223d95f06a6a259e969cfbb8e4bde2f4b9192
Former-commit-id: 17f1404221 [formerly c007420e22] [formerly 17f1404221 [formerly c007420e22] [formerly 4fa60f159a [formerly ed8cd169fe0a531d0d83411f7b1afe787088d406]]]
Former-commit-id: 4fa60f159a
Former-commit-id: 3ed3e2249d [formerly 5d763a0f3d]
Former-commit-id: 605c976986
|
2014-05-23 15:47:50 -04:00 |
|
Steve Harris
|
4a2ed02d2c
|
Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2
Former-commit-id: 1e34c7eda3 [formerly 3ed42be350] [formerly 1e34c7eda3 [formerly 3ed42be350] [formerly acecfd7dfa [formerly a125cbc03cc5cace25e35b3516c34f9d7060a78e]]]
Former-commit-id: acecfd7dfa
Former-commit-id: efafb08e74 [formerly fdaf7083f5]
Former-commit-id: 8b68aea03b
|
2014-05-22 13:52:02 -05:00 |
|
brian.dyke
|
974b796441
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: f405e8c89c [formerly 562f53874a] [formerly f405e8c89c [formerly 562f53874a] [formerly f74b1707f9 [formerly 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6]]]
Former-commit-id: f74b1707f9
Former-commit-id: ab985767bd [formerly 69a4d1e3b9]
Former-commit-id: 40660547cf
|
2014-05-22 12:46:56 -04:00 |
|
Michael Gamazaychikov
|
0217549622
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 8ae5d535de [formerly 63409ef272] [formerly 8ae5d535de [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: 0d38d04dad [formerly 134f486069]
Former-commit-id: 55d44735ef
|
2014-05-21 15:12:08 +01:00 |
|
Brian.Dyke
|
b0b377e811
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 822ad181bf [formerly 2fd18d14d6] [formerly 822ad181bf [formerly 2fd18d14d6] [formerly db68b80bbd [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]
Former-commit-id: db68b80bbd
Former-commit-id: 937b9bb9ce [formerly ebcaebb28d]
Former-commit-id: f42d40c3a3
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
774897735a
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
Former-commit-id: 88a5ecefaa [formerly e5f951bf89] [formerly 88a5ecefaa [formerly e5f951bf89] [formerly 8c2cccb930 [formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]]
Former-commit-id: 8c2cccb930
Former-commit-id: bb2089f2df [formerly 89d2843610]
Former-commit-id: fe658cb381
|
2014-05-20 12:08:29 -04:00 |
|
Brian.Dyke
|
5d6603320b
|
CM-MERGE:OB13.5.5-9 into 14.1.2
Former-commit-id: 8435ace4f8 [formerly 545e7f6ce9] [formerly 8435ace4f8 [formerly 545e7f6ce9] [formerly abf0f995cd [formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]]
Former-commit-id: abf0f995cd
Former-commit-id: 9af8951a2a [formerly fa13621d8e]
Former-commit-id: 0f5964b03f
|
2014-05-20 11:56:30 -04:00 |
|
Brian.Dyke
|
3d35be33cb
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: c4b7b8dd74 [formerly dbd3bb54e8] [formerly c4b7b8dd74 [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f2885c9996 [formerly f30bd7d9ae]
Former-commit-id: 39d8bd9004
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
b65a3a3214
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 2eae2be646 [formerly b29db01a59] [formerly 2eae2be646 [formerly b29db01a59] [formerly 06c2478539 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]
Former-commit-id: 06c2478539
Former-commit-id: 3558d8f162 [formerly 9baa09f4bc]
Former-commit-id: c88e8d41b6
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
7cd2402325
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 6e034005e0 [formerly 94fea6748f] [formerly 6e034005e0 [formerly 94fea6748f] [formerly 9c1587b92d [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]]
Former-commit-id: 9c1587b92d
Former-commit-id: ec6053c3f7 [formerly baa1546e39]
Former-commit-id: b82d8bf6fb
|
2014-05-19 15:40:41 +01:00 |
|
Brian.Dyke
|
eefa4dbf96
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: 509616ba6a [formerly f8ed9c7944] [formerly 509616ba6a [formerly f8ed9c7944] [formerly e9bd17a21f [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]]
Former-commit-id: e9bd17a21f
Former-commit-id: e563eb3376 [formerly 409a48b907]
Former-commit-id: acf4cbbd78
|
2014-05-19 07:55:42 -04:00 |
|
David Friedman
|
f999df6859
|
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: a920c5a5e4 [formerly c909746e0e] [formerly a920c5a5e4 [formerly c909746e0e] [formerly a55e851780 [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]]
Former-commit-id: a55e851780
Former-commit-id: f8c9026f79 [formerly 101f43d875]
Former-commit-id: 421d4a56c8
|
2014-05-16 16:40:38 -05:00 |
|
David Friedman
|
fa63aea622
|
ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb
Former-commit-id: b462660d75 [formerly caa38ec709] [formerly b462660d75 [formerly caa38ec709] [formerly eab9a6b6d7 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]]
Former-commit-id: eab9a6b6d7
Former-commit-id: 81abf8e7d9 [formerly 4efaa47d2d]
Former-commit-id: e576ddde57
|
2014-05-16 21:38:34 +00:00 |
|
David Friedman
|
32524f8d3c
|
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: 404f3af49e [formerly 1503bc4162] [formerly 404f3af49e [formerly 1503bc4162] [formerly 3b69a240c8 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]]
Former-commit-id: 3b69a240c8
Former-commit-id: ff0f8e731f [formerly b62ac936ba]
Former-commit-id: f8e5e96774
|
2014-05-16 21:34:59 +00:00 |
|
Brian.Dyke
|
529febf986
|
Merge branch 'omaha_14.2.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1
Former-commit-id: c2afc26206 [formerly 3183283e99] [formerly c2afc26206 [formerly 3183283e99] [formerly dcd238c6a3 [formerly 18486e2e8ead4614c05e3a7775cba95cd78053c8]]]
Former-commit-id: dcd238c6a3
Former-commit-id: 4a37cd32bd [formerly 353aebe447]
Former-commit-id: 3b7e8c2c66
|
2014-05-16 08:45:47 -04:00 |
|
Brian.Dyke
|
43210259de
|
Merge remote-tracking branch 'remotes/origin/master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-5 into 14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 2de7de6378 [formerly b066572041] [formerly 2de7de6378 [formerly b066572041] [formerly c8f21e92fe [formerly d75db45cdfa20fed7568b825ca0dfd8c8689d22a]]]
Former-commit-id: c8f21e92fe
Former-commit-id: 7cc4e0258d [formerly 984f56d23c]
Former-commit-id: 17d7291548
|
2014-05-15 16:40:47 -04:00 |
|
Brian.Dyke
|
33211da425
|
CM-MERGE:OB13.5.5-6 into 14.1.2
Former-commit-id: 08f69fd3a1 [formerly 81a1affe22] [formerly 08f69fd3a1 [formerly 81a1affe22] [formerly c81d54b651 [formerly 11acfb00bda7686c68e24903df4831cf57bf86de]]]
Former-commit-id: c81d54b651
Former-commit-id: fe9ee785b6 [formerly cf4eca67af]
Former-commit-id: 77344c1e1f
|
2014-05-15 14:16:38 -04:00 |
|
Steve Harris
|
2f537f102e
|
Merge branch 'master_14.2.2' (14.2.2-9) into omaha_14.2.2
Former-commit-id: 01a6ce5b9b [formerly 85850ed33e] [formerly 01a6ce5b9b [formerly 85850ed33e] [formerly a6aa34210c [formerly b1bf5bdc4a81c55c9cd30ac77857509a2e8f5a08]]]
Former-commit-id: a6aa34210c
Former-commit-id: 9496e2ccdc [formerly 0ebb502663]
Former-commit-id: ba87dbd03f
|
2014-05-15 08:12:49 -05:00 |
|