Max Schenkelberg
|
7c00da5089
|
Issue #2277 Remove more ScriptCreator references
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747
Former-commit-id: 8b8f5bcb4f [formerly 84377d3e8c] [formerly 487775918d] [formerly 487775918d [formerly 17b38d9f72]] [formerly 8b8f5bcb4f [formerly 84377d3e8c] [formerly 487775918d] [formerly 487775918d [formerly 17b38d9f72]] [formerly 63e90f6955 [formerly 487775918d [formerly 17b38d9f72] [formerly 63e90f6955 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]]]]]
Former-commit-id: 63e90f6955
Former-commit-id: 0f5d2a78ae [formerly bfb43525f4] [formerly 96852b88ec] [formerly ee6c3b46418a95db4d90f6c5278faca5d5ac5297 [formerly 59063b336b6f01e333d1863cd1bfa081ea66cd8d] [formerly 96852b88ec [formerly e4b18ef410]]]
Former-commit-id: b4b150f42bcc403c9d1ec28d9b339d5b98c1a2b8 [formerly bbd77f752997e583b5b69ab5e3012b80b3da1622] [formerly 00364668a4 [formerly 87d33eb32f]]
Former-commit-id: 00364668a4
Former-commit-id: b5300b8f15
|
2013-09-11 16:32:00 -05:00 |
|
David Gillingham
|
3f4e85e123
|
Issue #2262: Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
Java. Convert to use of these new methods where possible. Create unit tests.
Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d
Former-commit-id: 6f33dfc736 [formerly bd9b224ff5] [formerly c17f8b4409] [formerly c17f8b4409 [formerly 0b6b0e06cc]] [formerly 6f33dfc736 [formerly bd9b224ff5] [formerly c17f8b4409] [formerly c17f8b4409 [formerly 0b6b0e06cc]] [formerly 40b5d54bf3 [formerly c17f8b4409 [formerly 0b6b0e06cc] [formerly 40b5d54bf3 [formerly 5992197809236553e9c021526e42d28ed327b413]]]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 1b480fcc4d [formerly 218ec39696] [formerly 9c656c28b9] [formerly 2125b63344364089b916887a86c7ec9e3cbcce63 [formerly 677ad3a406560b6ea868401e4fe7be87a4817e25] [formerly 9c656c28b9 [formerly 8d347252d2]]]
Former-commit-id: a1fd2652354d2af1a0b83fc2fa60a853a69b4797 [formerly c1a7c1d2b9b5f35177db262289e7dc470702f3ad] [formerly a217ce6044 [formerly f46f62ff2e]]
Former-commit-id: a217ce6044
Former-commit-id: 2e5e666153
|
2013-08-15 11:30:45 -05:00 |
|
Nate Jensen
|
f94c950804
|
Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c
Former-commit-id: af358f6fe2 [formerly 178107c128] [formerly bcdaae1922] [formerly bcdaae1922 [formerly 22438766b4]] [formerly af358f6fe2 [formerly 178107c128] [formerly bcdaae1922] [formerly bcdaae1922 [formerly 22438766b4]] [formerly 4c9cc211ec [formerly bcdaae1922 [formerly 22438766b4] [formerly 4c9cc211ec [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: 31e13f0cf5 [formerly 78e718122d] [formerly a51d424851] [formerly 9eed93c9515cb0ec015ed44f40dab04dde618090 [formerly 3dc4b88484b3a717a07e85e47dd00b4cd0dcaaee] [formerly a51d424851 [formerly 797760bb71]]]
Former-commit-id: 92475a017bdeab4e7c8668c9421bac76e76ae688 [formerly c97be13fa7db2191a5a8ef2ef39d349d3dc46e1b] [formerly 3e7f3c66a8 [formerly c28a52bee8]]
Former-commit-id: 3e7f3c66a8
Former-commit-id: 325654d640
|
2013-07-22 12:20:43 -05:00 |
|
Max Schenkelberg
|
b1a5c51237
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 5e50837d4c [formerly cd88054e2b] [formerly 94fa6f0e30] [formerly 94fa6f0e30 [formerly 63421a4819]] [formerly 5e50837d4c [formerly cd88054e2b] [formerly 94fa6f0e30] [formerly 94fa6f0e30 [formerly 63421a4819]] [formerly 50825200a1 [formerly 94fa6f0e30 [formerly 63421a4819] [formerly 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]]
Former-commit-id: 50825200a1
Former-commit-id: 04f82b063f [formerly f025c05d04] [formerly d1881ffa51] [formerly f2a28ca47fdd75f8c3b1d3ff2694ff5c589ea2c2 [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f] [formerly d1881ffa51 [formerly 1610826d2e]]]
Former-commit-id: 0cb89f5ac334e5eca960f634833c12e40bf541ef [formerly a38fe0e4cd744ea32b4c88e97305cabc3dbac06f] [formerly 5ba50b4476 [formerly a47f187f4f]]
Former-commit-id: 5ba50b4476
Former-commit-id: ad32bbd91d
|
2013-07-15 14:26:15 -05:00 |
|
Steve Harris
|
5dac0b2fc0
|
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: edf9cdad39 [formerly 3ec20c1689] [formerly 61a19a460b] [formerly 61a19a460b [formerly 305dd72969]] [formerly edf9cdad39 [formerly 3ec20c1689] [formerly 61a19a460b] [formerly 61a19a460b [formerly 305dd72969]] [formerly 57f42761d7 [formerly 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 0192d8db81 [formerly 7ff64bf8cc] [formerly b423579e4a] [formerly 440becff6c9991032ebd9ae7879765c36112a5f0 [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c] [formerly b423579e4a [formerly a8e1557c62]]]
Former-commit-id: 80e385fafa882a8927d2b3ebdec5e7f9bf7cdf13 [formerly 276acc0cf2f69b884f078f338890570213eec929] [formerly d842ed88a7 [formerly b630339eb7]]
Former-commit-id: d842ed88a7
Former-commit-id: 2104c8b533
|
2013-03-05 12:27:49 -06:00 |
|
Steve Harris
|
05db9b8904
|
13.3.1-5 baseline
Former-commit-id: d37129e5c6 [formerly e4a1c61ad5] [formerly 8123d5ac45] [formerly 8123d5ac45 [formerly a89221c75b]] [formerly d37129e5c6 [formerly e4a1c61ad5] [formerly 8123d5ac45] [formerly 8123d5ac45 [formerly a89221c75b]] [formerly e26f7eb151 [formerly 8123d5ac45 [formerly a89221c75b] [formerly e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]]
Former-commit-id: e26f7eb151
Former-commit-id: 03ffc359fb [formerly aabd5cd51f] [formerly a240379588] [formerly b670e107919a03a4c3a0d0aefa93fc97cf46b7a2 [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170] [formerly a240379588 [formerly a40c9136fe]]]
Former-commit-id: 2d92b684aca8e0a0ef133ce949f3776762ef52f8 [formerly 8b4bd6790f2136380dbac557b452d873c77bacc6] [formerly 79ff805090 [formerly 1f98e01c57]]
Former-commit-id: 79ff805090
Former-commit-id: f20c87110e
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
418c06202c
|
Merge branch 'development' into omaha_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: e4a0759555 [formerly abdc733151] [formerly 64744fdb19] [formerly 64744fdb19 [formerly a0573644c4]] [formerly e4a0759555 [formerly abdc733151] [formerly 64744fdb19] [formerly 64744fdb19 [formerly a0573644c4]] [formerly 2641d578e2 [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 09d69dbd9a [formerly 7e48d3e684] [formerly 4f155a183a] [formerly 8f5f5cac829fb199ef190abb566cd001cea1b223 [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b] [formerly 4f155a183a [formerly 33dd2589f1]]]
Former-commit-id: 3ec373f83d89d49802de9d70b75cd01681b92a5d [formerly 52ef36f1490e95f8582d69438eed38f21061eafb] [formerly b5d9e75b95 [formerly f3c3191a1c]]
Former-commit-id: b5d9e75b95
Former-commit-id: 34d0f59592
|
2013-02-21 15:41:39 -06:00 |
|
Steve Harris
|
915a15006f
|
13.3.1-1 baseline
Former-commit-id: 6ffa036f05 [formerly e0406d3183] [formerly 8ae397085e] [formerly 8ae397085e [formerly 71e8990021]] [formerly 6ffa036f05 [formerly e0406d3183] [formerly 8ae397085e] [formerly 8ae397085e [formerly 71e8990021]] [formerly d2a654625f [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]]
Former-commit-id: d2a654625f
Former-commit-id: ea9303b160 [formerly db712e1fcf] [formerly e4435815c9] [formerly c996cf8cb561399a370ef3580c705465d6fa20ac [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0] [formerly e4435815c9 [formerly 46d28be4a4]]]
Former-commit-id: 4e2c476e2dfb865dde40c9f94f4d16824ed729f6 [formerly 30806b31de967d82824f245a2f6cb89f081cfd19] [formerly 8c828dbd75 [formerly b3b56830b0]]
Former-commit-id: 35d8262ef1ba032fcf5d8ea707ad15ee533bd1a9 [formerly 8c828dbd75]
Former-commit-id: fac2d20002
|
2013-02-20 16:19:40 -06:00 |
|
Roger Ferrel
|
2facecba39
|
Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg.
Change-Id: Ia57cfe88e22544260bbc03483b4c852843f67b42
Former-commit-id: 10a2b86fbe [formerly 3275e6adfe] [formerly 24c88a1673] [formerly 24c88a1673 [formerly 130fa3f73d]] [formerly 10a2b86fbe [formerly 3275e6adfe] [formerly 24c88a1673] [formerly 24c88a1673 [formerly 130fa3f73d]] [formerly 873f932f8e [formerly 24c88a1673 [formerly 130fa3f73d] [formerly 873f932f8e [formerly 64c6e3b9812dc7232bd36feff181805c4fd504d9]]]]]
Former-commit-id: 873f932f8e
Former-commit-id: 61ad148769 [formerly 26059ae7e0] [formerly 940d442f6f] [formerly df67dfcc96589ebcaae53adfddd4c1124b480881 [formerly 55ef04696c780948659739ded23b8f7dfe6ff66c] [formerly 940d442f6f [formerly f30b5846c1]]]
Former-commit-id: d8ed99fae3fbd1e76acde7aaf2db81e5e3f18f21 [formerly 3ca8ee1793c0ddeed4459318c7900a91dedca32b] [formerly 06db554bbe [formerly 0f1f4fb42f]]
Former-commit-id: 06db554bbe
Former-commit-id: 1384a98c4c
|
2013-02-07 12:46:01 -06:00 |
|
Steve Harris
|
ccbd8dde52
|
13.2.1-2 baseline
Former-commit-id: 79c717ca60 [formerly a4fa438a41] [formerly 33bc5fd816] [formerly 33bc5fd816 [formerly 83e9157df7]] [formerly 79c717ca60 [formerly a4fa438a41] [formerly 33bc5fd816] [formerly 33bc5fd816 [formerly 83e9157df7]] [formerly 328c6dccad [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]]
Former-commit-id: 328c6dccad
Former-commit-id: 19f4c6b47d [formerly ce726fadc7] [formerly d9be4dce21] [formerly 2627373644ec7ef09825bbc0c168afd0abd1a3fe [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050] [formerly d9be4dce21 [formerly 47cc08ac79]]]
Former-commit-id: dc8171a7281c254994a85334494b23b7e0b2a8db [formerly 281ab815ed143a9ff49cedae7054da06195e3c69] [formerly 2779f5c6d9 [formerly 547c1dedd1]]
Former-commit-id: 2779f5c6d9
Former-commit-id: b92dfd1b62
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
2827d6bd6e
|
13.1.2-2 baseline
Former-commit-id: e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly 4ba416aeb3 [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 771913b0c7 [formerly 82cdde8491] [formerly cd4185ef5c] [formerly 315d42e07d543cb65d6e601e1e21011082db86e5 [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a] [formerly cd4185ef5c [formerly 941337c553]]]
Former-commit-id: 5cd56308fe7c05824700e702851648ed30cdff6e [formerly c69e1900269e630aefc061c2464bc8fea1c9776a] [formerly f52ec0b0a0 [formerly b6fa9b4858]]
Former-commit-id: f52ec0b0a0
Former-commit-id: 745f2c6409
|
2013-01-06 14:32:24 -06:00 |
|
Slav Korolev
|
50a44e789a
|
Issue #1351. Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file.
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6
Former-commit-id: a7ef077d06 [formerly 466abfbc1c] [formerly 829899374d] [formerly 829899374d [formerly 48f074eb72]] [formerly a7ef077d06 [formerly 466abfbc1c] [formerly 829899374d] [formerly 829899374d [formerly 48f074eb72]] [formerly 1a510a9f61 [formerly 829899374d [formerly 48f074eb72] [formerly 1a510a9f61 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]]]]]
Former-commit-id: 1a510a9f61
Former-commit-id: 30ff8a4029 [formerly 46dfd61a44] [formerly a0d07a46f9] [formerly 7c6d76a05e343b15ec5e66aaa78ef56604975608 [formerly 20c7c17714ef04302d273f0fbac8ec2a7208298e] [formerly a0d07a46f9 [formerly 6bf265624d]]]
Former-commit-id: 557c18aada9ef20cab22b43d077d1932b6e48f17 [formerly 12c5585c0e0ccb7bda561900b86f3f8c4fae5f7b] [formerly 2d3674e3c2 [formerly 0b82d18c64]]
Former-commit-id: 2d3674e3c2
Former-commit-id: f900e2b22f
|
2012-12-07 15:18:03 -05:00 |
|
Slav Korolev
|
c0b567805b
|
Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments.
Change-Id: I605f6819def85f197e37e13803627baec67e6786
Former-commit-id: 9dd8b27cdd [formerly 81d98a46f1] [formerly 349ea52e2b] [formerly 349ea52e2b [formerly a284f0f50f]] [formerly 9dd8b27cdd [formerly 81d98a46f1] [formerly 349ea52e2b] [formerly 349ea52e2b [formerly a284f0f50f]] [formerly b650fa6675 [formerly 349ea52e2b [formerly a284f0f50f] [formerly b650fa6675 [formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]]]]]
Former-commit-id: b650fa6675
Former-commit-id: dcb82a190f [formerly 59753c678d] [formerly b5fc4b6800] [formerly 225b8978477ae4abb4bb599708729e88e1e2014e [formerly ab9c4b8c7dbfa4854adca6dd7fb1a100ffd79506] [formerly b5fc4b6800 [formerly 1c16ed59c1]]]
Former-commit-id: bab4ffa845415ac56b910c93c47c24a08b204cb0 [formerly 14e2d036ba5337bb7759432348ef01359a1f5aaf] [formerly 02ea1250da [formerly 61d69bbccf]]
Former-commit-id: 02ea1250da
Former-commit-id: a9fabaf914
|
2012-12-07 12:23:39 -05:00 |
|
Slav Korolev
|
8b06759fef
|
Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables.
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2
Former-commit-id: 28ba049b81 [formerly 32f192134d] [formerly 153af1673a] [formerly 153af1673a [formerly 5e4bbc03a4]] [formerly 28ba049b81 [formerly 32f192134d] [formerly 153af1673a] [formerly 153af1673a [formerly 5e4bbc03a4]] [formerly af101861e4 [formerly 153af1673a [formerly 5e4bbc03a4] [formerly af101861e4 [formerly 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22]]]]]
Former-commit-id: af101861e4
Former-commit-id: 1158a52387 [formerly d9710603e7] [formerly fd46994bb9] [formerly 7839c997a092259419d48447ec5304fb245c71e4 [formerly d7de73f56f69ac57bd4c037b1331da78ad5eafa0] [formerly fd46994bb9 [formerly a6241ff4d8]]]
Former-commit-id: e74e092a58df03f6d85f289167d456637a01f0fa [formerly ea094f0bb19456530bb0dfb6f5a0181129fb8e44] [formerly 627c3987ea [formerly 7b66b5258d]]
Former-commit-id: 627c3987ea
Former-commit-id: 47fcfda6da
|
2012-12-06 12:42:06 -05:00 |
|
Slav Korolev
|
3b338185d8
|
Issue #1297. Changed non-blocking ZoneTableDlg. Next patch.
Changes from reviewers comments.
Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682
Former-commit-id: fa1c5d5e38 [formerly a519f985ec] [formerly 487a9eabb8] [formerly 487a9eabb8 [formerly d220f74018]] [formerly fa1c5d5e38 [formerly a519f985ec] [formerly 487a9eabb8] [formerly 487a9eabb8 [formerly d220f74018]] [formerly 4560efe149 [formerly 487a9eabb8 [formerly d220f74018] [formerly 4560efe149 [formerly 8f002a71cb688fe8fbf7378ef53398dfecb0354e]]]]]
Former-commit-id: 4560efe149
Former-commit-id: eeb168e794 [formerly 9bb8e24c52] [formerly 063c155818] [formerly ad4167540b0bdae036630c03497c9ff048362bdf [formerly 513793f8cfb0f26fa9576ec1dfb831fc65d80eec] [formerly 063c155818 [formerly 765dbd8766]]]
Former-commit-id: 2e63ef68e2e9d1d60352280b23fb19db3747cc5f [formerly c377dec9d403627caffad2d4a3d988df6b86227a] [formerly 5c09c11912 [formerly 711ba6b2b5]]
Former-commit-id: 5c09c11912
Former-commit-id: fdcb811cad
|
2012-11-16 11:08:42 -05:00 |
|
Dustin Johnson
|
8863642277
|
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: c9207269a3 [formerly acd4cf94d8] [formerly efd3d3735a] [formerly efd3d3735a [formerly 064ef82d1e]] [formerly c9207269a3 [formerly acd4cf94d8] [formerly efd3d3735a] [formerly efd3d3735a [formerly 064ef82d1e]] [formerly 1dbeb22893 [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: e9b7956d0f [formerly cd5faf58bf] [formerly 2d1e886cf3] [formerly e239f886daa359a6280760b8fa6b78b5c8380ec8 [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc] [formerly 2d1e886cf3 [formerly 4222b24d09]]]
Former-commit-id: 807d5554bc7b021defe634c74b7c5d059408a145 [formerly 58274565203c021076e001f24f089a98cd2216f6] [formerly b4a13190ad [formerly 6613c51d3b]]
Former-commit-id: b4a13190ad
Former-commit-id: eb82c7672b
|
2012-11-08 09:57:16 -06:00 |
|
Steve Harris
|
fcfbf33aaf
|
12.12.1-1 baseline
Former-commit-id: 3d71d17432 [formerly 8278cac143] [formerly c2839cc86d] [formerly c2839cc86d [formerly e4bd20a515]] [formerly 3d71d17432 [formerly 8278cac143] [formerly c2839cc86d] [formerly c2839cc86d [formerly e4bd20a515]] [formerly e1498006c7 [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]]
Former-commit-id: e1498006c7
Former-commit-id: 22747b1324 [formerly 3cb24c1d06] [formerly 4f243de928] [formerly 8273040ac06f4e59a144b7b49a341b74f0fea7f9 [formerly cc5d9cd9866ef60af47606a02772dd35474145e9] [formerly 4f243de928 [formerly 214fcd3b63]]]
Former-commit-id: b6d0613d6947345a3bbbc02e64885564c1baaf25 [formerly 5b863edab7014aa1117ea6831f473bf942ace0fe] [formerly af59663a99 [formerly a5be98d6de]]
Former-commit-id: 08c503e8c0836c8692962bb45c5eabf16e31d611 [formerly af59663a99]
Former-commit-id: 94cd5a1388
|
2012-11-07 12:41:20 -06:00 |
|
Slav Korolev
|
9e63cb0d36
|
Issue #1280. Changes for non-blocking TrendPlotDlg. Fixed format.
Change-Id: I26af77a545c1ecd76dc6a15111e73d580992d77d
Former-commit-id: ef0e534a2e [formerly eefd20833a] [formerly 2beb1dbc67] [formerly 2beb1dbc67 [formerly 52601577db]] [formerly ef0e534a2e [formerly eefd20833a] [formerly 2beb1dbc67] [formerly 2beb1dbc67 [formerly 52601577db]] [formerly 8c1719f248 [formerly 2beb1dbc67 [formerly 52601577db] [formerly 8c1719f248 [formerly d97fb49f2574dc320366475e02a5784be33bbaaf]]]]]
Former-commit-id: 8c1719f248
Former-commit-id: 19467f30a3 [formerly a02d2ab1af] [formerly 14c942cf5d] [formerly a8caf5ab22542ae93b1ce2ab59e5df3a9d75097f [formerly d0f3bb9f14ff41751a8ee2f8310b8ef7955fb539] [formerly 14c942cf5d [formerly 0e7baf252a]]]
Former-commit-id: 004bfa2a532281fdc7f0ddbc133ed836fd23a7f5 [formerly 53cddfca717322febcb7858ebc0200e38a72c502] [formerly c66954b14b [formerly f3dfa16b3a]]
Former-commit-id: c66954b14b
Former-commit-id: c405886581
|
2012-10-24 09:24:02 -04:00 |
|
Steve Harris
|
a2164a88d8
|
12.9.1-5 baseline
Former-commit-id: 4fec0b9354 [formerly 77cbd6c1e5] [formerly a1d931fd44] [formerly a1d931fd44 [formerly 61f269f54c]] [formerly 4fec0b9354 [formerly 77cbd6c1e5] [formerly a1d931fd44] [formerly a1d931fd44 [formerly 61f269f54c]] [formerly f2fac39428 [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]]
Former-commit-id: f2fac39428
Former-commit-id: c68ab3311a [formerly d9faed979f] [formerly 7fb0b17bd5] [formerly 5b54a131b7dd8cd501953ba8fd918503d0851b4c [formerly 54140b7733222bbc423315196e9781453b12f896] [formerly 7fb0b17bd5 [formerly 72824561cb]]]
Former-commit-id: a2129aca55a7ff6fdaf13fb64bacec56ad158149 [formerly 84e9e52a92ae5e740b0daf680a98316f7435f7f7] [formerly 2d928d328e [formerly 9b5c2094ed]]
Former-commit-id: b40318710922ff74b3d17e2773847774993ac0db [formerly 2d928d328e]
Former-commit-id: 98059f9ef1
|
2012-08-21 15:27:03 -05:00 |
|
root
|
f8e8a4e323
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 72a84e92a2 [formerly bb7b5341dd] [formerly 0987fc6b3d] [formerly 0987fc6b3d [formerly cb46f57879]] [formerly 72a84e92a2 [formerly bb7b5341dd] [formerly 0987fc6b3d] [formerly 0987fc6b3d [formerly cb46f57879]] [formerly 5a453ee984 [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]]
Former-commit-id: 5a453ee984
Former-commit-id: b2baa9d974 [formerly 791f3f5b85] [formerly 537dbadf64] [formerly 939672b9d6f9101662c8b04b0e01c6067990a9b2 [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26] [formerly 537dbadf64 [formerly 8a66b2f209]]]
Former-commit-id: c5d95d7f10d3a024e103b25f46e99ec3a51b8ea7 [formerly 167e4e289205b778c1de6873be7610daf3a39f5f] [formerly 0eb9520e15 [formerly 1792158ef8]]
Former-commit-id: 5f772656ceebacffd86ed423513dc7acb6d26bda [formerly 0eb9520e15]
Former-commit-id: 73466bae44
|
2012-08-15 22:15:20 +00:00 |
|
Steve Harris
|
880136b156
|
12.9.1-1 baseline
Former-commit-id: 271239613a [formerly b9fb1c89d4] [formerly 8309193ce9] [formerly 8309193ce9 [formerly 31ae7ea218]] [formerly 271239613a [formerly b9fb1c89d4] [formerly 8309193ce9] [formerly 8309193ce9 [formerly 31ae7ea218]] [formerly 79ce6cfd97 [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 27b7ae1e73 [formerly d3023f15ac] [formerly aed7a644df] [formerly 5dcf0426d8d0f18086cfe9370c5dbe558f4d1d46 [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b] [formerly aed7a644df [formerly 0c5d9e2416]]]
Former-commit-id: 230b902c8c186b9b77da9141c06a1ac7a55c0e28 [formerly b1b11fe00755e632d56330d48d6e1eee387eeef8] [formerly 16d7d955fc [formerly 63bcadf121]]
Former-commit-id: 16d7d955fc
Former-commit-id: 31353e2296
|
2012-08-15 13:59:00 -05:00 |
|
Nate Jensen
|
d3651bcad4
|
Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: 14b597a66f [formerly baff86f951] [formerly 6f90bfa61c] [formerly 6f90bfa61c [formerly a65e9608fd]] [formerly 14b597a66f [formerly baff86f951] [formerly 6f90bfa61c] [formerly 6f90bfa61c [formerly a65e9608fd]] [formerly 4a2841b287 [formerly 6f90bfa61c [formerly a65e9608fd] [formerly 4a2841b287 [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]]]
Former-commit-id: 4a2841b287
Former-commit-id: 0f807a3e84 [formerly 6d8ac0455e] [formerly 7d478ac74c] [formerly ecbfa5389c23e5dd555021d7949e34d954234769 [formerly 3ab4b622030a864dcf04c61605009347c3550e9a] [formerly 7d478ac74c [formerly 8fa0eb70db]]]
Former-commit-id: 897ceb95c48ed4f3f817777142ebe460ffddb352 [formerly bc2d3c00a3e2d4d029b3e992acb5ae8618d96464] [formerly e1321b8bc9 [formerly 04a7e5a8c0]]
Former-commit-id: e1321b8bc9
Former-commit-id: 06b3b8368d
|
2012-07-31 08:57:54 -05:00 |
|
Steve Harris
|
d60e78a9ee
|
12.6.1-9 baseline
Former-commit-id: 56ce907ff2 [formerly 32fdf6ed3b] [formerly 7c064b6868] [formerly 7c064b6868 [formerly 2c0ff851ca]] [formerly 56ce907ff2 [formerly 32fdf6ed3b] [formerly 7c064b6868] [formerly 7c064b6868 [formerly 2c0ff851ca]] [formerly 27afa60345 [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]]
Former-commit-id: 27afa60345
Former-commit-id: 9fc0cbac36 [formerly e528bb0df2] [formerly dc50bc8443] [formerly 202bf137851885adaaf1ac7f8ae4b23be4084de6 [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d] [formerly dc50bc8443 [formerly 4f7bb90bb0]]]
Former-commit-id: 94f256444a3b2e57847ac115fc0d1511e30f8e94 [formerly 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4] [formerly 37f2b6e138 [formerly d5fa61041b]]
Former-commit-id: 37f2b6e138
Former-commit-id: c74431ba29
|
2012-07-10 07:53:49 -05:00 |
|
Bryan Kowal
|
398cd87bbd
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 978eab748d [formerly 455d7b90a9] [formerly b1b294c401] [formerly b1b294c401 [formerly a33740e915]] [formerly 978eab748d [formerly 455d7b90a9] [formerly b1b294c401] [formerly b1b294c401 [formerly a33740e915]] [formerly b87b66abc5 [formerly b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]]
Former-commit-id: b87b66abc5
Former-commit-id: d2402aac6a [formerly dfd75b4c72] [formerly b4917e6708] [formerly df0481cfe5ddd39b2b6ab8841f8bc16a28fd08b0 [formerly 351fe6f4caaff528740139f88451b1dae35f0c83] [formerly b4917e6708 [formerly 9a7d0492fe]]]
Former-commit-id: bc8f760d2ce5b89f086e111f874c20ba4296a5dd [formerly 0eec5560d9e68707684a8349e50debb048bda384] [formerly 2e5a850d28 [formerly 611925412d]]
Former-commit-id: 2e5a850d28
Former-commit-id: e05b247e3b
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
d633d4fa6b
|
12.6.1-10 baseline
Former-commit-id: d97af08a30 [formerly a9742f306e] [formerly edac4d827c] [formerly edac4d827c [formerly 8dc4a774e2]] [formerly d97af08a30 [formerly a9742f306e] [formerly edac4d827c] [formerly edac4d827c [formerly 8dc4a774e2]] [formerly 3cd0902b49 [formerly edac4d827c [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 1cc115f8d7 [formerly 7550311ef6] [formerly efe25edfad] [formerly 56ba24e7306d231999968cc21d29c3a451b9c19e [formerly 1a8021953ed3a77781e285be5837377b59afd5e3] [formerly efe25edfad [formerly eacd5aeb7f]]]
Former-commit-id: 7ef56e4ae9652c71f6fcae16df2f6ffd850ed0f9 [formerly 032c121c88e37cbeafabb63e30162517b2659626] [formerly 56f8cf00a8 [formerly df59dc7c44]]
Former-commit-id: 56f8cf00a8
Former-commit-id: 8080ea523b
|
2012-06-21 08:58:00 -05:00 |
|
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 |
|