Richard Peter
|
b15d288530
|
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: 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
dd98c213c7
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 407b42b0eff676a95483e219d6be899e45effd6c
|
2014-04-04 12:57:32 -04:00 |
|
Ben Steffensmeier
|
cc5d9edc92
|
Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309
Former-commit-id: 33033c354a783ab58d89599eb78355c6b354594f
|
2013-12-16 14:31:44 -06:00 |
|
Steve Harris
|
e197f23ce3
|
13.5.1-4 baseline
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
|
2013-06-28 09:46:25 -04:00 |
|
Nate Jensen
|
fc691cbb2f
|
Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: b0ad25ccd9e20b6bf994a3a46ce38298c363adff
|
2013-05-29 16:19:28 -05:00 |
|
Nate Jensen
|
3f3e0a788d
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: b7b619e1a3a85ac8c5f22a36317e22e15ad557a2
|
2013-05-29 14:49:43 -05:00 |
|
Steve Harris
|
e12ed113ae
|
13.3.1-7 baseline
Former-commit-id: aa42eb84d41a7f0577ab8ce8555c0922833f96f1
|
2013-03-13 09:50:28 -05:00 |
|
Steve Harris
|
d2a654625f
|
13.3.1-1 baseline
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
328c6dccad
|
13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
4ba416aeb3
|
13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
|
2013-01-06 14:32:24 -06:00 |
|