Commit graph

26 commits

Author SHA1 Message Date
Ron Anderson
291504f08d Issue #2909 Remove useLegacyMergeSort java parameter
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a

Former-commit-id: 010666a971 [formerly f921b5c83b] [formerly d1b36c4a72] [formerly dd8bfdf941 [formerly d1b36c4a72 [formerly 3aeb50672f8de7b973f234e0ab351416cbf7670b]]]
Former-commit-id: dd8bfdf941
Former-commit-id: 4689925288bb72398ed1efadbc5c3d15c54a177e [formerly b82cf065b5]
Former-commit-id: f24f542137
2014-03-13 11:54:15 -05:00
Ben Steffensmeier
ceb056d304 Issue #2791 Move D2D Grids to direct memory.
Former-commit-id: 6dc44e895f [formerly fd34cf3993] [formerly 12ed63619a] [formerly 775c29e77c [formerly 12ed63619a [formerly 8d8a06be12652349032f15ab1e31d5f23adf0b24]]]
Former-commit-id: 775c29e77c
Former-commit-id: e70e825d566372eb4b060f189bea9a1c2b022f0d [formerly a06a98750f]
Former-commit-id: 2bc8805fbc
2014-03-05 14:57:28 -06:00
Greg Armendariz
fc4ce60ce6 Issue #2754 - Remove extra character
Former-commit-id: ddf3e9785f [formerly 6ff868a167] [formerly 9cc089b369] [formerly 1017abdc78 [formerly 9cc089b369 [formerly 5979ad555987210e07e32eb5336e7cb427ac06c3]]]
Former-commit-id: 1017abdc78
Former-commit-id: 36e64f6fb42a953ef4b064e4d83069bf3fb501c5 [formerly a8c75ce81e]
Former-commit-id: 4e092b5810
2014-01-29 08:43:09 -06:00
Steve Harris
6cb92b1f57 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: 56f5ae9f48 [formerly a465718a0d] [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a]
Former-commit-id: b62efa9387
2014-01-21 12:36:54 -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
Brian Clements
d53024b73f Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files


Former-commit-id: 8d6a469928 [formerly c63c8e2fc6] [formerly f9a8b68da5] [formerly 0076ec9aaf [formerly f9a8b68da5 [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]]
Former-commit-id: 0076ec9aaf
Former-commit-id: 99fc908864fba07455340f77fae46faf16981fcf [formerly e420ae009d]
Former-commit-id: 496d15d77f
2014-01-14 17:05:28 -06:00
Brian Clements
42e259b83c Issue #2594 made heap status monitor default on launch
Former-commit-id: 3333d3b926 [formerly 4f37164fc5] [formerly 6ba1eb0edb] [formerly 4a62eb90dc [formerly 6ba1eb0edb [formerly 1ba7ebb59e28ba93bb752c32ffce937a4455d478]]]
Former-commit-id: 4a62eb90dc
Former-commit-id: 0c8dc064b7186b1457f6e9bd47835cc2ba812b79 [formerly 3d196a00dd]
Former-commit-id: cde78c4006
2014-01-10 14:54:14 -06:00
Max Schenkelberg
b5b121032d Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage
Amend: Added jgerth comment history back in

Change-Id: I08733fcf46f9bdcded1f609bcdd26459652edaef

Former-commit-id: 9d590ce7f9 [formerly 7f4b63283d] [formerly dda69d36b7] [formerly a18686135c [formerly dda69d36b7 [formerly 2e52921b21ecaeaa11be8277e264446686d65338]]]
Former-commit-id: a18686135c
Former-commit-id: 627430677d858453f22a1a0fc99838be1d3e97bc [formerly 75ae62fd9a]
Former-commit-id: 23b6e68e14
2013-08-06 12:37:52 -05:00
Nate Jensen
8b409d373f Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1

Former-commit-id: 9c575f1754 [formerly 621a4da9b7] [formerly 81d9a28d53] [formerly a0aeeedd23 [formerly 81d9a28d53 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]]]
Former-commit-id: a0aeeedd23
Former-commit-id: 7e6549f719edb3018a4fa8735433e50b1367bd15 [formerly 447ac6311d]
Former-commit-id: 5c123e60d8
2013-07-17 14:03:43 -05:00
Max Schenkelberg
f025c05d04 Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]
Former-commit-id: d1881ffa51
2013-07-15 14:26:15 -05:00
Nate Jensen
cce5d8e8ff Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]
Former-commit-id: db6152e524
Former-commit-id: 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167 [formerly 6da64f329c]
Former-commit-id: 5a6b0f99cc
2013-07-01 14:41:05 -05:00
Nate Jensen
f173cc29e1 Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710 [formerly 2200c7cded]
Former-commit-id: 4a39d586d2
2013-06-13 11:39:30 -05:00
Steve Harris
43b7a9b410 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]
Former-commit-id: 0aab285b8a
2013-06-10 15:17:17 -04:00
Steve Harris
6e1e454a9f 13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]
Former-commit-id: 8347bed50e
Former-commit-id: f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661]
Former-commit-id: ff7a21ac37
2013-05-13 12:58:10 -04:00
Steve Harris
bb30a41300 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]
Former-commit-id: f80f98cee2
2013-03-25 13:27:13 -05:00
Steve Harris
45a2d0501d 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]
Former-commit-id: ed5f1dbab6
2013-03-13 09:50:28 -05:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Steven Harris
9c67bbab77 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]
Former-commit-id: f5e63d5f93
2012-09-27 15:57:45 -05:00
Steve Harris
1f521a70b3 12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
2012-06-08 13:39:48 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Ben Steffensmeier
1ac84dc230 Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time.
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f

Former-commit-id: 7c3545170d [formerly 3713d7a181] [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly 5dee50e7e9 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]
Former-commit-id: d7a63995f1
Former-commit-id: 17cbace4358ff60cc55095422d0870a3cb6e704b [formerly e52c2ffb20]
Former-commit-id: dba810ddc4
2012-02-28 15:20:37 -06:00
Ben Steffensmeier
168b8f9ee9 Issue #33 rearrange Thin Client preferences to allow connectivity preferences to enable/disable other preferences when they are selected.
Change-Id: I3647ea498e9e44d7175cc755183fefa3d322c059

Former-commit-id: e74b1747a0 [formerly 71ba2e305b] [formerly ab1273cc02] [formerly 563f93b261 [formerly ab1273cc02 [formerly 53fac28e86ae499846a54cc175f72e2e16b24e37]]]
Former-commit-id: 563f93b261
Former-commit-id: ea5d145fb5ede8d77faee7290f876e2a92dc9576 [formerly d9151fb62e]
Former-commit-id: c603c5fdde
2012-01-27 13:17:08 -06:00
Bryan Kowal
5368408482 Issue #22 - merging Windows MSI installer changes into git thinclient branch.
Former-commit-id: f522b77248 [formerly be61ec82b0] [formerly 48b420cbb2] [formerly ff44a81ceb [formerly 48b420cbb2 [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]]
Former-commit-id: ff44a81ceb
Former-commit-id: 68d481a3d913cffc25e47fc6f2eae8a4f8628bf1 [formerly 5eb9afeb98]
Former-commit-id: bddafa475a
2012-01-23 12:36:13 -06:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00