Commit graph

2769 commits

Author SHA1 Message Date
Nate Jensen
3955f66213 Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 6ef26a636c [formerly 32bd9fd635] [formerly 6ef26a636c [formerly 32bd9fd635] [formerly 0f81b80467 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: 6e2150ccd7 [formerly 9f33e97c1b]
Former-commit-id: 1f5f895dcf
2014-02-20 10:53:21 -06:00
Brad Gonzales
b0421675ff Issue #2771 For Data Delivery CAVE now request current id from
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: 379c0fb46c [formerly 19460ed0d7] [formerly 379c0fb46c [formerly 19460ed0d7] [formerly ba4e308328 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]
Former-commit-id: ba4e308328
Former-commit-id: 1b76488111 [formerly 3be3380944]
Former-commit-id: 9aa1cb299e
2014-02-18 11:10:44 -06:00
Ron Anderson
8a7af092f2 Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: e7f2b6883d [formerly 32bcf9d0d0] [formerly e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 0135771eec [formerly d4ba9eba94]
Former-commit-id: 68e03bf02f
2014-02-18 10:45:20 -06:00
Nate Jensen
0dd9cd1094 Issue #2704 fix alertviz connectivity checks
Former-commit-id: 0160ab0464 [formerly 0c4de50218] [formerly 0160ab0464 [formerly 0c4de50218] [formerly 4d68994525 [formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]
Former-commit-id: 4d68994525
Former-commit-id: 121bcd184a [formerly 228ab8dd60]
Former-commit-id: 944df080f4
2014-02-17 17:10:07 -06:00
Nate Jensen
695d03b815 Issue #2812 made getHostname() use getWsId().getHostname for consistency
and working on windows


Former-commit-id: c8e70cd6b1 [formerly 15ff4ab5d7] [formerly c8e70cd6b1 [formerly 15ff4ab5d7] [formerly 2486e39192 [formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]
Former-commit-id: 2486e39192
Former-commit-id: b801b36ca7 [formerly 0314d61773]
Former-commit-id: e6dae7a23c
2014-02-17 11:58:04 -06:00
Steve Harris
7805eac857 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: d0352c69d4 [formerly 267cc881a4] [formerly d0352c69d4 [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 146412a8bd [formerly e115197bb7]
Former-commit-id: 28aa3dd195
2014-02-17 08:54:34 -06:00
Mike Duff
fe38928d33 Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
Former-commit-id: 43ea3b0918 [formerly ac62d322ed] [formerly 43ea3b0918 [formerly ac62d322ed] [formerly 346dc4afff [formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]]]
Former-commit-id: 346dc4afff
Former-commit-id: 6601dff483 [formerly 5b3a55d11f]
Former-commit-id: c5f33b0ed0
2014-02-14 08:53:40 -06:00
Ron Anderson
3598139635 Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
Former-commit-id: 21e95cc2f0 [formerly 51c9d27a39] [formerly 21e95cc2f0 [formerly 51c9d27a39] [formerly 42fd9c8f9a [formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]]]
Former-commit-id: 42fd9c8f9a
Former-commit-id: ca11555427 [formerly b84a83eb6f]
Former-commit-id: 828738b81f
2014-02-13 10:46:27 -06:00
Ron Anderson
7447a71c10 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 3e78908bb5 [formerly fcf45916f4] [formerly 3e78908bb5 [formerly fcf45916f4] [formerly 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]
Former-commit-id: 2f067699f2
Former-commit-id: d9b82b4ebe [formerly 2d7c87ac84]
Former-commit-id: d298aabe40
2014-02-13 10:10:34 -06:00
Lee Venable
3a195bd22e Issue #2773 - added code to help prevent eclipse bug from occurring.
Former-commit-id: 8073fd22b1 [formerly 7099472204] [formerly 8073fd22b1 [formerly 7099472204] [formerly ce08022db7 [formerly 7b3700b5ad07c677755844f969b5c31f31be138b]]]
Former-commit-id: ce08022db7
Former-commit-id: a7302a3232 [formerly c74ae6b83d]
Former-commit-id: 5ae2a544ca
2014-02-12 13:47:20 -06:00
Juliya Dynina
850f8e1d0d Merge "ASM #85" into asm_14.2.2
Former-commit-id: 8e4c8bf92d [formerly 5095ac0758] [formerly 8e4c8bf92d [formerly 5095ac0758] [formerly deff8db6eb [formerly b03ca5694c4fbeab1d84dc59ea2e133b5c01f5a7]]]
Former-commit-id: deff8db6eb
Former-commit-id: 99a2addf18 [formerly eeffda2e2f]
Former-commit-id: 34c737464a
2014-02-12 13:15:58 -05:00
Loubna.Bousaidi
e2f1169a88 ASM #85
Change-Id: I782bbebc746425446c523b6b4db026d81f85b2da

Former-commit-id: fe1c94a422 [formerly e3168d08cf] [formerly fe1c94a422 [formerly e3168d08cf] [formerly 55d8f64139 [formerly 4d7d62ed986a781fb225775d2446740453bd8c89]]]
Former-commit-id: 55d8f64139
Former-commit-id: d0109c690c [formerly de69883b43]
Former-commit-id: cc105bae69
2014-02-11 22:12:48 +00:00
Brian.Dyke
f47dd3ef59 14.1.1-18 baseline
Former-commit-id: f05a2220cd [formerly 575e328123] [formerly f05a2220cd [formerly 575e328123] [formerly 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: d61ae6c5f4 [formerly c5857c30f2]
Former-commit-id: d1db845406
2014-02-11 15:52:50 -05:00
Lee Venable
c1543acd86 Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
Former-commit-id: c7cfd49622 [formerly 5c256dc19c] [formerly c7cfd49622 [formerly 5c256dc19c] [formerly f078971b5d [formerly c75877624ab414c1a45bc7326c49aa99c8ec3021]]]
Former-commit-id: f078971b5d
Former-commit-id: ab6fab4199 [formerly 42fdfa4964]
Former-commit-id: 22aab74e8d
2014-02-11 09:15:44 -06:00
Juliya Dynina
6d23cb2729 Merge "ASM #94" into asm_14.2.2
Former-commit-id: 00d8dfb641 [formerly e2479f4075] [formerly 00d8dfb641 [formerly e2479f4075] [formerly 0ae2a064a3 [formerly c2eb6022d788294a87a7878cdac6c325be1c1062]]]
Former-commit-id: 0ae2a064a3
Former-commit-id: d66458b0b0 [formerly 56c383bb73]
Former-commit-id: 3995dee5e1
2014-02-11 10:08:00 -05:00
Michael Gamazaychikov
554c3286a9 ASM #94
Change-Id: I97797a7adbd17532b261987caf2fdcaa1d39c9ed

Former-commit-id: 8cd5cce89e [formerly 42399284ca] [formerly 8cd5cce89e [formerly 42399284ca] [formerly b63053d8b4 [formerly 3c9c34c84ac1cd4962c3e6f877bd33b37aab705a]]]
Former-commit-id: b63053d8b4
Former-commit-id: 293dd963f1 [formerly 60de3bbc43]
Former-commit-id: e5ca7e8740
2014-02-11 01:32:37 +00:00
Nate Jensen
93a740106d Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: c28085118f [formerly 75ca70fba6] [formerly c28085118f [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]
Former-commit-id: fd43d9e095
Former-commit-id: c0256ac19e [formerly 2111989497]
Former-commit-id: 9e09da8bb6
2014-02-10 16:48:29 -06:00
Max Schenkelberg
560bc77a16 Issue #2680 fixed samplers in structs issues with GLSL spec.
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9

Former-commit-id: 3c1fafe328 [formerly 7822511754] [formerly 3c1fafe328 [formerly 7822511754] [formerly a8a67634f9 [formerly 4f3635fc682c2a1746e188dac0f371676c9e0be9]]]
Former-commit-id: a8a67634f9
Former-commit-id: dd872433c7 [formerly e2e9eaaf35]
Former-commit-id: 9d6d418d48
2014-02-10 13:43:16 -06:00
Juliya Dynina
b252bed918 Merge "ASM #250" into asm_14.2.2
Former-commit-id: 2cdba70b78 [formerly d63bec582a] [formerly 2cdba70b78 [formerly d63bec582a] [formerly 81f1d6cf12 [formerly a52178c96037755d72eb4b3f5d5f303d9c9ddf65]]]
Former-commit-id: 81f1d6cf12
Former-commit-id: e5d4f42649 [formerly eb0e858f60]
Former-commit-id: 43554c6ecb
2014-02-10 14:04:52 -05:00
Lee Venable
1a8f530d0d Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
Former-commit-id: d6fa79f1a7 [formerly 27be4297e6] [formerly d6fa79f1a7 [formerly 27be4297e6] [formerly 88a9d20316 [formerly 213ecfda92272947cda51d9c3d00b117a3d52a76]]]
Former-commit-id: 88a9d20316
Former-commit-id: 65e6fa1963 [formerly d975dcf01e]
Former-commit-id: 78df434dba
2014-02-10 11:50:07 -06:00
Nate Jensen
2effa29507 Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
Former-commit-id: d16d679809 [formerly 5c7c14a6c4] [formerly d16d679809 [formerly 5c7c14a6c4] [formerly a48c1c6783 [formerly 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e]]]
Former-commit-id: a48c1c6783
Former-commit-id: 3047063c6e [formerly 57aa678883]
Former-commit-id: 9459523de9
2014-02-10 09:53:41 -06:00
Mike Duff
a87ce0b532 Issue #2453 - Notification Center refactor
Former-commit-id: 61c57d2254 [formerly eeb78f7f20] [formerly 61c57d2254 [formerly eeb78f7f20] [formerly 2c9d603e50 [formerly f570a3945ad8e9e8bc4f88989a0ec10da191856a]]]
Former-commit-id: 2c9d603e50
Former-commit-id: 7535b51fe7 [formerly 4a87525df0]
Former-commit-id: f005aa3d8d
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
eb65002cf6 Issue #2211 Fix data mapped sampling.
Former-commit-id: d219a687c9 [formerly 724bb85676] [formerly d219a687c9 [formerly 724bb85676] [formerly 3d76d6655b [formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]]
Former-commit-id: 3d76d6655b
Former-commit-id: a37a910f67 [formerly 6a95dd6242]
Former-commit-id: a8c075d7e3
2014-02-07 13:00:00 -06:00
David Gillingham
e20060f1da Issue #2509: Fix baseline merge breakage to ifpIMAGE.
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00

Former-commit-id: b12e29dd7c [formerly 03d36b8309] [formerly b12e29dd7c [formerly 03d36b8309] [formerly e8ffc73893 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]]
Former-commit-id: e8ffc73893
Former-commit-id: ad8c40032f [formerly 94ec272ab2]
Former-commit-id: 06d68cc0be
2014-02-07 09:51:42 -06:00
Rici.Yu
2293b38bfd ASM #102
Change-Id: Idae87ce34f52bc79144742b92cff7e3537a84e99

Former-commit-id: 6c8fa82be2 [formerly 4010ef5fd8] [formerly 6c8fa82be2 [formerly 4010ef5fd8] [formerly 3bc070a8ec [formerly 6874b003afcebb837e11579eae048e2aa90cbfc7]]]
Former-commit-id: 3bc070a8ec
Former-commit-id: b35b74ca23 [formerly 7cd5b3e16d]
Former-commit-id: eeb2d07c6c
2014-02-07 10:43:29 -05:00
Loubna.Bousaidi
1460934e41 ASM #250
Change-Id: I81033a3a597e63f1ad53a7a1cefc4a775297f513

Former-commit-id: 43d3e156a7 [formerly 44e04ffef0] [formerly 43d3e156a7 [formerly 44e04ffef0] [formerly 176de0262c [formerly 0d1bad67bc93e356e26d2b0f3e411d3e751aa9f4]]]
Former-commit-id: 176de0262c
Former-commit-id: 729beccf49 [formerly a0f435ca20]
Former-commit-id: 2729ea46f0
2014-02-07 15:15:58 +00:00
Richard Peter
8471e5dd46 Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
Former-commit-id: 82fc0a2ed3 [formerly 64f0cabaef] [formerly 82fc0a2ed3 [formerly 64f0cabaef] [formerly 36d3d21b57 [formerly daacb19de029a15f94338c84a85116d0435f79be]]]
Former-commit-id: 36d3d21b57
Former-commit-id: c3c1205848 [formerly c965993d17]
Former-commit-id: 15c2f761be
2014-02-05 18:20:36 -06:00
Mike Duff
377beb33a8 Issue #2677 - Don't do overlap checks when updating subs to deactivated.
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: bafe19bbd5 [formerly 101c08818d] [formerly bafe19bbd5 [formerly 101c08818d] [formerly 6b01c2957f [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]
Former-commit-id: 6b01c2957f
Former-commit-id: 9edf591218 [formerly 6a2f75e8d5]
Former-commit-id: bb43ec00b1
2014-02-05 16:08:01 -06:00
Juliya Dynina
05ad2e4da5 Merge "ASM #114" into asm_14.2.2
Former-commit-id: 3edd73f78c [formerly 575ed3610d] [formerly 3edd73f78c [formerly 575ed3610d] [formerly c6253811e8 [formerly d719e88d510424020955f06d8b597d2df3573836]]]
Former-commit-id: c6253811e8
Former-commit-id: f54454f8f1 [formerly 430b9a1ace]
Former-commit-id: eb96dc613f
2014-02-05 10:42:30 -05:00
Brian.Dyke
4b9bccad66 Issue #124
Former-commit-id: 3ba93b175e [formerly 439f053309] [formerly 3ba93b175e [formerly 439f053309] [formerly 0cc11ddfd3 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]]
Former-commit-id: 0cc11ddfd3
Former-commit-id: e1d788683d [formerly 90b4e7ebf0]
Former-commit-id: ff2ccb40e4
2014-02-04 16:56:47 -05:00
Brian.Dyke
42e17bf5f3 Issue #83
Former-commit-id: f2e56b268c [formerly 484119f6b0] [formerly f2e56b268c [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 3c160bb05e [formerly f088dab5ef]
Former-commit-id: 870b355263
2014-02-04 16:32:42 -05:00
Mike Duff
267f0aac0b Issue #2722 - Add auto refresh to sub manager dialog
Former-commit-id: 227eb23157 [formerly 04ee397f2b] [formerly 227eb23157 [formerly 04ee397f2b] [formerly ab9621698f [formerly f678a39b37040bd637cf210f73aaef0841bda36e]]]
Former-commit-id: ab9621698f
Former-commit-id: f7566298b2 [formerly e984863c1c]
Former-commit-id: bb919f7d09
2014-02-04 12:45:33 -06:00
steve.naples
14876073f9 ASM #235
Change-Id: Ic3a6237b0a1f9ddf06621c984d2f11b7e08d7adb

Former-commit-id: b7b5dc3497 [formerly c76099274a] [formerly b7b5dc3497 [formerly c76099274a] [formerly 22808af7e2 [formerly 678ad5b35f22b71f54200fbf5b88ebd9e4da9563]]]
Former-commit-id: 22808af7e2
Former-commit-id: 26dd36e272 [formerly cb508369cf]
Former-commit-id: 0aac2a554b
2014-02-04 18:23:46 +00:00
Brian.Dyke
b8f7317b9d 14.1.1-17 baseline
Former-commit-id: f3d34b0c38 [formerly 180d1356cd] [formerly f3d34b0c38 [formerly 180d1356cd] [formerly 23280af290 [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]
Former-commit-id: 23280af290
Former-commit-id: f1cc9d6ee2 [formerly 947ec5fd96]
Former-commit-id: 948fffa361
2014-02-04 12:33:46 -05:00
Ben Steffensmeier
f81c6dd1b9 Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834

Former-commit-id: 921401ffe9 [formerly 8865177c6b] [formerly 921401ffe9 [formerly 8865177c6b] [formerly 97a64f89f1 [formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]]
Former-commit-id: 97a64f89f1
Former-commit-id: 1f34342948 [formerly 2be72739b5]
Former-commit-id: d05d31fa34
2014-02-03 14:07:07 -06:00
Juliya Dynina
06e27dfdaa Merge "ASM #290" into asm_14.2.2
Former-commit-id: df338a3302 [formerly 8cdc5b446a] [formerly df338a3302 [formerly 8cdc5b446a] [formerly a3ac0236b0 [formerly 3a31872714dbc04cfd7a0f1e353970b896b047a7]]]
Former-commit-id: a3ac0236b0
Former-commit-id: 30e6373e80 [formerly 17d5e6f7db]
Former-commit-id: ea452f94b2
2014-01-31 09:13:33 -05:00
Juliya Dynina
407b5fe299 Merge "ASM #120" into asm_14.2.2
Former-commit-id: 060fb2bd00 [formerly 15c4ec933c] [formerly 060fb2bd00 [formerly 15c4ec933c] [formerly 5867a062d7 [formerly 30a875b35b090132cc6ec8a2474b5877bb7c6042]]]
Former-commit-id: 5867a062d7
Former-commit-id: f4643eba7f [formerly 66653cbcc1]
Former-commit-id: 9954d4076a
2014-01-31 09:12:20 -05:00
steve.naples
e2429909de ASM #290
Change-Id: Id6160e628c4fe3c4c62ef58ccb2b7624268e64d4

Former-commit-id: 7ecb7b027c [formerly 6501c2c398] [formerly 7ecb7b027c [formerly 6501c2c398] [formerly d4a0b7a0d1 [formerly 53b6ac674a3b7bbce71ce2a81b5bb3715baeaa13]]]
Former-commit-id: d4a0b7a0d1
Former-commit-id: ae3b2edcaa [formerly 2e85bffc6e]
Former-commit-id: 3704b81249
2014-01-30 21:03:38 +00:00
steve.naples
1e58a38e4c ASM #120
Change-Id: I657d872f612475ccf21cdd3c08f8075180ec192a

Former-commit-id: 56deadaa00 [formerly 709dc589ce] [formerly 56deadaa00 [formerly 709dc589ce] [formerly b303d1ecbb [formerly 656f31b7df8a805e7f38a02c29bce05a1bcff639]]]
Former-commit-id: b303d1ecbb
Former-commit-id: fa35b8598b [formerly 38500e5d21]
Former-commit-id: 2a4e6dc9fd
2014-01-30 20:59:39 +00:00
Juliya Dynina
d1839be63f Merge "ASM #110" into asm_14.2.2
Former-commit-id: 33f10e0975 [formerly a28662b25d] [formerly 33f10e0975 [formerly a28662b25d] [formerly c26a2d5cab [formerly aa8647f0479204a43bf50fc498a26768a2feb989]]]
Former-commit-id: c26a2d5cab
Former-commit-id: a61405dda3 [formerly 5afea503a8]
Former-commit-id: 176392edcb
2014-01-30 15:34:16 -05:00
David Friedman
e73e546582 ASM #110
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f

Former-commit-id: d36cbb2ca9 [formerly 769086c0b7] [formerly d36cbb2ca9 [formerly 769086c0b7] [formerly e18c49ea72 [formerly c4b3411f4d5f7632e3c804316bd5959d16cc97f0]]]
Former-commit-id: e18c49ea72
Former-commit-id: 0ce67592ac [formerly 052e12b777]
Former-commit-id: 5a5c72df2f
2014-01-29 20:23:55 +00:00
Michael Gamazaychikov
22b9fe485a ASM #75
Change-Id: If2e1c8bc2d320b3681f64d8637fbabb9659d0c5b

Former-commit-id: 2c2b629206 [formerly 91c3468462] [formerly 2c2b629206 [formerly 91c3468462] [formerly edbadf059e [formerly e726b2a3a2529f5909acb7fe0f9a3b8475f1642e]]]
Former-commit-id: edbadf059e
Former-commit-id: ad27feeedc [formerly e3cb50bdbe]
Former-commit-id: fb6f16fcb5
2014-01-29 14:19:52 -05:00
Max Schenkelberg
6953e81887 Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
(cherry picked from commit 431ffa97ae4b1c9159c4607e51dbed23c77b76d2 [formerly f4765d1577] [formerly 5d488d27b9 [formerly 83c600ada9] [formerly 5d488d27b9 [formerly 83c600ada9] [formerly f4765d1577 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]])

Former-commit-id: 122c3442f8 [formerly 0c840cf724] [formerly 122c3442f8 [formerly 0c840cf724] [formerly d566ed9927 [formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]]]
Former-commit-id: d566ed9927
Former-commit-id: e1717b2729 [formerly f5ff746126]
Former-commit-id: 1cdbdfceba
2014-01-29 10:15:38 -06:00
Michael Gamazaychikov
01e92945cc ASM #114
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02

Former-commit-id: 297d1cffc6 [formerly 97f9c2ea92] [formerly 297d1cffc6 [formerly 97f9c2ea92] [formerly 8f90c0dee2 [formerly 56dc40096e58fa8ae40b9f2cd6a1bd8f9dd3d35a]]]
Former-commit-id: 8f90c0dee2
Former-commit-id: 0198607fe0 [formerly 7d7cf7cfab]
Former-commit-id: e478ff7fdc
2014-01-29 10:58:18 -05:00
brian.dyke
ca9263003a merge 14.2.1-3 into asm-14.2.2
Former-commit-id: 4a62e83835 [formerly 2294c81a57] [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 621464ac0d [formerly e9e2eb3be0]
Former-commit-id: dcf5f25ed1
2014-01-27 15:27:49 -05:00
Mike Duff
c030596afe Issue #2459 - Last change from unscheduled to deactivated.
Former-commit-id: 3766f6a0f4 [formerly e46c226489] [formerly 3766f6a0f4 [formerly e46c226489] [formerly 81aa9ce0cb [formerly 09494558cae046e97ff2126673c5a5c4fd1f0105]]]
Former-commit-id: 81aa9ce0cb
Former-commit-id: ef5d3f370c [formerly 5fc96739b9]
Former-commit-id: 0b39c2977b
2014-01-26 18:57:26 -06:00
Mike Duff
c9ca18c0ef Issue #2452 - Changed label based on feedback.
Former-commit-id: fb6194c464 [formerly 1da1285311] [formerly fb6194c464 [formerly 1da1285311] [formerly 6dcd1a7969 [formerly dd74aef827f0892c64a7efd60b0edd1156ef31ec]]]
Former-commit-id: 6dcd1a7969
Former-commit-id: eaaab3b082 [formerly be59be53d4]
Former-commit-id: df6c94e317
2014-01-25 14:41:20 -06:00
Nate Jensen
ff4eb32010 Issue #2359 printout shutdown of application to try and detect kills
Change-Id: I113890428cfd5a22c2fbb0a4abdcff18a4ccd11e

Former-commit-id: f5ce7b485d [formerly 47d6e5b54f] [formerly f5ce7b485d [formerly 47d6e5b54f] [formerly cdbd05b293 [formerly 34b2c7a402bcf7f3b04ea1e98090f7e0df48566f]]]
Former-commit-id: cdbd05b293
Former-commit-id: e6e9cab9f9 [formerly 7dd0b1c978]
Former-commit-id: 0c9e613674
2014-01-23 19:02:37 -06:00
Kiran Shrestha
6ac642ccd7 Issue #96
Change-Id: I9ad090ae29aa3f6bd32e448b94c3053f9d61429e

Former-commit-id: ef6c154f28 [formerly 60e090a963] [formerly ef6c154f28 [formerly 60e090a963] [formerly 9411bbbac5 [formerly 17a188a3440214cbfd913e854a093ceba287fff9]]]
Former-commit-id: 9411bbbac5
Former-commit-id: 6eab820e1b [formerly dac48c1da9]
Former-commit-id: 0b17be530b
2014-01-23 18:49:16 +00:00
Ben Steffensmeier
27cbedca7a Issue #2363 Add General implementation od IColormapShadedShapeExtension so that all targets will be able to render filled wind barbs.
Former-commit-id: 9c65c5b07b [formerly 6aa6683258] [formerly 9c65c5b07b [formerly 6aa6683258] [formerly a92f6e9bb6 [formerly e214a045c4d45532ed80fb4cdd51355c7884a2ee]]]
Former-commit-id: a92f6e9bb6
Former-commit-id: 9b788b49b0 [formerly b90004e46a]
Former-commit-id: 8cdb888e20
2014-01-23 12:41:16 -06:00