Commit graph

4738 commits

Author SHA1 Message Date
Nate Jensen
398524b7e2 Issue #2361 fix saving hydro table objects
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: f5b461908d [formerly 040f022e5d] [formerly 7a27264094] [formerly 08441efbb7 [formerly 7a27264094 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]]]
Former-commit-id: 08441efbb7
Former-commit-id: 0f1cb8fd2bdb23523f68173edb6fddf6e99b2e4e [formerly 4958732cb2]
Former-commit-id: 399265e3f8
2013-11-08 12:37:26 -06:00
Nate Jensen
5d97357d55 Issue #2361 remove ISerializableObject from persistence path keys
Change-Id: I7ff7e5234c7c88ed475014c755f3df7d1ee23b16

Former-commit-id: 6c82fc1303 [formerly 0e4a1d9ced] [formerly 02d26d0f84] [formerly 44a6d5b302 [formerly 02d26d0f84 [formerly 044f4fd87a83d6b83eef7f46854f1b484536c825]]]
Former-commit-id: 44a6d5b302
Former-commit-id: a61da77e3f2fe75d073103685c78688e9c49adaf [formerly 3ea850b9da]
Former-commit-id: b10cc7b9b0
2013-11-08 12:30:39 -06:00
Nate Jensen
cb0d280f07 Issue #2361 remove SerializationUtil from SoundingPrefs
Change-Id: Ia394f825954c0d96e17431589d64af13d8c7f991

Former-commit-id: ce69843d03 [formerly b01f5697d3] [formerly c3b37bcb7b] [formerly e9ca44ee64 [formerly c3b37bcb7b [formerly eab1cf126b79ec5708facf2b2c9a303fca8a24fe]]]
Former-commit-id: e9ca44ee64
Former-commit-id: e0e97718894af1cacca9e7ad90e6c0f06ab94bc9 [formerly 56335703ac]
Former-commit-id: f58ec24a85
2013-11-08 12:13:50 -06:00
Nate Jensen
cfce0fd9e2 Issue #2361 fix map style preferences
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049

Former-commit-id: f4167f3a52 [formerly 058c963aa2] [formerly 21d6bdb1f91d0f7bfbf0a28ffaa3009b713412c1 [formerly ec319b7dd0]] [formerly 43bbf31347 [formerly ec319b7dd0 [formerly 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae]]]
Former-commit-id: 43bbf31347
Former-commit-id: 58a28ee555fbdc72d3afed2a0051022d9f1408dc [formerly 5ecde78b02]
Former-commit-id: 8a27263b0c
2013-11-08 10:38:11 -06:00
Richard Peter
a57b316541 Merge "Issue #2361 remove viz.grid ISerializableObjects" into development
Former-commit-id: dcb0258a74 [formerly 44818e3dbd] [formerly 214a72ac69] [formerly bb0dcf6d4a [formerly 214a72ac69 [formerly a227c2dcb2598f82756c3f6a9ac7999c06202177]]]
Former-commit-id: bb0dcf6d4a
Former-commit-id: 90c1adbc58241688caf304cfe406e22783c132df [formerly 1909b0d06b]
Former-commit-id: 990053c1fb
2013-11-08 10:35:41 -06:00
Slav Korolev
703c97394f Issue #2291. Fixed Shared Subscription Dialog.
Former-commit-id: 4b539632b4 [formerly 2d002ccde3] [formerly 59d1de165d] [formerly 7b7754982c [formerly 59d1de165d [formerly f04678733c2368ca05b7b8fdbcfeb096940854df]]]
Former-commit-id: 7b7754982c
Former-commit-id: c443ab7eec2c21f49cfe030af7a19a96edf9fde4 [formerly c4a633acde]
Former-commit-id: 53b6d4aa69
2013-11-08 11:09:21 -05:00
Nate Jensen
ea9e3cfa90 Issue #2361 remove viz.grid ISerializableObjects
Change-Id: I76be90f90dedf5d5d5e3656d23bd1180de9014b8

Former-commit-id: a2f1b06201 [formerly bfc7c671cc] [formerly 88eb0aab5c] [formerly 10548cd1c7 [formerly 88eb0aab5c [formerly 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92]]]
Former-commit-id: 10548cd1c7
Former-commit-id: 82d0218a95268393d34492e76581a5826014b7de [formerly 48a479d2dc]
Former-commit-id: 13f93cd7cf
2013-11-08 09:42:09 -06:00
Richard Peter
319067cf2c Merge "Issue #1678 Added support for stored query publishing and invocation on the registry" into development
Former-commit-id: 053df04bed [formerly 9111484d4f] [formerly 60b567eeae] [formerly 6fd6fd0725 [formerly 60b567eeae [formerly 003f889e8aa65c4f01287611518f92b7d8ef05dd]]]
Former-commit-id: 6fd6fd0725
Former-commit-id: c387f72730aa5a5ced5cd2dc475b078ea6fdcd78 [formerly 65628daf36]
Former-commit-id: 39a2c98779
2013-11-08 09:35:08 -06:00
Benjamin Phillippe
e5b40456ad Issue #1678 Added support for stored query publishing and invocation on the registry
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f

Former-commit-id: 8f30c4f79a [formerly 0abf405014] [formerly b84235a80a] [formerly b5db1f38c3 [formerly b84235a80a [formerly d7d985926351d933c0bd10a3a5fd88ef4305853b]]]
Former-commit-id: b5db1f38c3
Former-commit-id: def1eae12e1318c52624530ccfdebf9fcfcd782b [formerly 1a492a564b]
Former-commit-id: bd3e4778c0
2013-11-07 18:36:46 -06:00
Nate Jensen
978ffe10d2 Merge "Issue #2515 upgraded camel from 2.11.0 to 2.11.2" into development
Former-commit-id: 29cb7860df [formerly 6ef029fba9] [formerly db5ee537a8] [formerly f677dd6415 [formerly db5ee537a8 [formerly cd816c1507ff5b413b6312fb6d7d83cff29436e1]]]
Former-commit-id: f677dd6415
Former-commit-id: b324fd4364baaa08fa068844e89c9cf48abc7967 [formerly 1b7b698c31]
Former-commit-id: 77af220675
2013-11-07 16:59:35 -06:00
Brian Clements
8feab3c298 Issue #2515 upgraded camel from 2.11.0 to 2.11.2
removed log showBody workaround


Former-commit-id: b21233ec65 [formerly 6f0630aa55] [formerly 4f374688c8] [formerly ea6b162369 [formerly 4f374688c8 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]]]
Former-commit-id: ea6b162369
Former-commit-id: 82443edd368b60c7bbdfdc3a561f8cc96b1eb818 [formerly a5b61b6d22]
Former-commit-id: 83edfb5349
2013-11-07 16:56:25 -06:00
Nate Jensen
5ba4e05a2b Merge "Issue #2361 remove ISerializableObject from datadelivery.retrieval" into development
Former-commit-id: ceeebbe98a [formerly b9c95aadc0] [formerly f4fcd9e604] [formerly 7877229eac [formerly f4fcd9e604 [formerly 7c4748fa0348820f0cf65330889253a04b4fab28]]]
Former-commit-id: 7877229eac
Former-commit-id: 55061da458b20e53d3ea47f041dcdeabeee85811 [formerly 1de52a9ea8]
Former-commit-id: 97acbb8426
2013-11-07 16:39:50 -06:00
Ron Anderson
3c00925d0d Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development
Former-commit-id: 0e711414f0 [formerly c611ab48be] [formerly 12192b633f] [formerly c1bda09fd9 [formerly 12192b633f [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]]]
Former-commit-id: c1bda09fd9
Former-commit-id: 612d699e0836406e0067c8e7bec339b293fcd4b7 [formerly d2cd7c1257]
Former-commit-id: 6636ebeb2d
2013-11-07 14:39:06 -06:00
Ron Anderson
7f62cacd3b Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: 143847e37d [formerly 0bfd9a1c98] [formerly a5bc64473a] [formerly 42229b8eee [formerly a5bc64473a [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]]
Former-commit-id: 42229b8eee
Former-commit-id: bbdfb7b1f3c5e064c379a3b9b24470e4ae2b4b73 [formerly 6442e2e933]
Former-commit-id: 9d56a36dbe
2013-11-07 14:38:39 -06:00
Richard Peter
aec254aac0 Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 93c776022a [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4 [formerly 520dd57f02]
Former-commit-id: c97efbf656
2013-11-07 14:25:45 -06:00
Nate Jensen
a6a21bfcf3 Issue #2361 remove ISerializableObject from datadelivery.retrieval
Change-Id: I9ec15b17760bcb4382898101f10ce1b17f55eb39

Former-commit-id: 576f55bb72 [formerly 6c1c3d77be] [formerly 852751784b] [formerly 6abe031dfe [formerly 852751784b [formerly 0cc1dd3988f7d02d609246dba863552b46127db2]]]
Former-commit-id: 6abe031dfe
Former-commit-id: 1162509527d0eb2d7d521c021ae17e289d8b58fa [formerly afcbc9e01a]
Former-commit-id: 0c9d826ab4
2013-11-07 13:18:21 -06:00
Greg Armendariz
409990c09b Merge branch 'development' into development_on_RHEL6
Former-commit-id: b9a8dfd99f [formerly 805783d8da] [formerly da16b623e1] [formerly 6456b3a17b [formerly da16b623e1 [formerly d12afc98a3fda9c186e87368c53ddc100d4bf2c1]]]
Former-commit-id: 6456b3a17b
Former-commit-id: ece4acb7d4c6e6c8bc0fa11c3b4893ee1529b1dc [formerly 009c5771fd]
Former-commit-id: 88ec9027bc
2013-11-07 12:25:24 -06:00
Nate Jensen
18e78887eb Issue #2361 speed up map initialization by moving field queries off UI
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: f1c965dde8 [formerly a52e7b677f] [formerly d4b6ad1eee] [formerly cc2998b487 [formerly d4b6ad1eee [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]]
Former-commit-id: cc2998b487
Former-commit-id: e9d19e83f112f896de07de1942d732fe53f9487d [formerly ce583a88fb]
Former-commit-id: 286c7a8b1c
2013-11-07 11:44:07 -06:00
Steve Harris
832c44a4e6 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d92a449ab3 [formerly b4a37cc39d] [formerly e8def3779ef9a61ffc2c0ccfe2be186b24e11e4e [formerly 51ff88796c]] [formerly 3236374cc0 [formerly 51ff88796c [formerly 2a95ac857fe960ed2147545731acc3c093bb73b5]]]
Former-commit-id: 3236374cc0
Former-commit-id: 5d7fccdc69b60104c2941a8a74d13d1bd1961367 [formerly 224d25217b]
Former-commit-id: 9141c578ff
2013-11-07 11:37:25 -06:00
David Gillingham
2cd30bab98 Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 0e74638eb2 [formerly e1df69e312 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]]
Former-commit-id: 0e74638eb2
Former-commit-id: 90a0e1bc7e0ea65d26c6784350bcc46d6a2824c9 [formerly d0b188d577]
Former-commit-id: 1ed80f471c
2013-11-07 11:36:49 -06:00
Steve Harris
c221d78097 Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 0f37de2155 [formerly dbd8615fc6] [formerly b93c4d7cd0] [formerly 47778131b0 [formerly b93c4d7cd0 [formerly 433ccf0db5946e18c81e20ec689c9911868fe4c2]]]
Former-commit-id: 47778131b0
Former-commit-id: 73554f8c6995705d78460251d3f25f87c8a32fbf [formerly 079a007217]
Former-commit-id: 687b0848ee
2013-11-07 11:32:42 -06:00
Steve Harris
3fac0e0b27 13.5.3-5 baseline
Former-commit-id: 257f69c55c [formerly 5b3cd9befd] [formerly 06b5e0e0ec] [formerly f175680b89 [formerly 06b5e0e0ec [formerly 427119d391ffb23c0db3fa0dab0a893322a60f8c]]]
Former-commit-id: f175680b89
Former-commit-id: cae6925bd9b5a490e72c32e60a0c8c7f114e2386 [formerly 31b57882cb]
Former-commit-id: d9efe087e5
2013-11-07 12:22:32 -05:00
Steve Harris
93e9333a2e 14.1.1-7 baseline (addendum 1)
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml


Former-commit-id: 824866bca8 [formerly abbecba957] [formerly 2d36bc2c1f] [formerly b835dad501 [formerly 2d36bc2c1f [formerly 07f7c24804028aed71fc29cdf6f163a9e9d15623]]]
Former-commit-id: b835dad501
Former-commit-id: 9b114a2ed684d2ac0bd0e804a8a6594626e1cb9e [formerly 155bc487ff]
Former-commit-id: a72bb1669f
2013-11-07 12:09:23 -05:00
Nate Jensen
a08adbc1f4 Merge "Issue #2514 updated comments and history for OGC classes" into development
Former-commit-id: 5892894c4c [formerly 852dfae29c] [formerly e84d6cf1b5] [formerly 3c335ed78f [formerly e84d6cf1b5 [formerly 5e5b1b53cf79fd058f65451aee4f255a73252ca1]]]
Former-commit-id: 3c335ed78f
Former-commit-id: 03b247e2b8fe2314f2bed222badfa9a2365c9429 [formerly 5866e416f6]
Former-commit-id: adde0aee83
2013-11-07 10:45:03 -06:00
Nate Jensen
83e6f44981 Merge "Issue #2530 Fixed ingest JVM crash on startup" into development
Former-commit-id: b6a07f8be2 [formerly a2a43a55a6] [formerly 0797f54a93] [formerly 7b18c745d3 [formerly 0797f54a93 [formerly ba63e0d32f333fb2acaee2b15253f7cffb7122d4]]]
Former-commit-id: 7b18c745d3
Former-commit-id: efa348e5306654c1928c7e40e73494185ea63ae4 [formerly f3d235a3f8]
Former-commit-id: 1a6dad4c53
2013-11-07 10:44:46 -06:00
Benjamin Phillippe
88ad5b8798 Issue #2530 Fixed ingest JVM crash on startup
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3

Former-commit-id: b0b0db8997 [formerly 8d47d1bbd4] [formerly 7d605c471e] [formerly 3561293fdd [formerly 7d605c471e [formerly 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb]]]
Former-commit-id: 3561293fdd
Former-commit-id: 5916d9463f4f9e78b13a0ca2b1f25ea05c004a76 [formerly a9f8468c0e]
Former-commit-id: 1a8d9bf754
2013-11-07 10:38:53 -06:00
Nate Jensen
794d57fe7b Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development
Former-commit-id: 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly f5feb9330f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 6bfd1d4e327eb46835ec16594b542ffb4c74bf7e [formerly 1b7ac545f8]
Former-commit-id: c27c435cea
2013-11-07 10:21:42 -06:00
Dave Hladky
f081565dc7 Issue #2529 Move DD edex event plugin from DD feature to DD core feature.
Former-commit-id: 9505706e96 [formerly 1a5ddfbd5e] [formerly f6996f9f5a] [formerly 5d3023d2f5 [formerly f6996f9f5a [formerly cce7fc47a0a4cdb55712ee3af942e93cb8a7c797]]]
Former-commit-id: 5d3023d2f5
Former-commit-id: cf4c6bb96f1a6ffce51a7751fd886b822c652e36 [formerly 5891412fb3]
Former-commit-id: f62685926a
2013-11-07 10:08:01 -06:00
Nate Jensen
bc622dacd0 Merge "Issue #2511 fix for edex localization adapter to allow filename to appear in path" into development
Former-commit-id: 4c311bb740 [formerly 812f3fefce] [formerly 348a968aed] [formerly 68c7d378cf [formerly 348a968aed [formerly c2ca50713aa5e69aecdc6a5a0b04c7261305514c]]]
Former-commit-id: 68c7d378cf
Former-commit-id: e622a77e09362970afb8d20642b1057a2b7d7989 [formerly d1f45128aa]
Former-commit-id: 2f4c4833d3
2013-11-07 09:15:02 -06:00
Steve Harris
b3f0cc869f Merge branch 'development' into development_on_RHEL6
Former-commit-id: 626b91c9c7 [formerly 2a8e926976] [formerly 108a4d908d] [formerly 1b3d4c8f67 [formerly 108a4d908d [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: 8546b81d3f134c79637c6f5400cc76bdbfb21abe [formerly 50d60d8101]
Former-commit-id: a6ae5f9c2f
2013-11-06 18:31:05 -06:00
Bryan Kowal
a18f2109cf 13.5.3 build "fix"
Former-commit-id: b94071a58b [formerly 503762af19] [formerly 6692b985f3] [formerly a28133117c [formerly 6692b985f3 [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]]
Former-commit-id: a28133117c
Former-commit-id: 120324fb9c6e8815d7af7c3a1fc21863b808696c [formerly ce6d80409d]
Former-commit-id: cdf643510a
2013-11-06 18:25:10 -06:00
Nate Jensen
d2bb313a16 Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 0f4ba6f90e [formerly 2c506552014e60344c5b2014bed32edab2630f47]]]
Former-commit-id: 1da0e31b88
Former-commit-id: 60a2289740b7f6e8da01f653e591eb2ce94a6c58 [formerly aef895c447]
Former-commit-id: 048d52722f
2013-11-06 17:07:10 -06:00
Brian Clements
d0b356865a Issue #2514 updated comments and history for OGC classes
removed dead and duplicate code from OGC


Former-commit-id: 5bf229d57c [formerly 4a673c2896] [formerly 308b06a47a] [formerly 525da47317 [formerly 308b06a47a [formerly c13d5788a39898ef746b535d959bc845b6acad9c]]]
Former-commit-id: 525da47317
Former-commit-id: f48b9c6407a4de20fe768956be592b7bb91c12d1 [formerly d1207aa0b5]
Former-commit-id: e74f7e2483
2013-11-06 16:07:22 -06:00
Richard Peter
2f88c16e6d Merge "Issue #2478: Remove blank lines in debug" into omaha_13.5.3
Former-commit-id: dd7ae670e2 [formerly 436389b782] [formerly aa82fb8c91] [formerly cf7c70beac [formerly aa82fb8c91 [formerly a3130561e8705464873251575f569d6be95ade3d]]]
Former-commit-id: cf7c70beac
Former-commit-id: 1fd2158b2d51bd039d1bacd4bddc1a47f39063ee [formerly 0e48596ca7]
Former-commit-id: 082a8d0a94
2013-11-06 16:04:20 -06:00
Richard Peter
e3ab7a38e4 Issue #2478: Remove blank lines in debug
Former-commit-id: 81279edc30 [formerly f099fb6936] [formerly 357eb79519] [formerly 18eff02d7a [formerly 357eb79519 [formerly 489528b7869254f69ea65391b576e82e67cbfc8f]]]
Former-commit-id: 18eff02d7a
Former-commit-id: e63155859c1fd922ae1be9fae52888b1ef1f2982 [formerly 46f19c22ea]
Former-commit-id: b62dd96321
2013-11-06 16:03:45 -06:00
Bryan Kowal
ed155b4bc8 Merge branch 'omaha_13.5.3' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_13.5.3
Former-commit-id: 2a73a304b5 [formerly cd3e1d7aa4] [formerly d26d6a396f] [formerly 100e14439e [formerly d26d6a396f [formerly b171b7e66031ef05d98cb9a0819df6717acf0ba6]]]
Former-commit-id: 100e14439e
Former-commit-id: 13425950750b9923f86327c13d4018c797064f14 [formerly 40c3059cc2]
Former-commit-id: cdf1cb2ac6
2013-11-06 15:58:06 -06:00
Bryan Kowal
4d95bba61e Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 21df98b0bc [formerly 0f104b0365] [formerly 4f1c083032] [formerly bb15605aa2 [formerly 4f1c083032 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]]
Former-commit-id: bb15605aa2
Former-commit-id: 0befac69bd8c3c5e0fa05e61b8473d5f24fccdaf [formerly 0bc8cdc9be]
Former-commit-id: 0b006511dc
2013-11-06 15:57:14 -06:00
Richard Peter
1f5a97c4ab Issue #2478: Update log message
Former-commit-id: 1e10d9e303 [formerly d4bf633bd2] [formerly f9faa53eb4] [formerly b0746db723 [formerly f9faa53eb4 [formerly ab993718b7e4f2b77461226a49bee76813166dbb]]]
Former-commit-id: b0746db723
Former-commit-id: 1268ba531f54842268c09b3d7604419aa390dbd3 [formerly f1a67f4dc1]
Former-commit-id: 6e929c0dee
2013-11-06 15:45:23 -06:00
Lee Venable
a6557a089e Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 20726d4e7c [formerly 8585080cd1 [formerly 13672783e6a5e452cb4105669a98708329b35541]]]
Former-commit-id: 20726d4e7c
Former-commit-id: 907b407668322fa5a6d3d3f60d0cc9f6969d6ada [formerly 0c4566c411]
Former-commit-id: 9a8a813cf8
2013-11-06 15:42:40 -06:00
Nate Jensen
bdf7ba948a Merge "Issue #2525 GSD doesn't want "/wfs" appended by the DPA. Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370" into development
Former-commit-id: 428bff44e7 [formerly 53e94b4bdc] [formerly 4309555b45] [formerly eae6b2526d [formerly 4309555b45 [formerly a6cf090becd6da2c3fba1a2d46297c475be9d610]]]
Former-commit-id: eae6b2526d
Former-commit-id: 028b9b6ed361721f72c3b96a53739079cd89fd01 [formerly ed9515eea8]
Former-commit-id: e4c3c3a2ad
2013-11-06 15:41:29 -06:00
Lee Venable
798de61ac1 Merge "Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects." into development
Former-commit-id: 34753b0b7e [formerly ac2630eed4] [formerly ea5470af90] [formerly e80418a639 [formerly ea5470af90 [formerly 10789718f6ece30c3d766ec95b9fff0a5c03ee2c]]]
Former-commit-id: e80418a639
Former-commit-id: 1a7b7e706e5102b13229f96f72c064827c5fc575 [formerly fab0fab6a9]
Former-commit-id: 55b68b6d2a
2013-11-06 15:41:02 -06:00
Nate Jensen
bc7db2cd24 Merge "Issue #2522 removing WCS and WMS from baseline" into development
Former-commit-id: 784f6dca81 [formerly 327f44aaff] [formerly 99a19e70bb32aa1095644b201dc266b424037f74 [formerly 1020b453f2]] [formerly f3ea98778e [formerly 1020b453f2 [formerly c4f29baf5ac830404a7e7739626b9a861844ec06]]]
Former-commit-id: f3ea98778e
Former-commit-id: f7629521b564f5f8ff6aae8cc5a34298c12d3144 [formerly 3169c86070]
Former-commit-id: 8cacf1c915
2013-11-06 15:40:16 -06:00
Dave Hladky
ac0d00e3d6 Issue #2525 GSD doesn't want "/wfs" appended by the DPA.
Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370

Former-commit-id: 305739eb13 [formerly 62cd5b514d] [formerly b0d929231c] [formerly b2b44cd1d2 [formerly b0d929231c [formerly 03cfdbd4c8c74da4200781b8b716181eac759195]]]
Former-commit-id: b2b44cd1d2
Former-commit-id: 4dc511c73e193c9587b7cdc0e8b0ac3f2f661db4 [formerly 35bc4378ca]
Former-commit-id: 7ddd6d4c61
2013-11-06 15:23:02 -06:00
Max Schenkelberg
f88d913d31 Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
Amend: Fixed precision issue with float comparison, made factory better synchronized.

Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2

Former-commit-id: 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly c28fd2b38d [formerly 3369fbec2d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]
Former-commit-id: c28fd2b38d
Former-commit-id: aa835a1580556a0e2e44448d20c96e5e1b78baed [formerly d53db3ddb6]
Former-commit-id: e4b7f3618c
2013-11-06 15:07:18 -06:00
Richard Peter
17c915ea58 Merge "Issue #2494 Updated to use thread logger" into development
Former-commit-id: ff8db01e5f [formerly 3c49575ca0] [formerly 22bd1521be] [formerly 10160e3783 [formerly 22bd1521be [formerly 8eb668a14e1674b3a67816c26b2baeb7c8f45fba]]]
Former-commit-id: 10160e3783
Former-commit-id: fcaf2937a71343d6834a55f38f658f6c7fdbaa88 [formerly 88dbe31908]
Former-commit-id: b10d5952c0
2013-11-06 14:03:34 -06:00
Richard Peter
81b11b8309 Merge "Issue #2450 - Send notifications to Notification Center when subscriptions expire. peer review comments" into development
Former-commit-id: 8ce3319d80 [formerly a699fed28b] [formerly 2e162de539] [formerly d9c878bc51 [formerly 2e162de539 [formerly e52828f36303bd39521381149b0f585b6eb38439]]]
Former-commit-id: d9c878bc51
Former-commit-id: 886471047e9c7c9cec1530df34593c4836a27792 [formerly cdc4a81cc5]
Former-commit-id: e480cefa56
2013-11-06 14:02:51 -06:00
Richard Peter
db1def7540 Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: 7d6785bd2d [formerly b4a0f11c66] [formerly 27aa0dd6ba] [formerly 6ccb444219 [formerly 27aa0dd6ba [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]]
Former-commit-id: 6ccb444219
Former-commit-id: 4b2de4194c997d5f3e973c7bdd1eeaca08c1345f [formerly f4bdb0caea]
Former-commit-id: 6b8bea4af5
2013-11-06 13:44:11 -06:00
Ben Steffensmeier
726d1728fd Issue #2493 remove mesowest.
Former-commit-id: c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly 36916fedcd [formerly d0b7966458 [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]
Former-commit-id: 36916fedcd
Former-commit-id: 80b4ead107b43174bee5092e0af3bc24e421205f [formerly baebe37ba6]
Former-commit-id: 5d31aad5c2
2013-11-06 13:42:38 -06:00
Slav Korolev
5cd1d585b1 Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: ff13287f05 [formerly cc90a7af4b] [formerly 076865bb61] [formerly c25204d75b [formerly 076865bb61 [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]]
Former-commit-id: c25204d75b
Former-commit-id: 2d965e7d5b9ce80b4a1638b7546c6d8d63a4d209 [formerly 3223cd19cd]
Former-commit-id: 8fbf625667
2013-11-06 14:38:55 -05:00
Matt Nash
a59609ecd8 Issue #2511 fix for edex localization adapter to allow filename to appear in path
Change-Id: I9fea157a67799e1168d4b5f7efaf5ef6cdd64933

Former-commit-id: a8dfdabe2a [formerly 5ab51caf38] [formerly 19bfe014c9] [formerly b3ac4b7a9c [formerly 19bfe014c9 [formerly 8404299627c7d27731910821befc068767c43aa1]]]
Former-commit-id: b3ac4b7a9c
Former-commit-id: cff015b05c205c6fec43bba94210ba6eaa1072af [formerly 65696b4148]
Former-commit-id: 14e606f17d
2013-11-06 13:35:11 -06:00