Steve Harris
|
7fe9a58d57
|
Revert "12.6.1-10 baseline"
This reverts commit 5e91955d3e [formerly 8d09188a88] [formerly 95e7f4fc0c] [formerly a24f1f25a14bed9bbb27ae4bb1ba2c94d5748ded [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba] [formerly 95e7f4fc0c [formerly aecc6a8474]]] [formerly 52485562d5 [formerly 530dfc0563] [formerly f8497470fc] [formerly 2372c92775c3da4bd583f67747423445dd275d92 [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2] [formerly f8497470fc [formerly b33c5bdfcf]]]] [formerly a2c0893d1a] [formerly 73e2ffe14a [formerly 16fd236f2d] [formerly 06f1c7b73c] [formerly 06f1c7b73c [formerly ddde63eee0]] [formerly 73e2ffe14a [formerly 16fd236f2d] [formerly 06f1c7b73c] [formerly 06f1c7b73c [formerly ddde63eee0]] [formerly a2c0893d1a [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]]].
Former-commit-id: de6731783f [formerly 584f7eddf8] [formerly 62cf6a9f92] [formerly 62cf6a9f92 [formerly b4b1f6975f]] [formerly de6731783f [formerly 584f7eddf8] [formerly 62cf6a9f92] [formerly 62cf6a9f92 [formerly b4b1f6975f]] [formerly 25198a5cd6 [formerly 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: b6676b4891 [formerly 944e3148d4] [formerly 333fd9c64e] [formerly 52fbe497a04b79a27ebe426d8038138245d04be0 [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981] [formerly 333fd9c64e [formerly 8367fb50f5]]]
Former-commit-id: 49c8cb538b54b7cf4cf5c708ee63b28a3e79dbd3 [formerly 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a] [formerly e77a15c047 [formerly 75f77df418]]
Former-commit-id: e77a15c047
Former-commit-id: c7356570ae
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
5e91955d3e
|
12.6.1-10 baseline
Former-commit-id: 73e2ffe14a [formerly 16fd236f2d] [formerly 06f1c7b73c] [formerly 06f1c7b73c [formerly ddde63eee0]] [formerly 73e2ffe14a [formerly 16fd236f2d] [formerly 06f1c7b73c] [formerly 06f1c7b73c [formerly ddde63eee0]] [formerly a2c0893d1a [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 52485562d5 [formerly 530dfc0563] [formerly f8497470fc] [formerly 2372c92775c3da4bd583f67747423445dd275d92 [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2] [formerly f8497470fc [formerly b33c5bdfcf]]]
Former-commit-id: a24f1f25a14bed9bbb27ae4bb1ba2c94d5748ded [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba] [formerly 95e7f4fc0c [formerly aecc6a8474]]
Former-commit-id: 95e7f4fc0c
Former-commit-id: 8d09188a88
|
2012-06-21 08:38:48 -05:00 |
|
Steve Harris
|
1ca6770734
|
12.6.1-5 baseline
Former-commit-id: 3cb550e019 [formerly 1ad64ffa98] [formerly 09f73b0601] [formerly 09f73b0601 [formerly c99afab05f]] [formerly 3cb550e019 [formerly 1ad64ffa98] [formerly 09f73b0601] [formerly 09f73b0601 [formerly c99afab05f]] [formerly 8947efbc7f [formerly 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: 32effe24e5 [formerly d5c94ccef2] [formerly b69fa75919] [formerly 75c4c7d14cbef46abcce4acb1604d4b730fd79e2 [formerly 1cc870696aedf27ab003448e1146bd540b248a33] [formerly b69fa75919 [formerly a945ed8e6d]]]
Former-commit-id: 6391c41aadc47280c8ac82a432cb1defe5bb8fd6 [formerly fc6eb550115880692c0f2fd68727ccec55d0eef7] [formerly 3b468d9f50 [formerly 91e65230ad]]
Former-commit-id: 3b468d9f50
Former-commit-id: 883d66bc46
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
4d74dcd505
|
12.6.1-3 baseline
Former-commit-id: e9e5b0e3b9 [formerly bc96eba820] [formerly 7c5306b795] [formerly 7c5306b795 [formerly 42f3513175]] [formerly e9e5b0e3b9 [formerly bc96eba820] [formerly 7c5306b795] [formerly 7c5306b795 [formerly 42f3513175]] [formerly d57eb02b9e [formerly 7c5306b795 [formerly 42f3513175] [formerly d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 9195a172de [formerly 471fa3ac04] [formerly 32c0464d79] [formerly ba2aee0c1363c0ee5cc1308f400105a1d35f44b6 [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de] [formerly 32c0464d79 [formerly 1fdc0aa237]]]
Former-commit-id: 58c76a7c5d1891ba84104988e83482eaf85fd88b [formerly 47799c2c228b75794e62bf6b17a80d2d42cdf2cc] [formerly 518fa79f7f [formerly ca8baf18a3]]
Former-commit-id: 518fa79f7f
Former-commit-id: 581546a5eb
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
5b24158b1a
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: d1a8d4ceb6 [formerly 975053c3dc] [formerly c7024992a3] [formerly c7024992a3 [formerly 37793c86b1]] [formerly d1a8d4ceb6 [formerly 975053c3dc] [formerly c7024992a3] [formerly c7024992a3 [formerly 37793c86b1]] [formerly d325d496f5 [formerly c7024992a3 [formerly 37793c86b1] [formerly d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]]
Former-commit-id: d325d496f5
Former-commit-id: 32f90ec181 [formerly 5e0e2d2c48] [formerly 23c34c469a] [formerly d6d81bb74e7bd36d2212643046a21315090c4d6d [formerly 788e16ce64aaeca91000aa565d43e89a27246362] [formerly 23c34c469a [formerly cf3c768213]]]
Former-commit-id: 306a4d3b8c6bf29336d4965a268bd33e6a0bbac6 [formerly bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b] [formerly c01b096242 [formerly 3dd5b84aa2]]
Former-commit-id: c01b096242
Former-commit-id: b54ad5af66
|
2012-06-11 15:24:03 -05:00 |
|
Steve Harris
|
7eaa5ba208
|
12.5.1-15 baseline
Former-commit-id: 015a8da70c [formerly 2f10c7a1e4] [formerly 8552902906] [formerly 8552902906 [formerly b13cbb7e00]] [formerly 015a8da70c [formerly 2f10c7a1e4] [formerly 8552902906] [formerly 8552902906 [formerly b13cbb7e00]] [formerly 3904c4ccf5 [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 8ccf4a080b [formerly 1f521a70b3] [formerly 97c4db937e] [formerly 97da88e714a2380193993a8566392a59d8676bcd [formerly 0e40eb424698bf43c230ac21347627590405fcb2] [formerly 97c4db937e [formerly 676ea3192f]]]
Former-commit-id: af467b247de91107ea43705eb1f608a755f6dd75 [formerly 5dd364497cd5da1357297a4b842e962ad3d5e006] [formerly 39ff9954f8 [formerly 9054c5ab6c]]
Former-commit-id: 39ff9954f8
Former-commit-id: 46068c6716
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
1d096ecdcb
|
12.5.1-9 baseline
Former-commit-id: 2ec50a1f07 [formerly 45773fbee0] [formerly b8de76b45e] [formerly b8de76b45e [formerly 8f3c9ebfb7]] [formerly 2ec50a1f07 [formerly 45773fbee0] [formerly b8de76b45e] [formerly b8de76b45e [formerly 8f3c9ebfb7]] [formerly 1f542697cb [formerly b8de76b45e [formerly 8f3c9ebfb7] [formerly 1f542697cb [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]]]]
Former-commit-id: 1f542697cb
Former-commit-id: ed1cd56a61 [formerly dbedcc229c] [formerly d23b0e4d60] [formerly 25e7b61710e1c5ae4c073585546e3e20caf975a9 [formerly 7f45c65c47eed82c8ae433d59f2e859d5e1df5a0] [formerly d23b0e4d60 [formerly ce0422a34a]]]
Former-commit-id: ec1db4e50b10175288e4afa08878cf19727b01dd [formerly 6decc15480698e9232071e71afd1e40f6e166fd7] [formerly ee7b53c7c4 [formerly 399c00d295]]
Former-commit-id: ee7b53c7c4
Former-commit-id: 17403e71d1
|
2012-05-21 17:48:55 -05:00 |
|
Steve Harris
|
3fc537d67e
|
12.5.1-6 baseline
Former-commit-id: 52146bb275 [formerly ba6d779949] [formerly df80148db6] [formerly df80148db6 [formerly 24474489f9]] [formerly 52146bb275 [formerly ba6d779949] [formerly df80148db6] [formerly df80148db6 [formerly 24474489f9]] [formerly fa87dc6cf1 [formerly df80148db6 [formerly 24474489f9] [formerly fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 0bec18726b [formerly bc695ee025] [formerly 4792884ab2] [formerly e5889101c1617876391de1f0064553387e08a4de [formerly 0fa00c0acf0db00500f5839edb5595f4cd6535d5] [formerly 4792884ab2 [formerly c452cce633]]]
Former-commit-id: d01e9cccea8dcf60b6bf51ed0348c381abbddd6d [formerly 61f9f0b1d1e0d73dbd8918f64faa0a6bc9672dfa] [formerly 26ed02c3dc [formerly 2738af2019]]
Former-commit-id: 2cc3837cda5a1875493d54f78aa421e30c5337a7 [formerly 26ed02c3dc]
Former-commit-id: e460104ec9
|
2012-05-16 16:41:22 -05:00 |
|
Steve Harris
|
11cc56414b
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: 0e63553a4e [formerly fc70139990] [formerly d7f7c26582] [formerly d7f7c26582 [formerly 092efd6072]] [formerly 0e63553a4e [formerly fc70139990] [formerly d7f7c26582] [formerly d7f7c26582 [formerly 092efd6072]] [formerly 31b3e87ffa [formerly d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: c0b0635685 [formerly fe7ac96625] [formerly 53d2822329] [formerly 048a3c43e8a28b1b07994254af460254ea55cc66 [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2] [formerly 53d2822329 [formerly 98447412f8]]]
Former-commit-id: 8fe8181a1f28813581a1a402cf07d262c33c769f [formerly 3940ab38fea505f445ec4019600081324e15e68d] [formerly d040b14742 [formerly 7ee04eb560]]
Former-commit-id: 5576c8f65a9bb6c15ab79ac134243f83cc00f1be [formerly d040b14742]
Former-commit-id: 2f6ae50479
|
2012-05-09 13:19:47 -05:00 |
|
Dave Hladky
|
8cf4e198d8
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: c65a513956 [formerly 37da8763eb] [formerly 42a12fa7a5] [formerly 42a12fa7a5 [formerly 1b7473572f]] [formerly c65a513956 [formerly 37da8763eb] [formerly 42a12fa7a5] [formerly 42a12fa7a5 [formerly 1b7473572f]] [formerly 5b7ecea866 [formerly 42a12fa7a5 [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]]]
Former-commit-id: 5b7ecea866
Former-commit-id: ee398599d3 [formerly 9ae2445f9f] [formerly a1a3a361dd] [formerly fb4b60ce75ec21ac24b4f25cf551a798f2d1c47c [formerly d98bc5d5887a016d68a6737704a6fb5e552d838c] [formerly a1a3a361dd [formerly 61e31c62ff]]]
Former-commit-id: 9fb7a3ca25c80ef626e0fa6e4ac5b7888906ee34 [formerly 07953e4b449645e4adcfef80f1595ec0513eb00f] [formerly 7fc0c65ef4 [formerly d2e16d486b]]
Former-commit-id: 7fc0c65ef4
Former-commit-id: 8f500ff6d6
|
2012-04-30 13:43:34 -05:00 |
|
Steve Harris
|
26b250dbd1
|
12.4.1-4 baseline
Former-commit-id: 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 2a216f333c [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 6456a7f75f [formerly 98d8b3f188] [formerly a2a6a18fae] [formerly 8177a31ae65520dcaf2978b703dc497369e03cf1 [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b] [formerly a2a6a18fae [formerly a4e519f3cd]]]
Former-commit-id: a5e6e414f62a4ad9f7e0da4037f64ad5885e2f16 [formerly 816045b74a6ddb3791f4e241a6f25a4d4ab3391a] [formerly 74b66d9683 [formerly 8cd5974f4c]]
Former-commit-id: 74b66d9683
Former-commit-id: 5b35d8a6e0
|
2012-04-18 15:18:16 -05:00 |
|
Richard Peter
|
db11d13aba
|
Merge "Issue #449. Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge
Former-commit-id: c2d2b22326 [formerly 2f351f13f7] [formerly 5bb20ff4a3] [formerly 5bb20ff4a3 [formerly 709be7733b]] [formerly c2d2b22326 [formerly 2f351f13f7] [formerly 5bb20ff4a3] [formerly 5bb20ff4a3 [formerly 709be7733b]] [formerly be060f1b1c [formerly 5bb20ff4a3 [formerly 709be7733b] [formerly be060f1b1c [formerly 2a3492987c4cd9751aad2c6e20230f983e68f4b5]]]]]
Former-commit-id: be060f1b1c
Former-commit-id: bdbfb68438 [formerly a8ab19c6f2] [formerly 9c49c39669] [formerly d03497af0e25256d8eab2e580f7cf8609279c5ff [formerly 17dcac1fcd432101a572e81e1a87d3a53a7d0082] [formerly 9c49c39669 [formerly 4a93a365bd]]]
Former-commit-id: 249ab53464e876c735b523ac36dc1ef7d5285b97 [formerly bd06abc51621344835c54065591dda85b12a90ec] [formerly 58e6f4140d [formerly 797ee329df]]
Former-commit-id: 58e6f4140d
Former-commit-id: daa9ee3dff
|
2012-04-17 13:16:22 -05:00 |
|
Slav Korolev
|
4aeeb6ea0a
|
Issue #449. Fixed problem with simulated time for trend plots in FSS
monitors.
Former-commit-id: d2d90e983b [formerly 273abf0ca5] [formerly bf5cf6a903] [formerly bf5cf6a903 [formerly 8d29726365]] [formerly d2d90e983b [formerly 273abf0ca5] [formerly bf5cf6a903] [formerly bf5cf6a903 [formerly 8d29726365]] [formerly f02da69ff5 [formerly bf5cf6a903 [formerly 8d29726365] [formerly f02da69ff5 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]]]]]
Former-commit-id: f02da69ff5
Former-commit-id: 9bf67efb3b [formerly c158df01f8] [formerly 45d4f9fb86] [formerly aa1d81a6dd1d95b9414fe135fa832691621e3bc1 [formerly 7c520a3f99ccdf1fa13ed92436ba78b85df449ea] [formerly 45d4f9fb86 [formerly 47ba302180]]]
Former-commit-id: 115a8883c6eafe7c062678cbd2d36d3b268841ce [formerly c1d0302c1c23c128a04ea83683fe62afda4fd4b2] [formerly 55a9ed9a51 [formerly d82def7b22]]
Former-commit-id: 55a9ed9a51
Former-commit-id: a969ff8908
|
2012-04-09 14:50:19 -04:00 |
|
Steve Harris
|
d65c735c86
|
12.3.1-10 baseline
Former-commit-id: 5472b5f6bf [formerly 760ead2047] [formerly 0e4128712b] [formerly 0e4128712b [formerly 4068f5295f]] [formerly 5472b5f6bf [formerly 760ead2047] [formerly 0e4128712b] [formerly 0e4128712b [formerly 4068f5295f]] [formerly 22bd792cd9 [formerly 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 9040a25874 [formerly 11e448aa39] [formerly 8bc60b1e32] [formerly 3e193521c411a17ef80f24b5b3bd6a97095eebb1 [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477] [formerly 8bc60b1e32 [formerly ce3b74c605]]]
Former-commit-id: c2ed7a8e2edbab4334786836e94907cb69c3a9cc [formerly cdb2bb52e23fe42c5a5b48dfdf59046836f2f615] [formerly 293563cfe7 [formerly 2e0f4b241b]]
Former-commit-id: 293563cfe7
Former-commit-id: 9340618732
|
2012-03-30 08:38:33 -05:00 |
|
Matt Nash
|
1b128de135
|
Moving 12.1.1 into ss_sync
Former-commit-id: 6bcbc7d8ef [formerly d8da2252c3] [formerly 580e2938d7] [formerly 580e2938d7 [formerly 66be3bec40]] [formerly 6bcbc7d8ef [formerly d8da2252c3] [formerly 580e2938d7] [formerly 580e2938d7 [formerly 66be3bec40]] [formerly c83e5ff474 [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]]
Former-commit-id: c83e5ff474
Former-commit-id: 50944163ba [formerly fa4cd88c90] [formerly 82300ccdcf] [formerly bcc32c10bc [formerly 21d2361f00] [formerly 82300ccdcf [formerly 1faae42484]]]
Former-commit-id: bcc32c10bc [formerly 21d2361f00]
Former-commit-id: bcc32c10bc
Former-commit-id: 515196cb86
|
2012-01-19 11:53:12 -06:00 |
|
root
|
57877615f5
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 06a8b51d6d [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 2c3569dd39 [formerly 9bb8decbcf] [formerly 8e80217e59] [formerly e2ecdcfe33 [formerly 377dcd10b9] [formerly 8e80217e59 [formerly 3360eb6c5f]]]
Former-commit-id: e2ecdcfe33 [formerly 377dcd10b9]
Former-commit-id: e2ecdcfe33
Former-commit-id: 7dbd17a5aa
|
2012-01-06 08:55:05 -06:00 |
|