Commit graph

17 commits

Author SHA1 Message Date
Richard Peter
08d2290f97 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 73f12bf669 [formerly 5c0cf804f1] [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]]
Former-commit-id: 3e8093536581ac6595438ca5eb497ae394fe30e8 [formerly 4059813742]
Former-commit-id: 1c743d4d44
2013-12-17 21:04:53 -06:00
Steve Harris
e242b041ad 14.1.1-13 baseline
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]]
Former-commit-id: b0b55a676b
Former-commit-id: 690b177ded [formerly 5368f23247] [formerly afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979]]
Former-commit-id: 0ea21b66b82286c758014c97bc2a1696ff006efb [formerly ff08301890]
Former-commit-id: 800136d61b
2013-12-12 16:59:57 -05:00
Bryan Kowal
1000e5a16a Issue #2297 - fix 14.2.1 build
- Amend: fix issue #

Change-Id: Ib438dfdb4f80320f2052c5941d80f2dbb49882e4

Former-commit-id: 718c3f2cd5 [formerly 87390b9381] [formerly 1b35cf5c72] [formerly 718c3f2cd5 [formerly 87390b9381] [formerly 1b35cf5c72] [formerly fb10395d44 [formerly 1b35cf5c72 [formerly ff7244318b689bfee01796af0b1a0c1b277e4b48]]]]
Former-commit-id: fb10395d44
Former-commit-id: 8e9f94a05d [formerly 93743b9d2c] [formerly b02c08bb0c81babc52731d724a3858a7b90a90eb [formerly 85c2c499b6]]
Former-commit-id: 453a81d2e5e7861db8b96c2ac0ad3e3392a3c94e [formerly abde04230f]
Former-commit-id: ec850d5a85
2013-09-17 09:16:21 -05:00
Ben Steffensmeier
58012f921c Issue #2262 Delete meteolib.
Former-commit-id: 4eefcf0f6e [formerly f236cc79a2] [formerly ffa79b8992] [formerly 4eefcf0f6e [formerly f236cc79a2] [formerly ffa79b8992] [formerly 0961408d40 [formerly ffa79b8992 [formerly 125546e4da877fbb732b9fa40c68b08bc764f8e0]]]]
Former-commit-id: 0961408d40
Former-commit-id: cd218f5b25 [formerly ce926c8e6b] [formerly 8fce66bd98330c98b9ecec5b4188a599fc977a01 [formerly e4a0bd5370]]
Former-commit-id: ff09a8f849e7916e935c2a0f565dec6904722d8e [formerly 89ff18193c]
Former-commit-id: e795c61c10
2013-08-28 14:53:46 -05:00
Bryan Kowal
7826d2a96d Issue #2164 - fix 13.6.1 build
Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3

Former-commit-id: 970eaad447 [formerly 34efd01a4f] [formerly c2b54d7c31] [formerly 970eaad447 [formerly 34efd01a4f] [formerly c2b54d7c31] [formerly 1c49dff18e [formerly c2b54d7c31 [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]]]]
Former-commit-id: 1c49dff18e
Former-commit-id: b94334199e [formerly c9fa275089] [formerly fe53471fbd73b96c7f069b638956ba81e12ff83b [formerly 0787aca88b]]
Former-commit-id: a5cdeeff20003c17b4c880bb19089237906e7df1 [formerly 5c14f56265]
Former-commit-id: ca7f9097f6
2013-07-03 11:25:46 -05:00
Steve Harris
ba48ab0362 13.4.1-4 baseline
Former-commit-id: ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 7d085660f8 [formerly 4357e2dacc] [formerly 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32]]
Former-commit-id: 6fc143d13d42b0d419bcede3614f0ee982260764 [formerly e0986cfda8]
Former-commit-id: 5dbfeb38ac
2013-05-02 10:00:38 -05:00
Bryan Kowal
d60c0c39e1 Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6

Former-commit-id: a8fe170b53 [formerly c448651065] [formerly 03a2e82b77] [formerly a8fe170b53 [formerly c448651065] [formerly 03a2e82b77] [formerly 8d3c98eb5d [formerly 03a2e82b77 [formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: 64dbc18c8e [formerly 12e9b9d75b] [formerly fab6d44468dbf0db3894a28e8b00ea49184bb43e [formerly 5816ddaf77]]
Former-commit-id: e7f0a63952036826712c60267aeae594c52d3e3f [formerly bd47c62789]
Former-commit-id: 6032a8dd0c
2013-04-03 18:27:10 -05:00
Steve Harris
b92dfd1b62 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
2013-01-23 11:18:44 -05:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
94cd5a1388 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de]
Former-commit-id: af59663a99
2012-11-07 12:41:20 -06:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00
Steve Harris
9d4e230e7a 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
2012-09-11 16:00:38 -05:00
Steve Harris
46068c6716 12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Bryan Kowal
7e2690ee90 Issue #22 - merging Windows MSI installer changes into git thinclient branch.
Former-commit-id: f522b77248 [formerly be61ec82b0] [formerly 48b420cbb2] [formerly f522b77248 [formerly be61ec82b0] [formerly 48b420cbb2] [formerly ff44a81ceb [formerly 48b420cbb2 [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]]]
Former-commit-id: ff44a81ceb
Former-commit-id: 5368408482 [formerly bddafa475a] [formerly 68d481a3d913cffc25e47fc6f2eae8a4f8628bf1 [formerly 5eb9afeb98]]
Former-commit-id: b43548f0f51b0647e84191cf2451632da3f62170 [formerly dd1c5cdee4]
Former-commit-id: 28028b9ad3
2012-01-23 12:36:13 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00