Richard Peter
|
67683dd891
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]
Former-commit-id: 44b1782461
|
2014-04-28 16:27:40 -05:00 |
|
Ben Steffensmeier
|
22f068481f
|
Issue #2947 Make GridCoverage implement IGridGeometryProvider.
Former-commit-id: e911a4c917 [formerly f2a204c593f65c67c87e16fa513d00383ad568e5]
Former-commit-id: 037ed878b7
|
2014-04-11 17:33:55 -05:00 |
|
Richard Peter
|
5676090443
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]
Former-commit-id: 95eba8dcf6
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
17477e7db1
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]
Former-commit-id: 6a28fcb156
|
2014-04-04 12:57:32 -04:00 |
|
Richard Peter
|
f30181d730
|
Issue #2125: Clean up hibernate warnings
Change-Id: Ieb78e7e518a90f09c8db6d72213d5bffa357414e
Former-commit-id: 0c058f461c [formerly 4a99614b887fe02e1ad9831fc9414ceb6808ba7b]
Former-commit-id: e2d20753e1
|
2014-01-17 14:12:34 -06:00 |
|
Ben Steffensmeier
|
fb1480b30d
|
Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309
Former-commit-id: cc5d9edc92 [formerly 33033c354a783ab58d89599eb78355c6b354594f]
Former-commit-id: 7e5349bbff
|
2013-12-16 14:31:44 -06:00 |
|
Ben Steffensmeier
|
e639a00fd8
|
Issue #2574 Fix conversion of null grid coverage in dataURI.
Former-commit-id: 6d14edd0a8 [formerly 38352d01b6a4d85bd6961d791370db87d8800bf2]
Former-commit-id: 21f0abbca1
|
2013-11-26 15:19:31 -06:00 |
|
Ben Steffensmeier
|
cf6ef77d78
|
Issue #2574 Add DataURIFieldConverter for GridCoverages.
Former-commit-id: bdb0e111ea [formerly 452e129cda35ffe0b4b8d9bd262bd80bfa88d701]
Former-commit-id: 08be03d3fa
|
2013-11-25 12:17:36 -06:00 |
|
Nate Jensen
|
46edfda4da
|
Issue #2361 once again try to remove more common ISerializableObject
Change-Id: I149fa1009b2d85b2c2f5e9247515eecb835dad09
Former-commit-id: 4b80a31f22 [formerly 05585a1d0f9fdab55c8ad2ce83d8e979450521ba]
Former-commit-id: 40d8e42b87
|
2013-10-23 11:40:13 -05:00 |
|
Ben Steffensmeier
|
c7cfc6aaf6
|
Issue #2473 Clean up grib plugin.
Former-commit-id: ae9e1160e8 [formerly 6fda3bf42a0735ecb5ae9f7ef1ae0e08dac22a5b]
Former-commit-id: 4a17225301
|
2013-10-16 10:47:30 -05:00 |
|
Ben Steffensmeier
|
e8b22db364
|
Issue #2181 Convert geometry types to use hibernate-spatial
Former-commit-id: 0bc5aca64b [formerly ded324e06f81fc63e6567a535cfa8a843a39902d]
Former-commit-id: a655380bad
|
2013-07-16 15:50:14 -05:00 |
|
Steve Harris
|
c56be8a332
|
13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: 70e4ff30a6
|
2013-06-28 09:46:25 -04:00 |
|
Nate Jensen
|
927da5cffb
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 3f3e0a788d [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]
Former-commit-id: 99b4a21414
|
2013-05-29 14:49:43 -05:00 |
|
Steve Harris
|
be96282207
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: 0be473728a
|
2013-03-25 13:27:13 -05:00 |
|
Ben Steffensmeier
|
5e81f2154d
|
Issue #1777 fix subgridding range problems
Former-commit-id: 0daa5817d0 [formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]
Former-commit-id: 5bd20414eb
|
2013-03-14 09:56:00 -05:00 |
|
Steve Harris
|
8ae397085e
|
13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: 71e8990021
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
33bc5fd816
|
13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
51208e5515
|
13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
|
2013-01-06 14:32:24 -06:00 |
|