Commit graph

13 commits

Author SHA1 Message Date
Max Schenkelberg
47f4520d7c Omaha #3541 fixed grid coverage spring
Change-Id: I6c69cbe530daee61127e05d7f94a0e2c92ebe2e7

Former-commit-id: f7620471da [formerly f7620471da [formerly f2a76dfda110e231539474bffbde123fbe6313c9]]
Former-commit-id: df50024b63
Former-commit-id: 6aff7b7a4c
2014-08-26 11:28:42 -05:00
Brian Clements
62f529ebe2 Omaha #3502 common.util changes
moved ConvertUtil, reworked StringUtil.split()

Change-Id: I82114f8a9ec7fb907c85258a070169dcba61be03

Former-commit-id: c3e1b5c9a2 [formerly c3e1b5c9a2 [formerly 72b5092e87e71f78fa35065dfc8bcb8e746f67b8]]
Former-commit-id: fc322a74b2
Former-commit-id: fa89fae529
2014-08-07 16:48:57 -05:00
Nate Jensen
25d09c4183 Omaha #3211 fix edex startup issues
Change-Id: I634ec432e7136e191706d4b8b7063d845dd9fb7c

Former-commit-id: f973ce1bbe [formerly f973ce1bbe [formerly dd5cabbc335662e0583b76a5bef6bfdf28569735]]
Former-commit-id: cf5a1d16c9
Former-commit-id: 25ec0697ae
2014-06-02 12:39:34 -05:00
Richard Peter
b667e0509f 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: 95eba8dcf6 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: b15d288530
Former-commit-id: 73aab15d85
2014-04-09 16:00:54 -05:00
Brian.Dyke
be574897cc Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 6a28fcb156 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: dd98c213c7
Former-commit-id: 9f37f61cf8
2014-04-04 12:57:32 -04:00
Ben Steffensmeier
9f30c14fca Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309

Former-commit-id: 7e5349bbff [formerly 7e5349bbff [formerly 33033c354a783ab58d89599eb78355c6b354594f]]
Former-commit-id: cc5d9edc92
Former-commit-id: 23a26f5d4a
2013-12-16 14:31:44 -06:00
Steve Harris
c183e08922 13.5.1-4 baseline
Former-commit-id: 70e4ff30a6 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
2013-06-28 09:46:25 -04:00
Nate Jensen
3588ed1899 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: f3258e77f7 [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]
Former-commit-id: fc691cbb2f
Former-commit-id: 6214f529a7
2013-05-29 16:19:28 -05:00
Nate Jensen
4eb941dacb Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 99b4a21414 [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 3f3e0a788d
Former-commit-id: a1f314948f
2013-05-29 14:49:43 -05:00
Steve Harris
3084a860cd 13.3.1-7 baseline
Former-commit-id: a72254cc75 [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Steve Harris
b3b56830b0 13.3.1-1 baseline
Former-commit-id: 71e8990021 [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Steve Harris
547c1dedd1 13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
2013-01-23 11:18:44 -05:00
Steve Harris
b6fa9b4858 13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00