Brian Clements
|
fca22ac79b
|
Omaha #3502 common.util changes
moved ConvertUtil, reworked StringUtil.split()
Change-Id: I82114f8a9ec7fb907c85258a070169dcba61be03
Former-commit-id: d7defbe7ca [formerly 4d3bb07573] [formerly c3e1b5c9a2] [formerly d7defbe7ca [formerly 4d3bb07573] [formerly c3e1b5c9a2] [formerly fc322a74b2 [formerly c3e1b5c9a2 [formerly 72b5092e87e71f78fa35065dfc8bcb8e746f67b8]]]]
Former-commit-id: fc322a74b2
Former-commit-id: 402c8624eb [formerly 809d40d388] [formerly e3510853254b673603c5eabacd355283ff8561a6 [formerly fa89fae529]]
Former-commit-id: 59a702eab36adde13d4b60ed2b7b8dd1f26f2485 [formerly 62f529ebe2]
Former-commit-id: 54c861d870
|
2014-08-07 16:48:57 -05:00 |
|
Nate Jensen
|
064dd363f0
|
Omaha #3211 fix edex startup issues
Change-Id: I634ec432e7136e191706d4b8b7063d845dd9fb7c
Former-commit-id: ee0dba554e [formerly 6e85b66b1b] [formerly f973ce1bbe] [formerly ee0dba554e [formerly 6e85b66b1b] [formerly f973ce1bbe] [formerly cf5a1d16c9 [formerly f973ce1bbe [formerly dd5cabbc335662e0583b76a5bef6bfdf28569735]]]]
Former-commit-id: cf5a1d16c9
Former-commit-id: fbc82ec5bc [formerly 4cf6224645] [formerly 796a60bc7c13a51245e9460f4371830224dff47c [formerly 25ec0697ae]]
Former-commit-id: 1405007afd16b75876dcfb17bd68e897fc59e30a [formerly 25d09c4183]
Former-commit-id: 3f9512f549
|
2014-06-02 12:39:34 -05:00 |
|
Richard Peter
|
52a54f5e9f
|
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 efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
ae3f5dbff6
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
|
2014-04-04 12:57:32 -04:00 |
|
Ben Steffensmeier
|
f497c0198c
|
Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309
Former-commit-id: 89de68386a [formerly fb1480b30d] [formerly 7e5349bbff] [formerly 89de68386a [formerly fb1480b30d] [formerly 7e5349bbff] [formerly cc5d9edc92 [formerly 7e5349bbff [formerly 33033c354a783ab58d89599eb78355c6b354594f]]]]
Former-commit-id: cc5d9edc92
Former-commit-id: e6606cb28b [formerly 8a3bbbca50] [formerly 5acc5053cf8a5d78052a11afbf56473f1be1d712 [formerly 23a26f5d4a]]
Former-commit-id: 70565b5d18d4d2e7488c047a72edd91b385f7fb3 [formerly 9f30c14fca]
Former-commit-id: ca5fb7e3fa
|
2013-12-16 14:31:44 -06:00 |
|
Steve Harris
|
9f5469bc6e
|
13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922]
Former-commit-id: c05a6c8b50
|
2013-06-28 09:46:25 -04:00 |
|
Nate Jensen
|
cf843cfa42
|
Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]]
Former-commit-id: fc691cbb2f
Former-commit-id: fde771fa01 [formerly ab10e0072d] [formerly 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7]]
Former-commit-id: 73458acdcd0744f3e4a6cc7ea7fac5b0d28ee6a0 [formerly 3588ed1899]
Former-commit-id: 528ab65a66
|
2013-05-29 16:19:28 -05:00 |
|
Nate Jensen
|
88f9c45cf0
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: 3a41ae85b4 [formerly b025262dc1] [formerly d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]]
Former-commit-id: 080efd3540895c64fe9887513267aae9011cea8d [formerly 4eb941dacb]
Former-commit-id: e4bbe70d57
|
2013-05-29 14:49:43 -05:00 |
|
Steve Harris
|
352658125b
|
13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
|
2013-03-13 09:50:28 -05:00 |
|
Steve Harris
|
fac2d20002
|
13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
b92dfd1b62
|
13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
745f2c6409
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
|
2013-01-06 14:32:24 -06:00 |
|