Steve Harris
af7018b2c9
Merge branch 'master_13.5.2' (13.5.2-4) into omaha_13.5.2
...
Former-commit-id: 3362379dff
[formerly 71ab437e3a
] [formerly 348928da7f
] [formerly 3362379dff
[formerly 71ab437e3a
] [formerly 348928da7f
] [formerly 322a69b3fa
[formerly 348928da7f
[formerly a3762af49357106fd308d1a495e64fa2d6389a1e]]]]
Former-commit-id: 322a69b3fa
Former-commit-id: 98bc236326
[formerly 1288d9de57
] [formerly 4c3e511967f4c2f6bf9bed9c1d9e3ba69e0ba570 [formerly 10afb1fbaf
]]
Former-commit-id: ad20929cf8abd4a5aee9c5e8d53c3fb8d7cf11be [formerly f8ebc33909
]
Former-commit-id: 0d1324bc8b
2013-09-12 10:55:44 -05:00
Steve Harris
3a21a9eb6c
13.5.2-4 baseline
...
Former-commit-id: 3d0b711ccf
[formerly 595e7bc0d9
] [formerly e3c935d48b
] [formerly 3d0b711ccf
[formerly 595e7bc0d9
] [formerly e3c935d48b
] [formerly 58c6821427
[formerly e3c935d48b
[formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]]
Former-commit-id: 58c6821427
Former-commit-id: a8201afb82
[formerly 4c6790f10f
] [formerly 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59
]]
Former-commit-id: d4668ee6901a6bb072be3a88eaad320aed699c0f [formerly e2398f74e5
]
Former-commit-id: 609926f1f4
2013-09-12 11:13:59 -04:00
Jonathan Sanchez
3c4cfdeae6
Issue #2176 Increased line width of emergency polygon and changed font for regular warning products.
...
Change-Id: Icb5456d038a8a2fadbe10f70a2ef32c8ba1f7816
Former-commit-id: 471b68e59d
[formerly 3f0c709b3f
] [formerly ce051787a7
] [formerly 471b68e59d
[formerly 3f0c709b3f
] [formerly ce051787a7
] [formerly a57cec0ed8
[formerly ce051787a7
[formerly 61dd32d0244c9a6af8e63ed2b789cfa15d7c9539]]]]
Former-commit-id: a57cec0ed8
Former-commit-id: 001620d298
[formerly 18e48b4ab5
] [formerly 83787eea4ca1bb365af159a618c44ef665e654f1 [formerly ff9bac0d3b
]]
Former-commit-id: 99db70f8d1c43d295932b1c5f7d7854e6a5c6c61 [formerly 8a0ae16a5d
]
Former-commit-id: 3666e926a5
2013-09-05 11:24:16 -05:00
Ron Anderson
f3096dd879
Issue #2321 Fixed smartInits for D2D accumulative parameters
...
Change-Id: I2cb802f6d0f2d5cc8364d5030a497528b5a3999e
Former-commit-id: f8e3c36887
[formerly 06258f91e6
] [formerly d14abbec74
] [formerly f8e3c36887
[formerly 06258f91e6
] [formerly d14abbec74
] [formerly f056b3e02c
[formerly d14abbec74
[formerly 5e168359f93663dc160e42495bbe93647c4f4fb8]]]]
Former-commit-id: f056b3e02c
Former-commit-id: f7bbfe8069
[formerly 5aed04b3c1
] [formerly 94c3504df3abb5f1715685d70df3dc031be25425 [formerly 4314a3c499
]]
Former-commit-id: f9a9177a25106e197a059c57af2b201cd151a979 [formerly 1d6e5ccc99
]
Former-commit-id: c5b23e9f11
2013-09-04 08:49:13 -05:00
Steve Harris
7c47939632
13.5.2-2 baseline
...
Former-commit-id: 8dcd159377
[formerly 8cde3b2b54
] [formerly 4a47fb97c5
] [formerly 8dcd159377
[formerly 8cde3b2b54
] [formerly 4a47fb97c5
] [formerly 9e4bf0cf2e
[formerly 4a47fb97c5
[formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: c10c39b5d6
[formerly 12b0ab91fd
] [formerly 8411cf39c13b7f63f746f4a1b8806ba15bfa7510 [formerly 5de6d566f0
]]
Former-commit-id: ac9d4632081685ff126231e5a993f8fb95aba22d [formerly 180e042b5d
]
Former-commit-id: db64b2e2d9
2013-08-29 15:01:29 -04:00
Steve Harris
d024632795
Merge branch 'master_13.5.2' (13.5.2-1) into omaha_13.5.2
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: eb43afb042
[formerly 34e085ff97
] [formerly 0791be2b77
] [formerly eb43afb042
[formerly 34e085ff97
] [formerly 0791be2b77
] [formerly cfe2ba88ad
[formerly 0791be2b77
[formerly 5e0080743ae12b96d828451014a16ea118e25ce0]]]]
Former-commit-id: cfe2ba88ad
Former-commit-id: 4ef41d2c35
[formerly 5abb143d01
] [formerly 727a02ca1cf8ee5783dc8270301e0e9ffbdc71dc [formerly 116daf48ff
]]
Former-commit-id: de89d4d0d46831d5cb7f87f4d593498c95a3b353 [formerly 41b7f325bb
]
Former-commit-id: 821a722a72
2013-08-28 09:03:09 -05:00
Steve Harris
85235051aa
13.5.2-1 baseline
...
Former-commit-id: 3cd0b2dfc6
[formerly 894d2425b2
] [formerly 73dd0f166c
] [formerly 3cd0b2dfc6
[formerly 894d2425b2
] [formerly 73dd0f166c
] [formerly 542b2c3d18
[formerly 73dd0f166c
[formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]]]
Former-commit-id: 542b2c3d18
Former-commit-id: b4e006162f
[formerly 43af1b227a
] [formerly 43ff166b6d3df833e29603f504019d7b3776a1d1 [formerly 4ecb349ed8
]]
Former-commit-id: 551ebb34fc0bd9a337eef969bbbeff276486196a [formerly 4a9a91ce2e
]
Former-commit-id: 1900cef156
2013-08-28 09:43:48 -04:00
Ron Anderson
10c4f31a29
Issue #2287 Fix scaling and direction of wind/swell arrows in GFE
...
Change-Id: Id12823256fc3c383005098b83e72249284a36f33
Former-commit-id: 04def1379d
[formerly df357588a0
] [formerly 77db16933e
] [formerly 04def1379d
[formerly df357588a0
] [formerly 77db16933e
] [formerly 803515f4ff
[formerly 77db16933e
[formerly b0c88cb7d71cf3e081596cd47d88d8412c2ea3d1]]]]
Former-commit-id: 803515f4ff
Former-commit-id: 8e26902f09
[formerly a1952b7c75
] [formerly 5764de917b8e19b33bed0061d37a440fbc638101 [formerly 518e32206e
]]
Former-commit-id: d26ed86e870075626eee8ef2d9a17dc3e4e9f171 [formerly d4a2df4eb5
]
Former-commit-id: 24f43305b3
2013-08-27 13:51:17 -05:00
Steve Harris
6d26ed7abe
Merge branch 'master_13.5.2' (13.5.1-18) into omaha_13.5.2
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
nativeLib/edexBridge/edexBridge.cpp
Former-commit-id: abb7bdd7ed
[formerly decc9e4c36
] [formerly e361386eab
] [formerly abb7bdd7ed
[formerly decc9e4c36
] [formerly e361386eab
] [formerly 119af8a466
[formerly e361386eab
[formerly a3671ea2935178a28dce6d075dc2067a609e6725]]]]
Former-commit-id: 119af8a466
Former-commit-id: edd03a1cf1
[formerly f56b906997
] [formerly 4e6f59fd5b911fc5753e9e8c4824360e1ab43c50 [formerly 5b11d137df
]]
Former-commit-id: 74866ea308428f032b7296817aec930a463a2eda [formerly 7a5e176937
]
Former-commit-id: daa4470372
2013-08-23 11:36:43 -05:00
Steve Harris
690e24905c
13.5.1-18 baseline
...
Former-commit-id: 80d8236464
[formerly d931b80e70
] [formerly afb34814dd
] [formerly 80d8236464
[formerly d931b80e70
] [formerly afb34814dd
] [formerly 0a7acf96c7
[formerly afb34814dd
[formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: ff31991527
[formerly 261b1da9d6
] [formerly bef853d6001eb232a3c91986195c4ab5e86bc9cd [formerly 2f9aa87a9f
]]
Former-commit-id: 9f45e3bbb3ed565bf3eab964a0ff4d2313fd7eda [formerly cde7f2a59c
]
Former-commit-id: 6c258a0b7c
2013-08-22 09:12:43 -04:00
Ben Steffensmeier
0e7410af64
Issue #2194 Fix site override.
...
Former-commit-id: 85c71b7714
[formerly de00b302b3
] [formerly 791c6a9890
] [formerly 85c71b7714
[formerly de00b302b3
] [formerly 791c6a9890
] [formerly dac718634c
[formerly 791c6a9890
[formerly faba58780d497f8db564c0fa325c07b35326e010]]]]
Former-commit-id: dac718634c
Former-commit-id: f558d240ba
[formerly e757a184e1
] [formerly 1d5ea6677cdb2f75d1fabaa5d51f91e64314f0f3 [formerly 4e218e9e56
]]
Former-commit-id: a02dba3599b3b1b5adf9600921abcccfccb91510 [formerly 7bf35bdac6
]
Former-commit-id: 48ac0e726d
2013-08-20 14:47:32 -05:00
Ben Steffensmeier
ab2e5885a4
Issue #2275 Add dataURI column back into bufrmos types.
...
Former-commit-id: c444a0c4ba
[formerly d6ab7d08be
] [formerly 4cb853ac39
] [formerly c444a0c4ba
[formerly d6ab7d08be
] [formerly 4cb853ac39
] [formerly 9219db0069
[formerly 4cb853ac39
[formerly 1b883da972ac915252c256b63c881d23121f3ac6]]]]
Former-commit-id: 9219db0069
Former-commit-id: fbf165f37f
[formerly 3a8893846f
] [formerly ababd150fc882dda0dca13854e3bf316e1aafa9b [formerly 8b9031719a
]]
Former-commit-id: 620c37f476535c8ffd732b686b071649639a0a93 [formerly 7668fdbde7
]
Former-commit-id: 02d3f28c06
2013-08-19 16:00:01 -05:00
Steve Harris
7a291e0bfb
13.5.1-17 baseline
...
Former-commit-id: fb9ab08255
[formerly 2d882ccb54
] [formerly 9dd7dc5d20
] [formerly fb9ab08255
[formerly 2d882ccb54
] [formerly 9dd7dc5d20
] [formerly b210c90245
[formerly 9dd7dc5d20
[formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]]
Former-commit-id: b210c90245
Former-commit-id: 4fd4093539
[formerly 7c0cf13ea8
] [formerly c4d2af6f3a1f86a3300795dc1db7d6c9323eac0b [formerly a192a3ebb1
]]
Former-commit-id: 27a8a42f514b9659d14772e48ae0d9cff9703709 [formerly 815bfe575c
]
Former-commit-id: 4bcb06cd63
2013-08-19 16:34:24 -04:00
Max Schenkelberg
dad1bc51a5
Issue #2189 Fixing java 6 and 7 compatibility issue in 13.5.2 branch.
...
Change-Id: Ia800aee8f4e027630293b074d0b7e8d93d424611
Former-commit-id: f8e36bea6f
[formerly a6a44754c9
] [formerly 57a0df81a6
] [formerly f8e36bea6f
[formerly a6a44754c9
] [formerly 57a0df81a6
] [formerly 9e213438f4
[formerly 57a0df81a6
[formerly 0603b0bd77a9463abaa9020bf1bcb97befd7b161]]]]
Former-commit-id: 9e213438f4
Former-commit-id: 53d4c9d9c2
[formerly 0703b5c772
] [formerly e195d4590671cefaed22b31ff4f8a803d2f88877 [formerly b67a3033f9
]]
Former-commit-id: 6ccb9209bae79b1c80076aabe8abaa3e4393a959 [formerly f720f78f4c
]
Former-commit-id: 16232ee8c7
2013-08-15 17:36:36 -05:00
Max Schenkelberg
b64a9336a9
Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
...
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7
Former-commit-id: 54b4b759fd
[formerly 5a4d880498
] [formerly e85d66f4e5
] [formerly 54b4b759fd
[formerly 5a4d880498
] [formerly e85d66f4e5
] [formerly 3800aec9e6
[formerly e85d66f4e5
[formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]]]
Former-commit-id: 3800aec9e6
Former-commit-id: 39cdbf728f
[formerly 352e21ffd3
] [formerly ac74cfea7295b7cc3576674f8b131a9d316f9718 [formerly d89d13d029
]]
Former-commit-id: 1f274d37e697e17bfbf5f890a9373463aff7810c [formerly ee68615786
]
Former-commit-id: 6709242e36
2013-08-15 15:50:40 -05:00
David Gillingham
982d19d1cf
Issue #2009 : Implement dual-domain GFE export_grids solution. Update MHS
...
emulator program to support new directory structure and some code cleanup and
refactoring.
Change-Id: Ib3cf5c0123cd87497517d4221edea5883db9157d
Former-commit-id: 31ae04c92a
[formerly 1d3f3da9cc
] [formerly 0f4f24beb8
] [formerly 31ae04c92a
[formerly 1d3f3da9cc
] [formerly 0f4f24beb8
] [formerly f8b6ec20c1
[formerly 0f4f24beb8
[formerly ad7acb2d563c79d92d84ec62405b492907191af3]]]]
Former-commit-id: f8b6ec20c1
Former-commit-id: 5205fe56a7
[formerly 3af47effc5
] [formerly 2eb604c37ee47829cda515d4a57729d8b240989d [formerly 751188ab5a
]]
Former-commit-id: b6b4ffccf0253f44efcf7208a528d5943d4e677e [formerly 4bd40cd544
]
Former-commit-id: a2a4d1fbcf
2013-08-14 17:10:04 -05:00
Richard Peter
f48818579c
Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 9ff9054d7e
[formerly 2608dfe1d8
] [formerly c61afa1bfa
] [formerly 9ff9054d7e
[formerly 2608dfe1d8
] [formerly c61afa1bfa
] [formerly ee6b9eb11a
[formerly c61afa1bfa
[formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 28a53c8a33
[formerly 3f65eaf74b
] [formerly 4ccbd370354ae0debc8270aa65a8ac1c72bc2ba9 [formerly 58a4aaa080
]]
Former-commit-id: 7b21c6b410610be2392c1ea462eebd5eaebc5a75 [formerly 7ca1edf371
]
Former-commit-id: a7075027be
2013-08-14 14:29:55 -05:00
Steve Harris
a700182250
13.5.1-15 baseline
...
Former-commit-id: b05abcaec0
[formerly 535218c676
] [formerly 53e96e21db
] [formerly b05abcaec0
[formerly 535218c676
] [formerly 53e96e21db
] [formerly c6dc1817e7
[formerly 53e96e21db
[formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 6f1b6d494f
[formerly 4f9288e7c1
] [formerly c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58
]]
Former-commit-id: 813df6d93357ffbcdd78c9658dc75c9aaa803d60 [formerly 9ea3f0c215
]
Former-commit-id: d0be6956e9
2013-08-14 10:24:26 -04:00
Nate Jensen
346e1d1fb7
Issue #2197 cherry picking 2197 into 13.5
...
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 9a01271f5f
[formerly a9815b0551
] [formerly 15405cab1b
] [formerly 9a01271f5f
[formerly a9815b0551
] [formerly 15405cab1b
] [formerly 63b2fe798a
[formerly 15405cab1b
[formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]]
Former-commit-id: 63b2fe798a
Former-commit-id: e63e7120e5
[formerly 464a104dc1
] [formerly 63f208510706ceb9b97414afeb3057e182119b34 [formerly 3be446fca8
]]
Former-commit-id: 3574b3d0242e822b25fae435b013a4f5730216e4 [formerly 96214e9554
]
Former-commit-id: 7e35afdd49
2013-08-13 12:27:02 -05:00
Ben Steffensmeier
451acac93b
Issue #1869 Fix bufrua point data stationId.
...
Former-commit-id: c88e432d04
[formerly bf2dfbaca8
] [formerly 9e799b4df1
] [formerly c88e432d04
[formerly bf2dfbaca8
] [formerly 9e799b4df1
] [formerly d1d3491aaf
[formerly 9e799b4df1
[formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]]]
Former-commit-id: d1d3491aaf
Former-commit-id: b357fb0018
[formerly 20a7ba8e69
] [formerly 5ee45ce1a1eec70e460a54a9e98781bb2db78baa [formerly 761cb47f73
]]
Former-commit-id: f26d6075dc3483c9d4f7cfcf7de81d03d46f8bf5 [formerly b5332f3eb5
]
Former-commit-id: 7a2cde76d5
2013-08-09 13:00:18 -05:00
Lee Venable
90c1aec4ca
Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
...
Former-commit-id: c314bf2092
[formerly ef5a7fb83a
] [formerly 69dd7b66fa
] [formerly c314bf2092
[formerly ef5a7fb83a
] [formerly 69dd7b66fa
] [formerly 69645f03dc
[formerly 69dd7b66fa
[formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]]
Former-commit-id: 69645f03dc
Former-commit-id: b46745eebb
[formerly 696ee07b3f
] [formerly e115b93102485b11368b55772e8726745f744ad8 [formerly d9e82e20fd
]]
Former-commit-id: eada16a20c494be474850c2dc84119382e3590d1 [formerly a0e0b81a81
]
Former-commit-id: 33177a8711
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
231cedc656
Issue #2243 Prevented invalid follow ups.
...
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e
Former-commit-id: 7d34154d2c
[formerly 05f49219d3
] [formerly 4711226b21
] [formerly 7d34154d2c
[formerly 05f49219d3
] [formerly 4711226b21
] [formerly dad0681ae0
[formerly 4711226b21
[formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]]
Former-commit-id: dad0681ae0
Former-commit-id: 1e64c5d491
[formerly b467d0fd66
] [formerly 47e2f4c744287d8c0b4a9cc10d78ee81fa61534a [formerly d068b5d61f
]]
Former-commit-id: 8a26fc85e651fdc70a339fe1b11109ae175e19ba [formerly 9be546dab8
]
Former-commit-id: 21368ade28
2013-08-08 16:31:35 -05:00
Greg Armendariz
a118b8f70a
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 154539a4fe
[formerly 3cecb178cf
] [formerly b08ce25ac8
] [formerly 154539a4fe
[formerly 3cecb178cf
] [formerly b08ce25ac8
] [formerly ffb2bea8ad
[formerly b08ce25ac8
[formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]]
Former-commit-id: ffb2bea8ad
Former-commit-id: d4840d3802
[formerly 24dc722be4
] [formerly 86468f816c52e90d514c87d790110decf28213ac [formerly 566532c40d
]]
Former-commit-id: 510970cf69f7524db648757a728ea8385ea55d47 [formerly 172bc300ca
]
Former-commit-id: e51e51c625
2013-08-08 16:24:39 -05:00
Greg Armendariz
b264a9d841
13.5.1-13 baseline
...
Former-commit-id: 429898edc6
[formerly f0b62a22bf
] [formerly 29b823fee4
] [formerly 429898edc6
[formerly f0b62a22bf
] [formerly 29b823fee4
] [formerly 5577e686c1
[formerly 29b823fee4
[formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]]
Former-commit-id: 5577e686c1
Former-commit-id: 076a0b08ac
[formerly 9f2f62427b
] [formerly 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add
]]
Former-commit-id: e2cd5730bab137f2b61daadd542fa1f16682d2c6 [formerly b66fcc40a5
]
Former-commit-id: 0c61b62d24
2013-08-08 17:00:36 -04:00
Greg Armendariz
d37c94464b
13.5.1-12 baseline
...
Former-commit-id: 34e0218b59
[formerly 01d067cff9
] [formerly c9898ba8d1
] [formerly 34e0218b59
[formerly 01d067cff9
] [formerly c9898ba8d1
] [formerly fe51885ba7
[formerly c9898ba8d1
[formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]]
Former-commit-id: fe51885ba7
Former-commit-id: 75d1e77f1b
[formerly f777a744e5
] [formerly cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262
]]
Former-commit-id: c31f8384962ae36ae9a33ef84d46aea958522032 [formerly cbf9e42c21
]
Former-commit-id: 244bc3ac37
2013-08-08 15:34:01 -04:00
Greg Armendariz
1a04182d44
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Former-commit-id: 7398504d85
[formerly d1fb06feb7
] [formerly ecc9f77f42
] [formerly 7398504d85
[formerly d1fb06feb7
] [formerly ecc9f77f42
] [formerly 6b1989cb29
[formerly ecc9f77f42
[formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]]
Former-commit-id: 6b1989cb29
Former-commit-id: 65b70ce223
[formerly fc6195bbf6
] [formerly 515c934b42be211ce5f92cab2acdd2eb519d3d9f [formerly c46f04dd72
]]
Former-commit-id: a084eb93b668c3922297767a4872577df1c23840 [formerly 9a1b44efdc
]
Former-commit-id: 4b29a16298
2013-08-07 14:46:30 -05:00
Greg Armendariz
7fb928e967
13.5.1-11 baseline
...
Former-commit-id: 814f7fdcdd
[formerly c402dbf6e9
] [formerly ea7b22500e
] [formerly 814f7fdcdd
[formerly c402dbf6e9
] [formerly ea7b22500e
] [formerly 4ec04083bd
[formerly ea7b22500e
[formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 4c20fc4977
[formerly 75f9f8df3f
] [formerly f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb
]]
Former-commit-id: 4b97c9297a6132e1a64e7b28e4204a8cd32cdd79 [formerly f06ee47260
]
Former-commit-id: 8bf2c1cc07
2013-08-07 14:34:27 -04:00
Ben Steffensmeier
a6a4075f13
Issue #2242 Optimize FFMP NavigableMap memory.
...
Former-commit-id: 42c551bb7a
[formerly 74a5f09cd1
] [formerly f0ceddacf1
] [formerly 42c551bb7a
[formerly 74a5f09cd1
] [formerly f0ceddacf1
] [formerly b06171b4f2
[formerly f0ceddacf1
[formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]]]
Former-commit-id: b06171b4f2
Former-commit-id: 6d60a18a2d
[formerly 7de39a58bb
] [formerly 638ab88007fb4ccfc259d1c8e3cfadd1bdb30ab1 [formerly 3eb869c65e
]]
Former-commit-id: caeba084d0723bb0ee2b76813919bcea8b28e44d [formerly 7e3835fd0a
]
Former-commit-id: 7a95a653aa
2013-08-07 12:08:13 -05:00
Steve Harris
dded20dc93
13.5.1-8 baseline
...
Former-commit-id: 52da6c54db
[formerly 392faf86e7
] [formerly 3bece5e5d0
] [formerly 52da6c54db
[formerly 392faf86e7
] [formerly 3bece5e5d0
] [formerly dfbf9a5afe
[formerly 3bece5e5d0
[formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60
[formerly a7d4c6274e
] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814
]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf
]
Former-commit-id: 767b7fdb4d
2013-07-26 09:02:34 -04:00
David Gillingham
380b13d352
Issue #1762 : Fix Service Backup regression caused by last commit under this
...
ticket: NullPointerException caused by missing DynamicSerialize annotation and
disabled export configuration option caused by incomplete request.
Former-commit-id: e96c2962a5
[formerly 9fa6048f38
] [formerly 881566d46b
] [formerly e96c2962a5
[formerly 9fa6048f38
] [formerly 881566d46b
] [formerly 938f9cd7f7
[formerly 881566d46b
[formerly 071f7e80fc09720a3b1763d4903eb75fb96ebcca]]]]
Former-commit-id: 938f9cd7f7
Former-commit-id: f22922eaca
[formerly 72e808cb1c
] [formerly 148b8c40d4c89da3d04e1f5c6a0dc0ba21499d31 [formerly 42f096abe8
]]
Former-commit-id: 059d65f359518574a4d1fa4376a7b2dbfb491997 [formerly 274ca5a740
]
Former-commit-id: 888a61c520
2013-07-22 17:24:00 -05:00
Richard Peter
69af3f93ca
Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 8e3a28636c
[formerly 85fb4c3940
] [formerly 7e08c04383
] [formerly 8e3a28636c
[formerly 85fb4c3940
] [formerly 7e08c04383
] [formerly cc7189fcb7
[formerly 7e08c04383
[formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]]
Former-commit-id: cc7189fcb7
Former-commit-id: e46425cd8d
[formerly eefaf2c836
] [formerly d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343
]]
Former-commit-id: fcddfd2ee1c278a22544ea6d0efd7a301de67fff [formerly 3a573f4256
]
Former-commit-id: 374879df01
2013-07-18 21:46:25 -05:00
Steve Harris
adf2f89d57
13.5.1-7 baseline
...
Former-commit-id: 67299457b1
[formerly 630705aa3f
] [formerly bf58a81b38
] [formerly 67299457b1
[formerly 630705aa3f
] [formerly bf58a81b38
] [formerly 86ce1248c2
[formerly bf58a81b38
[formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b
[formerly cb50a0028d
] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5
]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd
]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00
Roger Ferrel
df37274974
Issue #1966 Relocation of configuration files and checks for bad configuration files.
...
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c
Former-commit-id: e5cd0e7599
[formerly e225bd674b
] [formerly c002045a87
] [formerly e5cd0e7599
[formerly e225bd674b
] [formerly c002045a87
] [formerly 91ee1d36bf
[formerly c002045a87
[formerly d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad]]]]
Former-commit-id: 91ee1d36bf
Former-commit-id: 1f56a1179e
[formerly 97e4dc3633
] [formerly e674edd4dd9db03d4b9f31499b37657af33debd7 [formerly 95cb3439a4
]]
Former-commit-id: 4285173926a19c787c964793fdd7bd9e860c0e29 [formerly 47ac9a9147
]
Former-commit-id: 8d6092bbf0
2013-07-18 10:02:05 -05:00
Dave Hladky
ffe58606fe
Issue #2184 Removed all other HUCs other than ALL from storage
...
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5
Former-commit-id: 361dd5113f
[formerly 840b44b1e1
] [formerly 84dae0a6b8
] [formerly 361dd5113f
[formerly 840b44b1e1
] [formerly 84dae0a6b8
] [formerly bd03085f8d
[formerly 84dae0a6b8
[formerly 251cf3cca7c6653300f115083aa860444fee0ea9]]]]
Former-commit-id: bd03085f8d
Former-commit-id: 6f43853101
[formerly 4556798697
] [formerly a1bddfe6f6215adf6084c27a5107f0fcd314b75b [formerly 15738a4d30
]]
Former-commit-id: 1d2fbac9ecdf8c1c0fa1cc39f8c710dab63ba6bc [formerly f5ea1f0327
]
Former-commit-id: 779ebd5db3
2013-07-17 15:18:49 -05:00
Greg Armendariz
df73c0e2e9
13.5.1-6 baseline
...
Former-commit-id: e375a74bc8
[formerly 5894853996
] [formerly 7e09fa5a0b
] [formerly e375a74bc8
[formerly 5894853996
] [formerly 7e09fa5a0b
] [formerly b9044b1195
[formerly 7e09fa5a0b
[formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]]
Former-commit-id: b9044b1195
Former-commit-id: f23d42e977
[formerly 93b71934c0
] [formerly 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7
]]
Former-commit-id: cca9e123a3f6f9da3810eec2cc36ef7c717f111a [formerly ec2637676d
]
Former-commit-id: b601345c9f
2013-07-10 10:04:22 -04:00
Ben Steffensmeier
7b48c5038a
Issue #1869 Switch location hibernate type to use hibernate spatial.
...
Former-commit-id: 9d1910ba9d
[formerly f8596f1f5a
] [formerly 7a31fbb386
] [formerly 9d1910ba9d
[formerly f8596f1f5a
] [formerly 7a31fbb386
] [formerly bbdd5cdc79
[formerly 7a31fbb386
[formerly b434131d412788c478ec45114a86abe925a79d4c]]]]
Former-commit-id: bbdd5cdc79
Former-commit-id: 87cc8f9112
[formerly a524c3f17d
] [formerly 4c381305878cb140792b9d6b0b8239024c1f483f [formerly d0b0d981cc
]]
Former-commit-id: abce4baedd0fd36fcdcf80fdb8b4981ea85727b7 [formerly db54975911
]
Former-commit-id: c02d27fe9e
2013-07-09 18:25:11 -05:00
Dustin Johnson
e46cb588f2
Issue #2038 Correct unregisterFromBandwidthEventBus() to actually do it
...
Change-Id: Ic82c974dcf354d9fb871b1b2f81cea52e2502fe8
Former-commit-id: 215e3fbd8d
[formerly 2cfe1506a4
] [formerly 0393cec5d5
] [formerly 215e3fbd8d
[formerly 2cfe1506a4
] [formerly 0393cec5d5
] [formerly 9f6bd8b32b
[formerly 0393cec5d5
[formerly 198c9895608d22b3e3a616f2812628be32da514b]]]]
Former-commit-id: 9f6bd8b32b
Former-commit-id: d506f63c65
[formerly 617fdd6b44
] [formerly d307875965a1a0d3fecaaf627504cf76ab5c4496 [formerly 3cb8e1336c
]]
Former-commit-id: 8c41760d6ddca7ab7a22a2d092e358ead6a94526 [formerly b9f992626c
]
Former-commit-id: 06ce541b67
2013-07-09 14:55:22 -05:00
Ben Steffensmeier
b6764e390e
Issue #1869 Format Calendar when making Constraint Mapping.
...
Former-commit-id: bbea2d76c5
[formerly 2cccbc8e0d
] [formerly f53f702b9e
] [formerly bbea2d76c5
[formerly 2cccbc8e0d
] [formerly f53f702b9e
] [formerly c3f48bac0a
[formerly f53f702b9e
[formerly 58d020c1b09b4f5efc1fc9b558ef7defef80adba]]]]
Former-commit-id: c3f48bac0a
Former-commit-id: 3555a55bda
[formerly 4bdec4b2bb
] [formerly efa98dc017879571de4c3992f60b9a80924bd274 [formerly 1017dfae5b
]]
Former-commit-id: 028655e89b75a3bb704036327e99d1ed4a519937 [formerly 236ec98da1
]
Former-commit-id: 364a7ec1b6
2013-07-09 14:01:13 -05:00
Brad Gonzales
86569acffd
Issue #1965 Changed to use File.delete() instead of Apache FileUtil.deleteQuietly().
...
Amend: Update from peer review.
Change-Id: Ia58b75f8f8be62f3aaddbe46aed5558714d276bd
Former-commit-id: cc89d3939d
[formerly 2ced007de9
] [formerly b462162996
] [formerly cc89d3939d
[formerly 2ced007de9
] [formerly b462162996
] [formerly 503d6d6cca
[formerly b462162996
[formerly defb699314eec545eff3b3b603b059ef05ac1a23]]]]
Former-commit-id: 503d6d6cca
Former-commit-id: 2a3706a8f1
[formerly 222965ca7f
] [formerly ece70e73a38f366159776702fbedeee0c1c366ee [formerly 4f80abebaa
]]
Former-commit-id: 84d33297e2e3c72a87a8cbf7c52ee2f49f1d1d66 [formerly 6de2098f63
]
Former-commit-id: 1405b1f061
2013-07-09 09:07:38 -05:00
Greg Armendariz
5e1549062b
13.5.1-5 baseline
...
Former-commit-id: ed9da994c7
[formerly 82aabf1066
] [formerly 492f92ef7b
] [formerly ed9da994c7
[formerly 82aabf1066
] [formerly 492f92ef7b
] [formerly ea7ac37930
[formerly 492f92ef7b
[formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]]
Former-commit-id: ea7ac37930
Former-commit-id: d5bea0fc06
[formerly d899faec3d
] [formerly 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82
]]
Former-commit-id: 22058c6a24f6da687ba40d05b28790e525082567 [formerly dc881f4ed8
]
Former-commit-id: 13ac0b1062
2013-07-03 12:20:27 -04:00
Roger Ferrel
9eb3cffa65
Issue #1964 clean up of features and manifest.
...
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548
Former-commit-id: 559a54ea8f
[formerly 3c31d8c2ac
] [formerly 41c46e14c0
] [formerly 559a54ea8f
[formerly 3c31d8c2ac
] [formerly 41c46e14c0
] [formerly 7d3362d2b5
[formerly 41c46e14c0
[formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]]]
Former-commit-id: 7d3362d2b5
Former-commit-id: 56b1a0713c
[formerly b3437266d7
] [formerly 8c2a8d0c95f2cee23027bf633469a1a45f0b1e94 [formerly 201e62a4ad
]]
Former-commit-id: ead9e92b266c6bc5d2a1e8b5c9c7e8b4d7cb051d [formerly ea00a52ebe
]
Former-commit-id: 1d3ee09895
2013-07-02 11:14:56 -05:00
Richard Peter
6434a4025d
Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
edexOsgi/com.raytheon.uf.common.archive/build.properties
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java
Former-commit-id: 4ee66ab1f0
[formerly da54766cc8
] [formerly 53258be797
] [formerly 4ee66ab1f0
[formerly da54766cc8
] [formerly 53258be797
] [formerly 582f38bdd4
[formerly 53258be797
[formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]]
Former-commit-id: 582f38bdd4
Former-commit-id: 0da7509e6d
[formerly 69f8807963
] [formerly ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee
]]
Former-commit-id: 1478532c079d144368b91a4562993c9aac0b7cd4 [formerly 7ceb1bb9ab
]
Former-commit-id: da3eb1e75c
2013-06-30 23:46:32 -05:00
Brad Gonzales
7c8f8a018c
Issue #1965 added edex archive to the build.edex build.xml.
...
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b
Former-commit-id: f95cf443d5
[formerly 2d1c6a0ec5
] [formerly ba661b9e39
] [formerly f95cf443d5
[formerly 2d1c6a0ec5
] [formerly ba661b9e39
] [formerly add108398a
[formerly ba661b9e39
[formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]]
Former-commit-id: add108398a
Former-commit-id: fb8caf6e22
[formerly bc766efb7a
] [formerly 15de9e7faee3482eda51d0109f76645b35fd25bc [formerly 5c9ce05ce3
]]
Former-commit-id: 795e5b8c49c2e0a6a652dcc5f274ef5fb1e2f348 [formerly c4daf04c32
]
Former-commit-id: 245de9c408
2013-06-28 13:25:46 -05:00
Steve Harris
9f5469bc6e
13.5.1-4 baseline
...
Former-commit-id: 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly e197f23ce3
[formerly 70e4ff30a6
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901
[formerly 640b022e84
] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357
]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922
]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Brad Gonzales
8e22010180
Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive.
...
Amend: Added archive feature to the viz product build.
Added archive feature to the viz developer product.
Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07
Former-commit-id: aca1486801
[formerly 65507d4424
] [formerly c28d1e5d4d
] [formerly aca1486801
[formerly 65507d4424
] [formerly c28d1e5d4d
] [formerly f4bb78381c
[formerly c28d1e5d4d
[formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]]
Former-commit-id: f4bb78381c
Former-commit-id: 1c6ca60919
[formerly 6e99019a25
] [formerly 5f9272a26bf176a83743b4b654221c8613a071d6 [formerly d842d8d9d0
]]
Former-commit-id: 41beba358fca549dca62c32eff3862ee1f765033 [formerly f51c74e2d4
]
Former-commit-id: 33dc495040
2013-06-27 17:40:07 -05:00
Brad Gonzales
d706ff2334
Issue #1965 added File filtering by file date extension in archive purge.
...
Amend: updated purge cron time to once every hour.
moved archive.purge.cron to cron.properties.
removed purge code from DataArchiver.
added back isHoursToKeep in DataArchiver.
updated CategoryFileDateHelper for CategoryConfig dirPattern lists.
updates from peer review.
updated test cases to work with Roger's refactoring.
fixes for ArchiveConfigManager createArchive.
clean up of ArchiveConfigManager purgeFile.
Change-Id: I096c2a103211caab7b7ec00f18111077cfe3e519
Former-commit-id: 90f363d722
[formerly 67b4a2e202
] [formerly 137c66539e
] [formerly 90f363d722
[formerly 67b4a2e202
] [formerly 137c66539e
] [formerly 276f05233f
[formerly 137c66539e
[formerly 2094b7f9fde97873c759da217498bcf62254a287]]]]
Former-commit-id: 276f05233f
Former-commit-id: df7670676b
[formerly d6fb315096
] [formerly ca13651aece598f209306490fbd73fd98936b032 [formerly 4f54596904
]]
Former-commit-id: 450a3eb9f6de7a580368b452e78efb57b1066c68 [formerly d047e6a137
]
Former-commit-id: 9a5c3e259d
2013-06-27 11:46:44 -05:00
Roger Ferrel
667104c43e
Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up.
...
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3
Former-commit-id: 713f39c429
[formerly 6f07f6f3bd
] [formerly ee409c0819
] [formerly 713f39c429
[formerly 6f07f6f3bd
] [formerly ee409c0819
] [formerly f66681f62b
[formerly ee409c0819
[formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]]]
Former-commit-id: f66681f62b
Former-commit-id: 79c0bbb140
[formerly 5f35643c2d
] [formerly 91667b1a98b4d6dfebf3dbfd34ceea45670f8fe7 [formerly 45dcfe3ad8
]]
Former-commit-id: d681469cf5de2614b883cebf316eab2fd929d808 [formerly bec6928ea9
]
Former-commit-id: 6261e65829
2013-06-27 07:51:56 -05:00
Roger Ferrel
2033689544
Issue #1966 Initial Base configuration files for Dale Morris to test.
...
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1
Former-commit-id: 89d4d0e00f
[formerly 1e5d68fa1b
] [formerly 2cfff5c563
] [formerly 89d4d0e00f
[formerly 1e5d68fa1b
] [formerly 2cfff5c563
] [formerly c10f5c8d65
[formerly 2cfff5c563
[formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]]
Former-commit-id: c10f5c8d65
Former-commit-id: 4b10182a2e
[formerly 318de198e5
] [formerly d9addb5bf5fa26124cfaff35dda1e82f91b54f70 [formerly ee52f0281c
]]
Former-commit-id: 1a640f5700b34cc1839d0294b48e0f419bc80aa2 [formerly b681d07346
]
Former-commit-id: 3419cbaddd
2013-06-25 13:44:30 -05:00
Richard Peter
7ef16a186e
Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
rpms/build/i386/build.sh
Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24
Former-commit-id: f47f42e31e
[formerly 0fa3bf800d
] [formerly 744eb64856
] [formerly f47f42e31e
[formerly 0fa3bf800d
] [formerly 744eb64856
] [formerly 37645245e5
[formerly 744eb64856
[formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]]
Former-commit-id: 37645245e5
Former-commit-id: 46ee2f5dd7
[formerly be094a1745
] [formerly 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93
]]
Former-commit-id: cacc5fb146cf2c652dd6ad6ea3b7938c9d320b73 [formerly 4b582fef50
]
Former-commit-id: 9acddf6eeb
2013-06-24 18:36:15 -05:00
Steve Harris
d3517d7c1d
13.5.1-3 baseline
...
Former-commit-id: a0ff6c20ea
[formerly d8176d4a4c
] [formerly 63803c1424
] [formerly a0ff6c20ea
[formerly d8176d4a4c
] [formerly 63803c1424
] [formerly 72d22a30c9
[formerly 63803c1424
[formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0
[formerly deebdb874a
] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a
]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5
]
Former-commit-id: 50d4376af7
2013-06-24 09:29:43 -04:00