Richard Peter
|
47795836f2
|
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: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]
Former-commit-id: f1b85f6964
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
8ba2694d8e
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]
Former-commit-id: dd98c213c7
Former-commit-id: 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]
Former-commit-id: 47d9095211
|
2014-04-04 12:57:32 -04:00 |
|
Ben Steffensmeier
|
e6606cb28b
|
Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309
Former-commit-id: 89de68386a [formerly fb1480b30d] [formerly 7e5349bbff] [formerly cc5d9edc92 [formerly 7e5349bbff [formerly 33033c354a783ab58d89599eb78355c6b354594f]]]
Former-commit-id: cc5d9edc92
Former-commit-id: 5acc5053cf8a5d78052a11afbf56473f1be1d712 [formerly 23a26f5d4a]
Former-commit-id: 8a3bbbca50
|
2013-12-16 14:31:44 -06:00 |
|
Steve Harris
|
43bb696901
|
13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]
Former-commit-id: 640b022e84
|
2013-06-28 09:46:25 -04:00 |
|
Nate Jensen
|
fde771fa01
|
Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]
Former-commit-id: fc691cbb2f
Former-commit-id: 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7]
Former-commit-id: ab10e0072d
|
2013-05-29 16:19:28 -05:00 |
|
Nate Jensen
|
3a41ae85b4
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]
Former-commit-id: b025262dc1
|
2013-05-29 14:49:43 -05:00 |
|
Steve Harris
|
45a2d0501d
|
13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]
Former-commit-id: ed5f1dbab6
|
2013-03-13 09:50:28 -05:00 |
|
Steve Harris
|
db712e1fcf
|
13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
ce726fadc7
|
13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]
Former-commit-id: d9be4dce21
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
82cdde8491
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
|
2013-01-06 14:32:24 -06:00 |
|