Steve Harris
|
8413f8d96c
|
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
Former-commit-id: 735ed2ecd9 [formerly fa77df807d] [formerly 735ed2ecd9 [formerly fa77df807d] [formerly 596d19466b [formerly 55326667ca13a37c7802849484949382e65a6329]]]
Former-commit-id: 596d19466b
Former-commit-id: b0b8a13e60 [formerly 20fda57d37]
Former-commit-id: 9e75c7e5f1
|
2012-08-16 10:27:51 -05:00 |
|
root
|
a689deb547
|
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: ac8888ae10 [formerly 342bda7e5f] [formerly ac8888ae10 [formerly 342bda7e5f] [formerly 6eec24180e [formerly 2368421395496141fdc6467fd165babc282b65ac]]]
Former-commit-id: 6eec24180e
Former-commit-id: f0cb647101 [formerly b3217ad886]
Former-commit-id: d1f2ac6698
|
2012-08-15 22:29:38 +00:00 |
|
root
|
84a8231c49
|
Merge branch 'reconcile' into development_on_ss_builds
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
Former-commit-id: d170ae704b [formerly b93989daaf] [formerly d170ae704b [formerly b93989daaf] [formerly ba40e18fb2 [formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]]
Former-commit-id: ba40e18fb2
Former-commit-id: fd69b031d2 [formerly 3e9d1fa430]
Former-commit-id: 64c3ccb4a4
|
2012-08-15 22:29:07 +00:00 |
|
root
|
0eb9520e15
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209]
Former-commit-id: 1792158ef8
|
2012-08-15 22:15:20 +00:00 |
|
Ben Steffensmeier
|
2256ec871d
|
Issue #1065 fix contexts to deactivate when unrecognized views activate.
Former-commit-id: e8524301b5 [formerly 6d9d0a406f] [formerly e8524301b5 [formerly 6d9d0a406f] [formerly 4203807a77 [formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]]
Former-commit-id: 4203807a77
Former-commit-id: d7597d8cf7 [formerly 8a170234b8]
Former-commit-id: 62979089d3
|
2012-08-15 16:36:05 -05:00 |
|
Benjamin Phillippe
|
bd2023ec70
|
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: dd8ed9eca0 [formerly 72c63e1a6f] [formerly dd8ed9eca0 [formerly 72c63e1a6f] [formerly 7bad34f906 [formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]]
Former-commit-id: 7bad34f906
Former-commit-id: 11bf8bb4c7 [formerly 91493ee0b9]
Former-commit-id: e23523ad80
|
2012-08-15 16:22:39 -05:00 |
|
Nate Jensen
|
b0eb5c1493
|
Merge "Issue #1033 do not load grib data on tileset creation but instead load allow it to load async." into development_on_ss_builds
Former-commit-id: b94597d03c [formerly 9c1597b554] [formerly b94597d03c [formerly 9c1597b554] [formerly 6897b1d480 [formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]]]
Former-commit-id: 6897b1d480
Former-commit-id: 3b31bc0500 [formerly b7bc962da4]
Former-commit-id: ca08f538e8
|
2012-08-15 16:18:36 -05:00 |
|
Ben Steffensmeier
|
e64c4d343f
|
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
Former-commit-id: 9c41e73ee5 [formerly cb99170685] [formerly 9c41e73ee5 [formerly cb99170685] [formerly b194a17abc [formerly 97d786afadf136f75ffd6a440d35b628e144b888]]]
Former-commit-id: b194a17abc
Former-commit-id: 98728915f8 [formerly 74acf329c4]
Former-commit-id: 48a5389b2f
|
2012-08-15 15:25:46 -05:00 |
|
Steve Harris
|
7e1d1f6e08
|
12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
03bb51ed0e
|
12.9.1-3 baseline
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: a535b51eba [formerly edbbacfa8a]
Former-commit-id: 8c5c5ad6eb
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
adf346e7d3
|
12.9.1-2 baseline
Former-commit-id: 27871051e3 [formerly d1d877d319] [formerly 27871051e3 [formerly d1d877d319] [formerly a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]
Former-commit-id: a198b3a807
Former-commit-id: de4c812834 [formerly 448ed038c2]
Former-commit-id: ed416f241e
|
2012-08-15 14:12:24 -05:00 |
|
Jonathan Sanchez
|
49c757f958
|
Issue #915 Set the user data.
Former-commit-id: f37a75f265 [formerly 865136f6ef] [formerly f37a75f265 [formerly 865136f6ef] [formerly 03ed8ee0b0 [formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]]
Former-commit-id: 03ed8ee0b0
Former-commit-id: f1749f4fcc [formerly e584d728f0]
Former-commit-id: 38bb2743e5
|
2012-08-15 14:05:50 -05:00 |
|
Steve Harris
|
16d7d955fc
|
12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416]
Former-commit-id: 63bcadf121
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
5fc58b8e12
|
Merge branch 'development' into Enhanced_points
Former-commit-id: e372481f81 [formerly 346d775f57] [formerly e372481f81 [formerly 346d775f57] [formerly f7f97d9f54 [formerly 25026a4d9955b76039bf25861380cadebff19665]]]
Former-commit-id: f7f97d9f54
Former-commit-id: 73e357c39d [formerly 031b655ab5]
Former-commit-id: 14923a89e9
|
2012-08-15 13:35:47 -05:00 |
|
Nate Jensen
|
826b645296
|
Merge "Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container" into development
Former-commit-id: d70d78d664 [formerly 2cb82b7170] [formerly d70d78d664 [formerly 2cb82b7170] [formerly 91e0ba8c23 [formerly d252760b0e39002e53a5fce809b38521ca2351aa]]]
Former-commit-id: 91e0ba8c23
Former-commit-id: 1da09f201e [formerly 5b26d1e93e]
Former-commit-id: ebad112688
|
2012-08-14 16:52:40 -05:00 |
|
Ron Anderson
|
746e006e89
|
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: bac68cc1de [formerly 17f636c2a2] [formerly bac68cc1de [formerly 17f636c2a2] [formerly 81abb2c60b [formerly 373ac200fcd1c9a39244a2775d95c7b891334632]]]
Former-commit-id: 81abb2c60b
Former-commit-id: c8b0719d48 [formerly 7cde30681b]
Former-commit-id: 3d0d4e9b09
|
2012-08-14 16:27:11 -05:00 |
|
Steve Harris
|
f6ec677a1b
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 27fa10e133 [formerly e3927a11c7] [formerly 27fa10e133 [formerly e3927a11c7] [formerly e530637aa3 [formerly 43d4642bc39a053d40fce9b6aff1d11f3d313dd7]]]
Former-commit-id: e530637aa3
Former-commit-id: 118113bd60 [formerly 1687889756]
Former-commit-id: 03ebee99f8
|
2012-08-14 16:26:00 -05:00 |
|
Ben Steffensmeier
|
4a9e7d5e3d
|
Issue #947 revert changes to dataTime format
Former-commit-id: 54b538bb07 [formerly 50cb7383a6] [formerly 54b538bb07 [formerly 50cb7383a6] [formerly 70ba8d82db [formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]]]
Former-commit-id: 70ba8d82db
Former-commit-id: 36455cfbed [formerly 77b7c4c517]
Former-commit-id: 242cc34efe
|
2012-08-14 16:20:36 -05:00 |
|
Ron Anderson
|
d47eda2d66
|
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 5c80f582b3 [formerly 71d74b1dcf] [formerly 5c80f582b3 [formerly 71d74b1dcf] [formerly 985167892d [formerly 564b72997c59a665398c8687d6bafdb54c469881]]]
Former-commit-id: 985167892d
Former-commit-id: c90619a3bc [formerly 9bf0166f13]
Former-commit-id: 13d7576686
|
2012-08-14 16:20:23 -05:00 |
|
Nate Jensen
|
7bdb5e26ec
|
Merge "Issue #947 revert changes to dataTime format" into development_on_ss_builds
Former-commit-id: 9657ce7e32 [formerly 571e16bd23] [formerly 9657ce7e32 [formerly 571e16bd23] [formerly 80f1766f9a [formerly 22a06b47664b0f7b7592022345cc7e3ead147036]]]
Former-commit-id: 80f1766f9a
Former-commit-id: 45d5fa0366 [formerly b6e459615b]
Former-commit-id: 7961babdb2
|
2012-08-14 16:15:55 -05:00 |
|
Ben Steffensmeier
|
0181083df2
|
Issue #1058 fix reprojection of wind vectors
Former-commit-id: 28aae9f11f [formerly ba9d0b25b5] [formerly 28aae9f11f [formerly ba9d0b25b5] [formerly 9c727d2e33 [formerly 8fdc9841f9033720aa0ceb6389e7b1403d75a2d5]]]
Former-commit-id: 9c727d2e33
Former-commit-id: 2ac8180928 [formerly e65832b2bf]
Former-commit-id: 5112b6ce69
|
2012-08-14 16:15:19 -05:00 |
|
David Gillingham
|
67586ea006
|
Issue #1055: Fix coop precip breakage from Wes2Bridge db changes.
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: e541c86f1b [formerly f40fc68c28] [formerly e541c86f1b [formerly f40fc68c28] [formerly 79a77a38a4 [formerly 03f9de1860008cd1a2b4b60576802a67a8a447fa]]]
Former-commit-id: 79a77a38a4
Former-commit-id: 5ce4e54db9 [formerly dd80a94061]
Former-commit-id: 18c572c983
|
2012-08-14 16:15:10 -05:00 |
|
Ben Steffensmeier
|
7950a24c07
|
Issue #947 revert changes to dataTime format
Former-commit-id: fd2bf26119 [formerly ce689ad5fa] [formerly fd2bf26119 [formerly ce689ad5fa] [formerly 434193b34b [formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]]
Former-commit-id: 434193b34b
Former-commit-id: c14674c64f [formerly 15977fdba2]
Former-commit-id: f50c979293
|
2012-08-14 16:12:02 -05:00 |
|
Ben Steffensmeier
|
5c560e5a56
|
Issue #1018 change product browser to handle no editor conditions better.
Change-Id: I3235ebb6d50eee26c75d31ce91e2a01c2d49b300
Former-commit-id: 6267bdb915 [formerly 4d20aa0e82] [formerly 6267bdb915 [formerly 4d20aa0e82] [formerly 7559065a1d [formerly 7cb30aa5c00eea5b95b6c4b39653fabeaccdd872]]]
Former-commit-id: 7559065a1d
Former-commit-id: 48963ebc07 [formerly 850203f715]
Former-commit-id: 7f5bd99b0c
|
2012-08-14 15:23:34 -05:00 |
|
Lee Venable
|
3187523b41
|
Merge "Issue #1055: Fix coop precip breakage from Wes2Bridge db changes." into development_on_ss_builds
Former-commit-id: fe9a85cefb [formerly 457d099cca] [formerly fe9a85cefb [formerly 457d099cca] [formerly 2c2a3f4aec [formerly cf7be4b4a2a49f365258f1ac6262b64e86e705e4]]]
Former-commit-id: 2c2a3f4aec
Former-commit-id: b42d389cb2 [formerly a3651c5813]
Former-commit-id: 5f180a03cc
|
2012-08-14 14:26:10 -05:00 |
|
Ben Steffensmeier
|
dfd6d73cc2
|
Issue #1058 fix reprojection of wind vectors
Former-commit-id: 283781ba03 [formerly c25c08c8e7] [formerly 283781ba03 [formerly c25c08c8e7] [formerly 09c412d754 [formerly 315965383123120bffe1faa1d63fdfb7b633bc97]]]
Former-commit-id: 09c412d754
Former-commit-id: 6207cd7310 [formerly ea551d3866]
Former-commit-id: e0561a1a35
|
2012-08-14 13:44:21 -05:00 |
|
David Gillingham
|
767fdf56a1
|
Issue #1055: Fix coop precip breakage from Wes2Bridge db changes.
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: 06e789e986 [formerly b587c1ea4f] [formerly 06e789e986 [formerly b587c1ea4f] [formerly f2795370d1 [formerly da6811db78e3fcf57acc25e417ec8319c1dceecf]]]
Former-commit-id: f2795370d1
Former-commit-id: 35ac266c34 [formerly e51d931a5a]
Former-commit-id: 2ba2b982a0
|
2012-08-14 13:36:51 -05:00 |
|
Ben Steffensmeier
|
d6c42b28bf
|
Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
Former-commit-id: 474fe44037 [formerly a4c46c7f55] [formerly 474fe44037 [formerly a4c46c7f55] [formerly 0857d971b5 [formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]]
Former-commit-id: 0857d971b5
Former-commit-id: 08021bcfc2 [formerly a02bb2c092]
Former-commit-id: a17bae6f40
|
2012-08-14 10:25:38 -05:00 |
|
Max Schenkelberg
|
3d43480508
|
Issue #28 Implemented generic true color resource with new extension. Wrote new, more efficient, accurate, and scalable TileSet rendering/managing code to replace AbstractTileSet which VIIRS uses since it took over 10s to load a single frame of data with AbstractTileSet and around 20-30s to load a single true color frame of VIIRS. Put true color code in separate projects to encapsulate functionality. Resources need not depend on these projects, they just have to set the ImagingProvider in their ImagingCapability and true color resource can be loaded through a bundle file.
Change-Id: I624edb115b02611470e2e434e27759c45600111c
Former-commit-id: d6522f8e3a [formerly 93e8619fa5] [formerly d6522f8e3a [formerly 93e8619fa5] [formerly 09b0db0a13 [formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]]
Former-commit-id: 09b0db0a13
Former-commit-id: 107efcaee3 [formerly 784c43ab7c]
Former-commit-id: 79f15e475e
|
2012-08-13 12:20:05 -05:00 |
|
Ben Steffensmeier
|
f87969cbee
|
Issue #1004 change plots to synchronize with dispose instead of joining since join allows paint to happen
Change-Id: I6011a5fedc155ab8d515d3c6eb5d368f582c59bd
Former-commit-id: 6f178a9150 [formerly 603a9c90e4] [formerly 6f178a9150 [formerly 603a9c90e4] [formerly 559efb19fb [formerly aece671b35405e1f278439c9a1a8230dad5cf4c2]]]
Former-commit-id: 559efb19fb
Former-commit-id: d52dd42ab2 [formerly 3f258a2bf8]
Former-commit-id: fa8ea385d9
|
2012-08-13 09:54:22 -05:00 |
|
Ben Steffensmeier
|
32287c896b
|
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 573cc270e8 [formerly c6a121962f] [formerly 573cc270e8 [formerly c6a121962f] [formerly 1e527f83f0 [formerly 06c2c85159598ca803c663de97caed4b6841c135]]]
Former-commit-id: 1e527f83f0
Former-commit-id: 0af9fd4fe2 [formerly c9ff69014b]
Former-commit-id: dc8d05c1be
|
2012-08-09 17:53:19 -05:00 |
|
Ben Steffensmeier
|
62aafd3542
|
Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: 8d118c392a [formerly 525c0b21a9] [formerly 8d118c392a [formerly 525c0b21a9] [formerly b53fe917bc [formerly 045952304218c867d8fe89df9828f70632df2d00]]]
Former-commit-id: b53fe917bc
Former-commit-id: 54b3078ad1 [formerly 4ed3d04e64]
Former-commit-id: fafea907c7
|
2012-08-09 17:50:23 -05:00 |
|
Ben Steffensmeier
|
de38003e6c
|
Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
Former-commit-id: 3f92e385a6 [formerly 3abfef55cc] [formerly 3f92e385a6 [formerly 3abfef55cc] [formerly c1bacb33b1 [formerly 6cb8e45b4f3a78abcfeee982306684eef025fd3d]]]
Former-commit-id: c1bacb33b1
Former-commit-id: 0e48e6e4fd [formerly f711cfdae2]
Former-commit-id: 30702ea3c6
|
2012-08-09 17:45:19 -05:00 |
|
Nate Jensen
|
5e82400554
|
Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds
Former-commit-id: 32cc46ec4e [formerly eeaa2c798f] [formerly 32cc46ec4e [formerly eeaa2c798f] [formerly 4211a8deac [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]]
Former-commit-id: 4211a8deac
Former-commit-id: c0fa1e8cf2 [formerly 2cc3c63ba7]
Former-commit-id: 0df3ab80eb
|
2012-08-09 17:18:38 -05:00 |
|
Ben Steffensmeier
|
aa740ef6a8
|
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 64caa963b1 [formerly 066a5af2a6] [formerly 64caa963b1 [formerly 066a5af2a6] [formerly ad1415948f [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]]
Former-commit-id: ad1415948f
Former-commit-id: e03eb5f5c9 [formerly 65c33256d9]
Former-commit-id: 70f8f93f81
|
2012-08-09 17:16:38 -05:00 |
|
Jonathan Sanchez
|
1986477214
|
Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.
Former-commit-id: 4f2d6630c1 [formerly 6507a97665] [formerly 4f2d6630c1 [formerly 6507a97665] [formerly fa7795d17f [formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]]]
Former-commit-id: fa7795d17f
Former-commit-id: 3952dfc7ac [formerly 7ad6329fe0]
Former-commit-id: 8a006c6093
|
2012-08-09 08:26:21 -05:00 |
|
Nate Jensen
|
b36d8c3f03
|
Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
Former-commit-id: 8cd83e1571 [formerly a88d7bcedc] [formerly 8cd83e1571 [formerly a88d7bcedc] [formerly fbbf74eb50 [formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]]]
Former-commit-id: fbbf74eb50
Former-commit-id: e2462c0cc3 [formerly 1214c05b72]
Former-commit-id: 135239eaee
|
2012-08-08 16:10:13 -05:00 |
|
Ben Steffensmeier
|
873a7d64b6
|
Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: cac790ac5a [formerly 97ba96759c] [formerly cac790ac5a [formerly 97ba96759c] [formerly 5da238c8b9 [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]]
Former-commit-id: 5da238c8b9
Former-commit-id: 8cdf1f8d1c [formerly b6cc71bf75]
Former-commit-id: 726e934763
|
2012-08-08 14:41:33 -05:00 |
|
Steve Harris
|
ba5dc17e63
|
Merge branch 'development_on_ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: 24515a43b6 [formerly 1feb52683a] [formerly 24515a43b6 [formerly 1feb52683a] [formerly a9b587019a [formerly e49333c9cddc47d2b8f3f835e19657043d51a7af]]]
Former-commit-id: a9b587019a
Former-commit-id: 2b43860c67 [formerly 805972e2fd]
Former-commit-id: e9f1fc444d
|
2012-08-08 13:59:52 -05:00 |
|
Steve Harris
|
fe54bcc7e3
|
Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: fc39ef78e4 [formerly bbf4b18204] [formerly fc39ef78e4 [formerly bbf4b18204] [formerly d538fd8913 [formerly d8080798d6c69b9cf0f9042660c5ad910cf123c6]]]
Former-commit-id: d538fd8913
Former-commit-id: 352f391700 [formerly 0ef9f1c86e]
Former-commit-id: 9d5b631109
|
2012-08-08 13:57:46 -05:00 |
|
Roger Ferrel
|
4e15803926
|
Issue #875 Markers and group added to Cave.
Amend: Removed python file
Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.
Amend: deleted unwanted .project file
Amend: Removed comment out code and fix class descriptions
Amend: Changes based on reviewer comments.
Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8
Former-commit-id: b3c357c964 [formerly 2e3fc4b400] [formerly b3c357c964 [formerly 2e3fc4b400] [formerly f4ae8eb150 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]]
Former-commit-id: f4ae8eb150
Former-commit-id: 69f22fe6bb [formerly ae41499ba2]
Former-commit-id: 4e356b8a13
|
2012-08-08 13:35:47 -05:00 |
|
Nate Jensen
|
1d30356cec
|
Merge "Issue #1004 make dispose/shutdown of plot jobs more permenant by joining." into development_on_ss_builds
Former-commit-id: a241db9e69 [formerly b704e8d3f4] [formerly a241db9e69 [formerly b704e8d3f4] [formerly 6c758b7c84 [formerly 65ea6e46e059a058d5a46b0cf28f1b50c3057744]]]
Former-commit-id: 6c758b7c84
Former-commit-id: 197fbde870 [formerly 81bba55a1e]
Former-commit-id: d2ae1cc27a
|
2012-08-08 09:43:40 -05:00 |
|
Steve Harris
|
05ef298baf
|
Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: e2267aa186 [formerly 926ff5dc5a] [formerly e2267aa186 [formerly 926ff5dc5a] [formerly 9e2e0fa166 [formerly 5717f9bf344b6d78ca30f1387679e535bac5a13c]]]
Former-commit-id: 9e2e0fa166
Former-commit-id: d42beafc73 [formerly 15753699bd]
Former-commit-id: 3eefb26e94
|
2012-08-07 15:29:25 -05:00 |
|
Jonathan Sanchez
|
6d4683e90d
|
Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.
Former-commit-id: 17a3198056 [formerly 051b63c3e9] [formerly 17a3198056 [formerly 051b63c3e9] [formerly df301c2e03 [formerly cfaece96bd77aef32073400c1abaf0bf8cd3f103]]]
Former-commit-id: df301c2e03
Former-commit-id: cc261d9ce2 [formerly 200ed3c3fb]
Former-commit-id: e2d5a0b384
|
2012-08-07 14:50:15 -05:00 |
|
Ben Steffensmeier
|
1dc30083ca
|
Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
Former-commit-id: 0a974b26c2 [formerly c9774a4f03] [formerly 0a974b26c2 [formerly c9774a4f03] [formerly 83d6cde368 [formerly 4c5e5e0d54c523723edd16b756dc1caf208f5cd6]]]
Former-commit-id: 83d6cde368
Former-commit-id: f47d533ac3 [formerly ea70488664]
Former-commit-id: d645fc787e
|
2012-08-07 12:03:13 -05:00 |
|
Steve Harris
|
87b964449a
|
Fixed merge of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 6615c96f33 [formerly 6dae0398d3] [formerly 6615c96f33 [formerly 6dae0398d3] [formerly 3f88fa9078 [formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]]]
Former-commit-id: 3f88fa9078
Former-commit-id: a810a273a2 [formerly 9387e8b2d0]
Former-commit-id: 57d749c037
|
2012-08-07 10:04:39 -05:00 |
|
Steve Harris
|
b77e7400c8
|
Merge branch 'development' into development_on_ss_builds
Former-commit-id: f540dbfb87 [formerly 32ee17d124] [formerly f540dbfb87 [formerly 32ee17d124] [formerly 515c8ec596 [formerly 69faa80856ac4c63f9cc79ccd7370e129093f091]]]
Former-commit-id: 515c8ec596
Former-commit-id: 5e30a4282c [formerly 533d58b312]
Former-commit-id: e3da0259e8
|
2012-08-06 12:57:56 -05:00 |
|
Steve Harris
|
3f8544203f
|
Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: 60c0cfc3b3 [formerly d90c5f989d] [formerly 60c0cfc3b3 [formerly d90c5f989d] [formerly f3babcf1a1 [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]]
Former-commit-id: f3babcf1a1
Former-commit-id: 2f3ef9f4da [formerly 62e9207ba7]
Former-commit-id: 0428530b73
|
2012-08-06 11:13:47 -05:00 |
|
Max Schenkelberg
|
335d2a0942
|
Issue #626 Fixed GLStats to print proper message name. Fixed SatelliteDao to correctly use UnsignedByteArrayWrapper to properly reflect data. Modified UnsignedShortArrayWrapper to extend ShortArrayWrapper like Byte/UnsignedByteArrayWrapper does. Fixed DataTime legend generation when time range is not even hour increment
Change-Id: Ie79883c1d901f24042234fe5e79b5ae903e5792b
Former-commit-id: ae3b62ca12 [formerly 36bf80d13e] [formerly ae3b62ca12 [formerly 36bf80d13e] [formerly 0031d21292 [formerly b0466e68bea4102f397db214bb58b66c10a338ed]]]
Former-commit-id: 0031d21292
Former-commit-id: 1aa6d193b4 [formerly 482dfb4711]
Former-commit-id: 92df0af108
|
2012-08-06 09:44:44 -05:00 |
|
Steve Harris
|
9fd142b98e
|
Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
rpms/awips2.64/Installer.h5py/component.spec
Former-commit-id: 9e2d161f8d [formerly f0b7d5e4c5] [formerly 9e2d161f8d [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]
Former-commit-id: 85f82b18b3
Former-commit-id: 52e0da2293 [formerly b2432e096f]
Former-commit-id: dcc56b8a23
|
2012-08-06 09:38:26 -05:00 |
|