Juliya Dynina
|
d191fb83af
|
Merge "ASM #114" into asm_14.2.2
Former-commit-id: dd71746c6f [formerly 3edd73f78c] [formerly 575ed3610d] [formerly c6253811e8 [formerly 575ed3610d [formerly d719e88d510424020955f06d8b597d2df3573836]]]
Former-commit-id: c6253811e8
Former-commit-id: f3f8b80f5f698a4e575a4f3e5ff5b88856aa9c27 [formerly 430b9a1ace]
Former-commit-id: f54454f8f1
|
2014-02-05 10:42:30 -05:00 |
|
Brian.Dyke
|
d274021768
|
Issue #124
Former-commit-id: 6d35a4b1bc [formerly 3ba93b175e] [formerly 439f053309] [formerly 0cc11ddfd3 [formerly 439f053309 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]]
Former-commit-id: 0cc11ddfd3
Former-commit-id: 1e605ca4a47aef453131de36960bb5a057128099 [formerly 90b4e7ebf0]
Former-commit-id: e1d788683d
|
2014-02-04 16:56:47 -05:00 |
|
Brian.Dyke
|
8e78870c71
|
Issue #83
Former-commit-id: 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 484119f6b0 [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 75d1cbbdb2e42e3d0ad9d5112f388174acbf50f1 [formerly f088dab5ef]
Former-commit-id: 3c160bb05e
|
2014-02-04 16:32:42 -05:00 |
|
Mike Duff
|
e1023f0bc4
|
Issue #2722 - Add auto refresh to sub manager dialog
Former-commit-id: 8d92217e94 [formerly 227eb23157] [formerly 04ee397f2b] [formerly ab9621698f [formerly 04ee397f2b [formerly f678a39b37040bd637cf210f73aaef0841bda36e]]]
Former-commit-id: ab9621698f
Former-commit-id: 81c8a2b9d2b37711be589b2c809d03532ae8c45f [formerly e984863c1c]
Former-commit-id: f7566298b2
|
2014-02-04 12:45:33 -06:00 |
|
steve.naples
|
6d24becad9
|
ASM #235
Change-Id: Ic3a6237b0a1f9ddf06621c984d2f11b7e08d7adb
Former-commit-id: 0f1a16498a [formerly b7b5dc3497] [formerly c76099274a] [formerly 22808af7e2 [formerly c76099274a [formerly 678ad5b35f22b71f54200fbf5b88ebd9e4da9563]]]
Former-commit-id: 22808af7e2
Former-commit-id: 290d75607ac062f848df22d02ac8dedf681edbf4 [formerly cb508369cf]
Former-commit-id: 26dd36e272
|
2014-02-04 18:23:46 +00:00 |
|
Brian.Dyke
|
6e66bb7b6e
|
14.1.1-17 baseline
Former-commit-id: 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]
Former-commit-id: 23280af290
Former-commit-id: 50e190ed8cb3b89c055f33e543707eeb6346818a [formerly 947ec5fd96]
Former-commit-id: f1cc9d6ee2
|
2014-02-04 12:33:46 -05:00 |
|
Ben Steffensmeier
|
a63cd52b14
|
Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834
Former-commit-id: fc0d044bd9 [formerly 921401ffe9] [formerly 8865177c6b] [formerly 97a64f89f1 [formerly 8865177c6b [formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]]
Former-commit-id: 97a64f89f1
Former-commit-id: e17a311de5c08292ece4f9c8f0ed3adc52531127 [formerly 2be72739b5]
Former-commit-id: 1f34342948
|
2014-02-03 14:07:07 -06:00 |
|
Juliya Dynina
|
62ea2d7c4e
|
Merge "ASM #290" into asm_14.2.2
Former-commit-id: 0684b67260 [formerly df338a3302] [formerly 8cdc5b446a] [formerly a3ac0236b0 [formerly 8cdc5b446a [formerly 3a31872714dbc04cfd7a0f1e353970b896b047a7]]]
Former-commit-id: a3ac0236b0
Former-commit-id: e9c53ef01238cd857105c801f1ec7497278b09e5 [formerly 17d5e6f7db]
Former-commit-id: 30e6373e80
|
2014-01-31 09:13:33 -05:00 |
|
Juliya Dynina
|
056c6c8465
|
Merge "ASM #120" into asm_14.2.2
Former-commit-id: 03bf37ec3a [formerly 060fb2bd00] [formerly 15c4ec933c] [formerly 5867a062d7 [formerly 15c4ec933c [formerly 30a875b35b090132cc6ec8a2474b5877bb7c6042]]]
Former-commit-id: 5867a062d7
Former-commit-id: be6c61eda5ce7396e9b827e7ff947041629c0ac3 [formerly 66653cbcc1]
Former-commit-id: f4643eba7f
|
2014-01-31 09:12:20 -05:00 |
|
steve.naples
|
b0960c69d5
|
ASM #290
Change-Id: Id6160e628c4fe3c4c62ef58ccb2b7624268e64d4
Former-commit-id: 8aa160d694 [formerly 7ecb7b027c] [formerly 6501c2c398] [formerly d4a0b7a0d1 [formerly 6501c2c398 [formerly 53b6ac674a3b7bbce71ce2a81b5bb3715baeaa13]]]
Former-commit-id: d4a0b7a0d1
Former-commit-id: 9a1034efe3a7e0cedc3d324ac5476732d0316ff8 [formerly 2e85bffc6e]
Former-commit-id: ae3b2edcaa
|
2014-01-30 21:03:38 +00:00 |
|
steve.naples
|
b94f554731
|
ASM #120
Change-Id: I657d872f612475ccf21cdd3c08f8075180ec192a
Former-commit-id: f850a0f028 [formerly 56deadaa00] [formerly 709dc589ce] [formerly b303d1ecbb [formerly 709dc589ce [formerly 656f31b7df8a805e7f38a02c29bce05a1bcff639]]]
Former-commit-id: b303d1ecbb
Former-commit-id: 5b75568ed0d2838de52b4dfef9a67b303ce27104 [formerly 38500e5d21]
Former-commit-id: fa35b8598b
|
2014-01-30 20:59:39 +00:00 |
|
Juliya Dynina
|
4ccbc43efa
|
Merge "ASM #110" into asm_14.2.2
Former-commit-id: 36a899475b [formerly 33f10e0975] [formerly a28662b25d] [formerly c26a2d5cab [formerly a28662b25d [formerly aa8647f0479204a43bf50fc498a26768a2feb989]]]
Former-commit-id: c26a2d5cab
Former-commit-id: d64fc1912fd6093bb9c031d0dd3604694a60baa3 [formerly 5afea503a8]
Former-commit-id: a61405dda3
|
2014-01-30 15:34:16 -05:00 |
|
David Friedman
|
b5ae8c70c9
|
ASM #110
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f
Former-commit-id: 0372fdd6cc [formerly d36cbb2ca9] [formerly 769086c0b7] [formerly e18c49ea72 [formerly 769086c0b7 [formerly c4b3411f4d5f7632e3c804316bd5959d16cc97f0]]]
Former-commit-id: e18c49ea72
Former-commit-id: e28494606e9e07a3b76cb461cbaa151022eaec7a [formerly 052e12b777]
Former-commit-id: 0ce67592ac
|
2014-01-29 20:23:55 +00:00 |
|
Michael Gamazaychikov
|
af698fa0f4
|
ASM #75
Change-Id: If2e1c8bc2d320b3681f64d8637fbabb9659d0c5b
Former-commit-id: 94cd48fa70 [formerly 2c2b629206] [formerly 91c3468462] [formerly edbadf059e [formerly 91c3468462 [formerly e726b2a3a2529f5909acb7fe0f9a3b8475f1642e]]]
Former-commit-id: edbadf059e
Former-commit-id: ecf011705fb1cc4ffbdc9997beea53ea907403ab [formerly e3cb50bdbe]
Former-commit-id: ad27feeedc
|
2014-01-29 14:19:52 -05:00 |
|
Max Schenkelberg
|
b495451e3f
|
Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
(cherry picked from commit 431ffa97ae4b1c9159c4607e51dbed23c77b76d2 [formerly f4765d1577] [formerly 037cd48c62 [formerly 5d488d27b9] [formerly 83c600ada9] [formerly f4765d1577 [formerly 83c600ada9 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]])
Former-commit-id: b63edcc8a7 [formerly 122c3442f8] [formerly 0c840cf724] [formerly d566ed9927 [formerly 0c840cf724 [formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]]]
Former-commit-id: d566ed9927
Former-commit-id: 5c9afda4f5c9656fe346333485798a21a785033b [formerly f5ff746126]
Former-commit-id: e1717b2729
|
2014-01-29 10:15:38 -06:00 |
|
Michael Gamazaychikov
|
b117e710a8
|
ASM #114
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02
Former-commit-id: 73deca037f [formerly 297d1cffc6] [formerly 97f9c2ea92] [formerly 8f90c0dee2 [formerly 97f9c2ea92 [formerly 56dc40096e58fa8ae40b9f2cd6a1bd8f9dd3d35a]]]
Former-commit-id: 8f90c0dee2
Former-commit-id: 8ea9bd6aedb12599a646b4ebb3e81c3350dde192 [formerly 7d7cf7cfab]
Former-commit-id: 0198607fe0
|
2014-01-29 10:58:18 -05:00 |
|
brian.dyke
|
ac37e2ea2e
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: becf6322c6 [formerly 4a62e83835] [formerly 2294c81a57] [formerly f10f6d4e8a [formerly 2294c81a57 [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629 [formerly e9e2eb3be0]
Former-commit-id: 621464ac0d
|
2014-01-27 15:27:49 -05:00 |
|
Mike Duff
|
07fb9b74d5
|
Issue #2459 - Last change from unscheduled to deactivated.
Former-commit-id: 9a0665ccc8 [formerly 3766f6a0f4] [formerly e46c226489] [formerly 81aa9ce0cb [formerly e46c226489 [formerly 09494558cae046e97ff2126673c5a5c4fd1f0105]]]
Former-commit-id: 81aa9ce0cb
Former-commit-id: 36d2c58bed76ee7aef5431b41fe9592aebf50dc7 [formerly 5fc96739b9]
Former-commit-id: ef5d3f370c
|
2014-01-26 18:57:26 -06:00 |
|
Mike Duff
|
3e4b74c79d
|
Issue #2452 - Changed label based on feedback.
Former-commit-id: bb8b6eea5f [formerly fb6194c464] [formerly 1da1285311] [formerly 6dcd1a7969 [formerly 1da1285311 [formerly dd74aef827f0892c64a7efd60b0edd1156ef31ec]]]
Former-commit-id: 6dcd1a7969
Former-commit-id: 28722ea6fd1407967384474a85ef503f13c4099c [formerly be59be53d4]
Former-commit-id: eaaab3b082
|
2014-01-25 14:41:20 -06:00 |
|
Nate Jensen
|
a773aec724
|
Issue #2359 printout shutdown of application to try and detect kills
Change-Id: I113890428cfd5a22c2fbb0a4abdcff18a4ccd11e
Former-commit-id: 567a18dab4 [formerly f5ce7b485d] [formerly 47d6e5b54f] [formerly cdbd05b293 [formerly 47d6e5b54f [formerly 34b2c7a402bcf7f3b04ea1e98090f7e0df48566f]]]
Former-commit-id: cdbd05b293
Former-commit-id: 53e2e8b666941bdcfe30a8f595600e7f0cdd6072 [formerly 7dd0b1c978]
Former-commit-id: e6e9cab9f9
|
2014-01-23 19:02:37 -06:00 |
|
Kiran Shrestha
|
2a3a010041
|
Issue #96
Change-Id: I9ad090ae29aa3f6bd32e448b94c3053f9d61429e
Former-commit-id: 7f90e774fa [formerly ef6c154f28] [formerly 60e090a963] [formerly 9411bbbac5 [formerly 60e090a963 [formerly 17a188a3440214cbfd913e854a093ceba287fff9]]]
Former-commit-id: 9411bbbac5
Former-commit-id: 7b12e33b5c2acf872f50268156e72a2e0a7f5954 [formerly dac48c1da9]
Former-commit-id: 6eab820e1b
|
2014-01-23 18:49:16 +00:00 |
|
Ben Steffensmeier
|
3f053ee508
|
Issue #2363 Add General implementation od IColormapShadedShapeExtension so that all targets will be able to render filled wind barbs.
Former-commit-id: 33bf8e9c44 [formerly 9c65c5b07b] [formerly 6aa6683258] [formerly a92f6e9bb6 [formerly 6aa6683258 [formerly e214a045c4d45532ed80fb4cdd51355c7884a2ee]]]
Former-commit-id: a92f6e9bb6
Former-commit-id: beeaf72ec6549c4e1072090e287697ca2d2233bf [formerly b90004e46a]
Former-commit-id: 9b788b49b0
|
2014-01-23 12:41:16 -06:00 |
|
Ben Steffensmeier
|
159642b200
|
Issue #2602 Don't try to load classes from uninstalled bundles.
Former-commit-id: f1de2aaded [formerly c7357863b9] [formerly 0c4fc0dd01] [formerly 3187754736 [formerly 0c4fc0dd01 [formerly 30ca0135046851884e4a07b36559fce086ccd3f2]]]
Former-commit-id: 3187754736
Former-commit-id: 983c7624df570de47db5a313760f0b69fec21954 [formerly d1dbd0c9b6]
Former-commit-id: 32bac228db
|
2014-01-22 15:46:51 -06:00 |
|
Matthew Howard
|
2cc56ed217
|
Merge "Issue #87" into master_14.2.1
Former-commit-id: d29ff38434 [formerly 87c7f9b826] [formerly 58589f9088] [formerly 271f26fcfb [formerly 58589f9088 [formerly 62acdd26ccb37f8037729d676228d416a0e22f1b]]]
Former-commit-id: 271f26fcfb
Former-commit-id: 88e788c06c2fe3cb9f5eba0f87d0aff740ea26ad [formerly aa8ad53c55]
Former-commit-id: 148d82e05f
|
2014-01-21 12:43:14 -05:00 |
|
Gang.Zhang
|
b08c9673e0
|
Issue #87
Change-Id: I49c00c29769ef11ee7105b1e61be151ccabf454d
Former-commit-id: 78c6613674 [formerly 899d9fd7bf] [formerly e1584eeb0c] [formerly f78affc6f5 [formerly e1584eeb0c [formerly 1fa6738632faf85e2f540e807e5f4a208e6ffa3c]]]
Former-commit-id: f78affc6f5
Former-commit-id: de02cd117cc77e1273d39a5447d8f5e8bd120d2b [formerly f55aae98c4]
Former-commit-id: 7fb22b5223
|
2014-01-21 11:50:50 +00:00 |
|
Mike Duff
|
7e3e76e9da
|
Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
Former-commit-id: 4038246f93 [formerly 9bd8e84b9f] [formerly bdf6a002f6] [formerly 9a2d2af4a9 [formerly bdf6a002f6 [formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]]]
Former-commit-id: 9a2d2af4a9
Former-commit-id: d100328be0c1140a5b43dcb2f41ad9e6ab41095e [formerly 9112366cae]
Former-commit-id: e929abf7d7
|
2014-01-20 17:44:02 -06:00 |
|
Lee Venable
|
b40ae43582
|
Merge "Issue #2291 - Fixed resizing of components." into omaha_14.2.1
Former-commit-id: c3022f8274 [formerly d825d627bd] [formerly b3928f4f49] [formerly dd12515ca2 [formerly b3928f4f49 [formerly 277513c8d810a3996d93fd04a5691eb730c78630]]]
Former-commit-id: dd12515ca2
Former-commit-id: 4206ad0dee836a41182154fcefd07a187f71acab [formerly 4e121d1261]
Former-commit-id: 82eafd385d
|
2014-01-20 17:32:38 -06:00 |
|
Nate Jensen
|
c2340dfd07
|
Merge "Issue #2717 Force use of legacy merge sort" into omaha_14.2.1
Former-commit-id: 55203d0486 [formerly c598185130] [formerly d78dbb85d5] [formerly 54262ad318 [formerly d78dbb85d5 [formerly 566d188782f5976d2a221b5a7ab162da3e8b36ca]]]
Former-commit-id: 54262ad318
Former-commit-id: 3b53bce38675c75e649c3c5c70ab3876d1503296 [formerly f13cb9ae26]
Former-commit-id: 5b84b27087
|
2014-01-20 17:32:15 -06:00 |
|
Lee Venable
|
9ecbd3bc7a
|
Issue #2291 - Fixed resizing of components.
Former-commit-id: ea96ce87e9 [formerly 39e8124ef7] [formerly 1927ba49ea] [formerly d3eb6c16ec [formerly 1927ba49ea [formerly 9956936125611cd67aaaf6ba6e617e01b004a738]]]
Former-commit-id: d3eb6c16ec
Former-commit-id: 3951681cd94fb490f91e2f28a8cc25e01dca0872 [formerly b8520d1e12]
Former-commit-id: dad11aca88
|
2014-01-20 17:26:28 -06:00 |
|
Ron Anderson
|
9b8c8310ab
|
Issue #2717 Force use of legacy merge sort
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7
Former-commit-id: a481848c67 [formerly 34d1b95a79] [formerly de97ec032f] [formerly 66bbc99784 [formerly de97ec032f [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]]]
Former-commit-id: 66bbc99784
Former-commit-id: c83a8b6d3a8111365ba2ad52fdb151f0a5cec621 [formerly 61d8aec23c]
Former-commit-id: 0048ef6a96
|
2014-01-20 17:22:26 -06:00 |
|
Richard Peter
|
fa5e160245
|
Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 29ba337367 [formerly 6b859c9a42 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]]]
Former-commit-id: 29ba337367
Former-commit-id: 4d7e2eae126edb00fa4f829dd78950b4c1bcb955 [formerly 4887054146]
Former-commit-id: 4796beec29
|
2014-01-20 17:21:21 -06:00 |
|
Steve Harris
|
9843517cb3
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
Former-commit-id: 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]
Former-commit-id: 7ea285c48b
|
2014-01-20 10:17:44 -06:00 |
|
Mike Duff
|
5097ed2ad7
|
Issue #2459 - Remove unscheduled status from UI
Former-commit-id: e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly 25d1d39fc2 [formerly 93cb80cfc7 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]]]
Former-commit-id: 25d1d39fc2
Former-commit-id: 77ea703f0626d7ff1caa2689bf5deb3e8b0b0c00 [formerly a04430e334]
Former-commit-id: a492ec6a4d
|
2014-01-17 15:34:48 -06:00 |
|
gerritcm
|
c1df3eb55c
|
14.1.1-16 baseline
Former-commit-id: 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly b84f7d4203 [formerly 6be938e6eb [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]
Former-commit-id: b84f7d4203
Former-commit-id: 8a149ceb12545503e179389c0569fad3eefaed15 [formerly 644da23327]
Former-commit-id: b72cd19055
|
2014-01-16 16:43:05 -05:00 |
|
Nate Jensen
|
9f4360fdda
|
Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 9d529b3b21 [formerly ae10129713 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 194b6af74ffb08201bff51fb4de3ff2d6d3448d9 [formerly 1be41d69c6]
Former-commit-id: 98e1bf9194
|
2014-01-15 17:36:30 -06:00 |
|
Nate Jensen
|
472cf2905c
|
Issue #2359 printout connection exceptions to aid in diagnosing
connectivity problems
Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c
Former-commit-id: aa0639a878 [formerly ccaa9dbde1] [formerly fc6b31c1c0] [formerly 5f39322d59 [formerly fc6b31c1c0 [formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]]]
Former-commit-id: 5f39322d59
Former-commit-id: 6ed8c7d69c73010ecba0450f2c9d1203bc9f3ab4 [formerly deb57e3b35]
Former-commit-id: 4533642f26
|
2014-01-15 13:39:28 -06:00 |
|
Matthew Howard
|
ea43bb90bf
|
Merge "Issue #92" into master_14.2.1
Former-commit-id: 8825b9099b [formerly 8304216bbe] [formerly 951004e5e5] [formerly 9fae7f2b8d [formerly 951004e5e5 [formerly 041e6db2ebf27664ee75f4e2da31e21827721fef]]]
Former-commit-id: 9fae7f2b8d
Former-commit-id: f2867dde119009ee0adc30eb200e5a47053e0373 [formerly d1d9c431d7]
Former-commit-id: 2722ad654f
|
2014-01-15 14:24:54 -05:00 |
|
Rici.Yu
|
84455e68d3
|
Issue #92
Change-Id: Ib8d12e9be787c9b5b41a776eb22bb4c4a8c2fc7d
Former-commit-id: 18eec46389 [formerly f4fd057900] [formerly 129bbcee45a16487cdf7680f19a6f9b18a0aaa3b [formerly ac72d56ae0]] [formerly a36e9b3219 [formerly ac72d56ae0 [formerly c12f51881a565e2ec812e83e79b4bc59fbb5af1e]]]
Former-commit-id: a36e9b3219
Former-commit-id: ebd5aa7742786904da20f105c705310e23b5e040 [formerly 4b1ba5531f]
Former-commit-id: f9f5091cc1
|
2014-01-15 11:48:36 -05:00 |
|
Matthew Howard
|
1d10ec5b95
|
Merge "Issue #112" into master_14.2.1
Former-commit-id: 19ea9a39d8 [formerly bb834fc9bf] [formerly c1ff14017b] [formerly 7a36600a04 [formerly c1ff14017b [formerly 1054241eeb4931982f295bc8a9927ffe1510a24d]]]
Former-commit-id: 7a36600a04
Former-commit-id: d7d6c4d6f032e75cb7666e10bd972888e3ab9a74 [formerly 32d8c53549]
Former-commit-id: 4c5b7f24ff
|
2014-01-15 11:45:32 -05:00 |
|
Zhidong.Hao
|
f0b4fce274
|
Issue #112
Change-Id: I674975b805661ad191c5b4af3ad7132371e1a479
Former-commit-id: 19ed94a647 [formerly b86b5fc0ee] [formerly d61fe61466] [formerly 57e78b6a11 [formerly d61fe61466 [formerly b937a25ac189024718ee7832386d20f79e1d63e0]]]
Former-commit-id: 57e78b6a11
Former-commit-id: bce8ce2fe920c4189ba4e4f20ad73f653d00962b [formerly 54bab6905a]
Former-commit-id: 4be6cef7c8
|
2014-01-15 11:16:26 -05:00 |
|
Mike Duff
|
c5f28e0f37
|
Issue #2459 - Refactor the subscription status
Former-commit-id: 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 245d76358e [formerly f94593867e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]
Former-commit-id: 245d76358e
Former-commit-id: ebd7027d07dcf26d5e0b30ecd0d661a72afa18e1 [formerly d96a9d2937]
Former-commit-id: 9a45b95db6
|
2014-01-15 09:21:30 -06:00 |
|
Kevin P. Johnson
|
cf6c2fd016
|
Issue #245
Change-Id: I7fca90d9f039b46061bb12a28485c92e21c4fd85
Former-commit-id: 12e5cfe85c [formerly e795890344] [formerly e10493f734] [formerly 75dd01d768 [formerly e10493f734 [formerly e776776d797a80b059f00bd78dd0806b7b0f2241]]]
Former-commit-id: 75dd01d768
Former-commit-id: 5d0c9ef45e8cfc0861341c10c214957e1638b320 [formerly d920f4c3c3]
Former-commit-id: 143b0fd1eb
|
2014-01-15 14:02:07 +00:00 |
|
Matthew Howard
|
b59abd696e
|
Merge "Issue #106" into master_14.2.1
Former-commit-id: ba4abc9e09 [formerly a9ac6ef900] [formerly 5acedd1030] [formerly 456e07d8da [formerly 5acedd1030 [formerly 59f69bf99e624723de801fdd6c9e2f490a2106b7]]]
Former-commit-id: 456e07d8da
Former-commit-id: 3d26522de97c6600c123ad0191abe7e1f69184e6 [formerly 92e2f3548d]
Former-commit-id: 4cdbef3c5e
|
2014-01-14 13:45:16 -05:00 |
|
Zhidong.Hao
|
d6d8358d62
|
Issue #106
Change-Id: Ib33b9294d4fd50d1cd3a815c841d4744ec4ba691
Former-commit-id: 634d0fd90a [formerly 95a104be58] [formerly 04079da5ad] [formerly f3f378bcdc [formerly 04079da5ad [formerly 00e518eafbc5032d4e23128ac0c415d4f9c0ab79]]]
Former-commit-id: f3f378bcdc
Former-commit-id: 7894c2e9211937796415c0d2c4ecc8e7dbf6e563 [formerly ed44b4b896]
Former-commit-id: 8d42d86883
|
2014-01-14 12:02:11 -05:00 |
|
Steve Naples
|
20d5c316ec
|
Issue #237
Change-Id: Iab0716c7e09739cbb4a525111eb34ecc0594a388
Former-commit-id: b0ab548349 [formerly f60d81202c] [formerly c2667bd719] [formerly 62dfc1f0b2 [formerly c2667bd719 [formerly 3f252c7aa8fc5598f3f74c376c713150793868e5]]]
Former-commit-id: 62dfc1f0b2
Former-commit-id: 4af266f8c1d3a3f722e2b89bab828a72957ab576 [formerly 687511035a]
Former-commit-id: ee525c5525
|
2014-01-14 16:38:44 +00:00 |
|
Steve Naples
|
ac201730c8
|
Issue #125
Change-Id: I677be3fa551206e6c8b024a1aef45edb2c4e18ba
Former-commit-id: 5fe256b40d [formerly aab6c0cc76] [formerly 1c983d481c] [formerly 68ff510bc8 [formerly 1c983d481c [formerly 6ddb1bb4204a1b405976720c9f48fc20ff84e7c4]]]
Former-commit-id: 68ff510bc8
Former-commit-id: ca103f5e3767dd684c5a13158b9bac3a31b6ee30 [formerly 2ca557053c]
Former-commit-id: f537328a25
|
2014-01-14 16:30:19 +00:00 |
|
Ron Anderson
|
46735c9afe
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]
Former-commit-id: dca7f21f7b
|
2014-01-13 17:45:20 -06:00 |
|
Matthew Howard
|
086b6f1054
|
Merge "Issue #100" into master_14.2.1
Former-commit-id: ed6bf0f03d [formerly 71e136082b] [formerly 30a0fe634d] [formerly 8d0bae66e2 [formerly 30a0fe634d [formerly b377e3267da4cda9367bb0d0b6831c8027579e6a]]]
Former-commit-id: 8d0bae66e2
Former-commit-id: 32d14b725a1eff1bfbee53d4eab5545ee2627529 [formerly 3edc895903]
Former-commit-id: 114863f2e2
|
2014-01-13 15:12:23 -05:00 |
|
Zhidong.Hao
|
eefb42c343
|
Issue #100
Change-Id: I31c56395a69d8b1a140e652b434149dd98207e81
Former-commit-id: 9c1196d427 [formerly 6cb6519232] [formerly 7009311c86] [formerly a5280b938c [formerly 7009311c86 [formerly f58eb9a800491de5850fa82a6e37b029f41ceb1c]]]
Former-commit-id: a5280b938c
Former-commit-id: 4cd237bf69117f0b4a2788ff2fcbbf36d67a10e1 [formerly 018536c97f]
Former-commit-id: 96e371fd9e
|
2014-01-13 14:11:44 -05:00 |
|
Richard Peter
|
1e10acc664
|
Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
Former-commit-id: 434c05b458 [formerly bc4ad18fe9] [formerly 7bbefddcc1] [formerly e6d7acb609 [formerly 7bbefddcc1 [formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]]]
Former-commit-id: e6d7acb609
Former-commit-id: 08b064f5627b0585a3df75b960a722fde7817d6f [formerly 527408ddd4]
Former-commit-id: 5b687c7bd5
|
2014-01-10 15:42:48 -06:00 |
|