Richard Peter
|
3425d4bf98
|
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: 288febacc7 [formerly efd1003a50] [formerly 5676090443] [formerly 5676090443 [formerly 95eba8dcf6]] [formerly 288febacc7 [formerly efd1003a50] [formerly 5676090443] [formerly 5676090443 [formerly 95eba8dcf6]] [formerly b15d288530 [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]]
Former-commit-id: b15d288530
Former-commit-id: 7cfc0b06c7 [formerly 47795836f2] [formerly f1b85f6964] [formerly ed8609133e05b5d0ee1912e5ac34a16a3fe104ac [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff] [formerly f1b85f6964 [formerly 73aab15d85]]]
Former-commit-id: 6626f62bd1588dc01ce63797bcf8d58af4b1297d [formerly 3660d57b987b8ab590b095e98b193f3d1ff95669] [formerly 421b2716a4 [formerly b667e0509f]]
Former-commit-id: 421b2716a4
Former-commit-id: 52a54f5e9f
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
b658b5f6e3
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 2ab8bd77d9 [formerly 7de936dfba] [formerly e4136f79dd] [formerly e4136f79dd [formerly 947194c998]] [formerly 2ab8bd77d9 [formerly 7de936dfba] [formerly e4136f79dd] [formerly e4136f79dd [formerly 947194c998]] [formerly 929b736038 [formerly e4136f79dd [formerly 947194c998] [formerly 929b736038 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]]]
Former-commit-id: 929b736038
Former-commit-id: ce1349740a [formerly a6ebdbfc3a] [formerly d76d3a26cb] [formerly 33d6d32d894986ee2f5ffc28ddcd6ef5cc520fdd [formerly ef99224ab38fbdf6c62ed3f358f4c50051cbc248] [formerly d76d3a26cb [formerly 5163a31a66]]]
Former-commit-id: 42d85363cd5650bc15042d72f7c945046ecf99f8 [formerly 281a7b2833a1dc51969eab1f2b614dfd6fa8f7eb] [formerly 8ef50f023b [formerly 462952ce65]]
Former-commit-id: b2323c9228e7ea0d024a7d90a43f0aa5061524ba [formerly 8ef50f023b]
Former-commit-id: 38a8f60a43
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
55bcb03c5c
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 0c8117982f [formerly 2eec862ebb] [formerly 17477e7db1] [formerly 17477e7db1 [formerly 6a28fcb156]] [formerly 0c8117982f [formerly 2eec862ebb] [formerly 17477e7db1] [formerly 17477e7db1 [formerly 6a28fcb156]] [formerly dd98c213c7 [formerly 17477e7db1 [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]]
Former-commit-id: dd98c213c7
Former-commit-id: a1b4b5a315 [formerly 8ba2694d8e] [formerly 47d9095211] [formerly fc3c00a17bb7a79f8b61454b8d40e68f136d1ced [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c] [formerly 47d9095211 [formerly 9f37f61cf8]]]
Former-commit-id: 370566fade3e49cee3d314d2d3ac2049f642d474 [formerly a50a2cebaea771c45178ef7f0d701260c24962c6] [formerly 39b5e7fe67 [formerly be574897cc]]
Former-commit-id: 39b5e7fe67
Former-commit-id: ae3f5dbff6
|
2014-04-04 12:57:32 -04:00 |
|
Brian.Dyke
|
bf8cd6baec
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 39909aec0d [formerly 7ca114f7f1] [formerly a1b980a15d] [formerly a1b980a15d [formerly 6346c9776b]] [formerly 39909aec0d [formerly 7ca114f7f1] [formerly a1b980a15d] [formerly a1b980a15d [formerly 6346c9776b]] [formerly 3b639347f8 [formerly a1b980a15d [formerly 6346c9776b] [formerly 3b639347f8 [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]]]
Former-commit-id: 3b639347f8
Former-commit-id: 18e7099a37 [formerly bded86a35f] [formerly 519ec3071a] [formerly 8173129c775a75bb085c6310c8a26361aece417c [formerly 38694ae3f3f4b7b74544ffa190d887b7c937b26b] [formerly 519ec3071a [formerly 76625c2238]]]
Former-commit-id: f2e3b1ef5aa727613cf7aa0364cf9dd8a53dc5ba [formerly b11ad5967e376b34076f85e49fab9f19d3ad22e5] [formerly 102414db3a [formerly 9fa73765f9]]
Former-commit-id: 102414db3a
Former-commit-id: dedbdef64c
|
2014-03-27 10:22:26 -04:00 |
|
Brian.Dyke
|
d9bdc4cc43
|
Fixed comment merge conflicts added .gitignore
Former-commit-id: 12fb1e7cfb [formerly 642cdfe2e6] [formerly 027cca8673] [formerly 027cca8673 [formerly 7cc471a9c9]] [formerly 12fb1e7cfb [formerly 642cdfe2e6] [formerly 027cca8673] [formerly 027cca8673 [formerly 7cc471a9c9]] [formerly a0e7cb624a [formerly 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 19849840be [formerly 6476c4fb85] [formerly 412a7eb2c2] [formerly 60279a83ad18e6bd031bd551e2fc8639a00876d8 [formerly 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f] [formerly 412a7eb2c2 [formerly d8256c4226]]]
Former-commit-id: d19157684bfad244ba5a116e5442409e93ab71ea [formerly 8a69e5f0509d10278a9c81d31ec5d2e0a9d1f376] [formerly e7aea77979 [formerly c19fc33493]]
Former-commit-id: e7aea77979
Former-commit-id: dc35ed8fe1
|
2014-03-25 15:41:58 -04:00 |
|
Brian.Dyke
|
dbf6bc3045
|
OB_14.1.1-25 baseline
Former-commit-id: 7ed0453967 [formerly c66bac30c7] [formerly c085bc6879] [formerly c085bc6879 [formerly c67833407c]] [formerly 7ed0453967 [formerly c66bac30c7] [formerly c085bc6879] [formerly c085bc6879 [formerly c67833407c]] [formerly 074abeb0fa [formerly c085bc6879 [formerly c67833407c] [formerly 074abeb0fa [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]]]
Former-commit-id: 074abeb0fa
Former-commit-id: bdfae8f01a [formerly 5b848e5480] [formerly 95ada25b65] [formerly 76848b8b894c0e80e8604a6cd94c2c15a1df29ab [formerly ec4f283a91b4ae374dc7edc0c06351378f44b61f] [formerly 95ada25b65 [formerly 36fdf6bfe4]]]
Former-commit-id: 011b44156c3cfa11986f55b6541617b6ab3dbbc8 [formerly 01adcc7557cfbd24c6477e8cc858ba353ef8328c] [formerly 2ba9b8825b [formerly 05ab17425c]]
Former-commit-id: 49edf296ff37f0faaa9ff2c4a352704b7055f897 [formerly 2ba9b8825b]
Former-commit-id: fbba012c20
|
2014-03-25 13:55:54 -04:00 |
|
Richard Peter
|
bb984be932
|
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
Former-commit-id: f7bf9b84eb [formerly d4c67a0f8c] [formerly 6236137635] [formerly 6236137635 [formerly 390e73af44]] [formerly f7bf9b84eb [formerly d4c67a0f8c] [formerly 6236137635] [formerly 6236137635 [formerly 390e73af44]] [formerly 897980da08 [formerly 6236137635 [formerly 390e73af44] [formerly 897980da08 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]]]]
Former-commit-id: 897980da08
Former-commit-id: 4956d27f92 [formerly 5dd2d089bb] [formerly a910870531] [formerly ffae8ee033c71057fa51970afd97249bda7bb291 [formerly d757b784318130cb248a48533db6e16ad9554e32] [formerly a910870531 [formerly 780b504251]]]
Former-commit-id: e594569a7fcdc9c61a22c39b210fc96018f3777a [formerly 1d59c583c016450694956f5445ba6500a32927d7] [formerly 631aa74a10 [formerly 9060aab6dd]]
Former-commit-id: 631aa74a10
Former-commit-id: 989ac3147f
|
2014-03-24 09:53:13 -05:00 |
|
Dave Hladky
|
1ecd3efa0e
|
Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 68f616bb13 [formerly 912c7e2d12] [formerly 39343e1801] [formerly 39343e1801 [formerly 3ac04dd071]] [formerly 68f616bb13 [formerly 912c7e2d12] [formerly 39343e1801] [formerly 39343e1801 [formerly 3ac04dd071]] [formerly 9f3c5dcc42 [formerly 39343e1801 [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: ab589b74e4 [formerly c978694653] [formerly e464a1d8f8] [formerly 3efe697b344b80e3fc93930224531da3b5a747cb [formerly 52a66b8f177ba3fcebbd8fee9b4e8b300ae9ba10] [formerly e464a1d8f8 [formerly 43cbcff538]]]
Former-commit-id: 7239aab271f45719264f242fe9a47a4f9dc25415 [formerly a34ec85b7be5311fc6e20f3d93ca82b2276e2023] [formerly a37f87968c [formerly 3d61ca32f6]]
Former-commit-id: a37f87968c
Former-commit-id: a6d07e82a6
|
2014-03-24 08:27:12 -05:00 |
|
Mike Duff
|
97a19eb866
|
Issue #2941 - Sort data before returning
Former-commit-id: e4c9fbcd9c [formerly d7d06e18fd] [formerly ff07b90659] [formerly ff07b90659 [formerly 73a011b940]] [formerly e4c9fbcd9c [formerly d7d06e18fd] [formerly ff07b90659] [formerly ff07b90659 [formerly 73a011b940]] [formerly 4db73e42a5 [formerly ff07b90659 [formerly 73a011b940] [formerly 4db73e42a5 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]]]]
Former-commit-id: 4db73e42a5
Former-commit-id: 441bf016bc [formerly b26be09c49] [formerly 8d1347d1f7] [formerly 0a46d1eb820fa2175769ee3e4fafaeb1dbb6f79f [formerly c59574ba2d086ee6c90dd15718f0f7b5869fb8e2] [formerly 8d1347d1f7 [formerly 43eccead7c]]]
Former-commit-id: a0202d6e32cd853a1a68757d1fb414569207f507 [formerly cb740913b5439b8346144311c9578671ffd048c4] [formerly 05fbcc61ca [formerly 8f00b37688]]
Former-commit-id: 05fbcc61ca
Former-commit-id: b1e31e388d
|
2014-03-24 08:19:21 -05:00 |
|
Brian.Dyke
|
2c66325e7a
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 3eb12c6430 [formerly 674036b172] [formerly 50e5f4f78d] [formerly 50e5f4f78d [formerly 06ee9a6384]] [formerly 3eb12c6430 [formerly 674036b172] [formerly 50e5f4f78d] [formerly 50e5f4f78d [formerly 06ee9a6384]] [formerly 07b2e04d7a [formerly 50e5f4f78d [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: e52986179c [formerly 402035e7f9] [formerly d97b88f433] [formerly 9ff6bf86847e76f0fd77f4d13e1cd4752a818961 [formerly 1a63c19999c01830d72a5d605c2cc1247fc3b4eb] [formerly d97b88f433 [formerly 14567f20a7]]]
Former-commit-id: 41729980e7b808e274ad10603dee43d7a61ead2d [formerly 2c253da743c15a00910b72d8aac49c5cbb6f5609] [formerly aea0544eec [formerly f540c6fb2d]]
Former-commit-id: b362687a2b6801165feed00f9e740e132fb71e90 [formerly aea0544eec]
Former-commit-id: 91da395a71
|
2014-03-24 07:01:29 -04:00 |
|
Brian.Dyke
|
4496d0a72b
|
OB_14.1.1-24 baseline
Former-commit-id: 22e0b34c8c [formerly 8366e88db1] [formerly 37e9d48d45] [formerly 37e9d48d45 [formerly 37b6368268]] [formerly 22e0b34c8c [formerly 8366e88db1] [formerly 37e9d48d45] [formerly 37e9d48d45 [formerly 37b6368268]] [formerly face1ebeeb [formerly 37e9d48d45 [formerly 37b6368268] [formerly face1ebeeb [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]]]
Former-commit-id: face1ebeeb
Former-commit-id: 016cb34018 [formerly 49f7c81de1] [formerly cfa058a345] [formerly 71de8eea4ae15cd725a1ac1cff244c0948ac36ef [formerly 96a438276ab6f5a4af7ac304e214e79258c0ea3d] [formerly cfa058a345 [formerly 6b2175da93]]]
Former-commit-id: 3da2e809f051075a9a1e06c3efcd650c284b3531 [formerly bd70e5cfe36861d8349138232ac519963886caa3] [formerly 7aeb9af309 [formerly 2fda566cfb]]
Former-commit-id: 7aeb9af309
Former-commit-id: 1f96787564
|
2014-03-21 12:43:50 -04:00 |
|
Ben Steffensmeier
|
ce6fdddafd
|
Issue #2932 improve compatibility of pop skewT and blended resources.
Former-commit-id: f7f44810d8 [formerly 12d5339c48] [formerly 14907292da] [formerly 14907292da [formerly 933b172ca0]] [formerly f7f44810d8 [formerly 12d5339c48] [formerly 14907292da] [formerly 14907292da [formerly 933b172ca0]] [formerly effb0bfcd8 [formerly 14907292da [formerly 933b172ca0] [formerly effb0bfcd8 [formerly 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737]]]]]
Former-commit-id: effb0bfcd8
Former-commit-id: 0ca7c1c2b2 [formerly 4d284e5780] [formerly 99d9ba9645] [formerly 063a2a3cfcd503a5b00d98285d7fe4cb5873a849 [formerly 181bf9e15da48dfb7597e793bcef70990b517993] [formerly 99d9ba9645 [formerly ee3cb7e69a]]]
Former-commit-id: cc803c7508e603cb6ffc21eec60b0ec4c54d4708 [formerly dabcb37bdf912273c1bd4907d33758ae655f4417] [formerly ebd80c4d49 [formerly b8d6663e15]]
Former-commit-id: ebd80c4d49
Former-commit-id: 05a5ec1cb9
|
2014-03-20 13:18:40 -05:00 |
|
Nate Jensen
|
9dfa2d177b
|
Issue #2919 fix windows error due to gempak library missing
Former-commit-id: a472d0ad34 [formerly a3220cf170] [formerly 6edec10edc] [formerly 6edec10edc [formerly 747ac58166]] [formerly a472d0ad34 [formerly a3220cf170] [formerly 6edec10edc] [formerly 6edec10edc [formerly 747ac58166]] [formerly 82ee3e7104 [formerly 6edec10edc [formerly 747ac58166] [formerly 82ee3e7104 [formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]]]]]
Former-commit-id: 82ee3e7104
Former-commit-id: b0a6602c67 [formerly 0dd42bbdc2] [formerly 07d2a4f40c] [formerly eb31d8a4c971b7d924c3540aa2b74af65650aff3 [formerly 8865ef5c8523a5ad4eab9d7ab74db2f4ee390b98] [formerly 07d2a4f40c [formerly 24eadadffd]]]
Former-commit-id: 9edcfb98978c0bac384d2a960ca9f173a25c325b [formerly 7ebb0aa7faa5174e83081cdcc16795ddf83ed95e] [formerly 8ac503de37 [formerly 557c180e6d]]
Former-commit-id: 8ac503de37
Former-commit-id: 8ad61a23c0
|
2014-03-20 09:38:07 -05:00 |
|
Brian.Dyke
|
8d16a47270
|
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 2a15f0bdd8 [formerly e85e3c2e70] [formerly 9f332e938c] [formerly 9f332e938c [formerly d23acbdd48]] [formerly 2a15f0bdd8 [formerly e85e3c2e70] [formerly 9f332e938c] [formerly 9f332e938c [formerly d23acbdd48]] [formerly 9c412e444e [formerly 9f332e938c [formerly d23acbdd48] [formerly 9c412e444e [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]]]]]
Former-commit-id: 9c412e444e
Former-commit-id: 3205d13c8a [formerly 39ef07d49f] [formerly 57f7e4b084] [formerly 9f0f5fe75522840041429f87049d478358ebcd43 [formerly 636e94e2d71aeb03e5b65c5b9c64ecd494fad03f] [formerly 57f7e4b084 [formerly 88efccf309]]]
Former-commit-id: d5b331860c1ce804524e1aa8af5ba8379b92f41b [formerly b74e99a753d5ddafa0c2b9e7a7ee76f3251376c4] [formerly 5fb2fe9266 [formerly 35427557c4]]
Former-commit-id: 5fb2fe9266
Former-commit-id: f95e1ed18b
|
2014-03-14 11:13:30 -04:00 |
|
Brian.Dyke
|
8ff386b567
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 0aedf39de7 [formerly 670c673e8a] [formerly 24a63fb05a] [formerly 24a63fb05a [formerly 030a18f804]] [formerly 0aedf39de7 [formerly 670c673e8a] [formerly 24a63fb05a] [formerly 24a63fb05a [formerly 030a18f804]] [formerly 30084d7f84 [formerly 24a63fb05a [formerly 030a18f804] [formerly 30084d7f84 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]]]
Former-commit-id: 30084d7f84
Former-commit-id: 74975fbc2b [formerly 024d49d48b] [formerly 916fec5a4f] [formerly f6f103025ef652561969b6d8fbdd482d3b100807 [formerly ef3d48a76a5bbff4e7d32e4ab3916273c583f0ec] [formerly 916fec5a4f [formerly 2109409b24]]]
Former-commit-id: e4b788196864f3ba3d7a5778b5d5870c6c802a7b [formerly 45c14c936cdd09a6b0550940abd94e61b8350680] [formerly 92ed2895fb [formerly f20020876a]]
Former-commit-id: ca0674f5c2c1e2b2c24efb66f69f430f605a20db [formerly 92ed2895fb]
Former-commit-id: 85d43db6af
|
2014-03-14 10:15:53 -04:00 |
|
Brian.Dyke
|
783e81ec45
|
Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: be05eaa7b2 [formerly a68bda6858] [formerly 4e3096631d] [formerly 4e3096631d [formerly d4b6d22ae2]] [formerly be05eaa7b2 [formerly a68bda6858] [formerly 4e3096631d] [formerly 4e3096631d [formerly d4b6d22ae2]] [formerly f999e48df0 [formerly 4e3096631d [formerly d4b6d22ae2] [formerly f999e48df0 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]]]
Former-commit-id: f999e48df0
Former-commit-id: 6f76636104 [formerly 86ec9a50d4] [formerly 82756e3855] [formerly 5bf765180a2d6593156d0375a4966e4e0a0220a7 [formerly 2bdb02ad2c8ccb7c77ded0fd2df41688dea93867] [formerly 82756e3855 [formerly 3ab2df3507]]]
Former-commit-id: 5fd30c6e05a6bf479288c115dede3d9e74cdea79 [formerly 1bf9fe1b47eeea3a212497f6320423ebad1117f1] [formerly 516ba8e81a [formerly 76271269c5]]
Former-commit-id: 516ba8e81a
Former-commit-id: b6b38c0121
|
2014-03-14 08:44:39 -04:00 |
|
Brian.Dyke
|
2e590adc6e
|
OB_14.1.1-23 baseline
Former-commit-id: 3cbb39bf6d [formerly b24e7a66d8] [formerly 55918ee421] [formerly 55918ee421 [formerly dcc2e4fd61]] [formerly 3cbb39bf6d [formerly b24e7a66d8] [formerly 55918ee421] [formerly 55918ee421 [formerly dcc2e4fd61]] [formerly bc6a7bf946 [formerly 55918ee421 [formerly dcc2e4fd61] [formerly bc6a7bf946 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]]]]]
Former-commit-id: bc6a7bf946
Former-commit-id: fcb1029331 [formerly 6c021d0eec] [formerly e78e030b7c] [formerly 627ff695c13396d96d30fb35fce57161b70207c9 [formerly ea51c2c24eabbc975758d2dfad3f260a10c7718d] [formerly e78e030b7c [formerly 8f72db144b]]]
Former-commit-id: 7b0ba5d59d0f3c3eeb3051982083429b71574f43 [formerly 15a710f2de86297f2fae98fe2c109c5d01b1953d] [formerly be8f052cff [formerly c7fbd5dfe4]]
Former-commit-id: ea84216dce48a26e4729cf95a510dd21dfe368ab [formerly be8f052cff]
Former-commit-id: f417ded1bb
|
2014-03-14 08:18:16 -04:00 |
|
Kevin P. Johnson
|
19af3e23fa
|
ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67
Former-commit-id: 1ecf65586c [formerly c791f55d02] [formerly e3a951da78] [formerly e3a951da78 [formerly b2797a0788]] [formerly 1ecf65586c [formerly c791f55d02] [formerly e3a951da78] [formerly e3a951da78 [formerly b2797a0788]] [formerly 4c833d3389 [formerly e3a951da78 [formerly b2797a0788] [formerly 4c833d3389 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]]]
Former-commit-id: 4c833d3389
Former-commit-id: 5670c4f921 [formerly 54316530e4] [formerly 32b372db4b] [formerly 7d143cb8bb502681f18dbc02b91eaf8ec1347e0a [formerly 6cd2437734cdee7992443a141d1ae3334e20f72d] [formerly 32b372db4b [formerly 17a4229072]]]
Former-commit-id: 8071520181000346d1946928d68d3f98fb868d7c [formerly 692a687b6edde3278b185df9e4ad90705444abee] [formerly 90a9e642e3 [formerly eb12ec9c14]]
Former-commit-id: 90a9e642e3
Former-commit-id: fd16da4ae4
|
2014-03-13 20:42:12 +00:00 |
|
Ben Steffensmeier
|
b5ce8728c8
|
Issue #2528 Fix satellite units/style.
Former-commit-id: a4fe3d96c2 [formerly eb922ea2e2] [formerly e6cd8b3167] [formerly e6cd8b3167 [formerly 77041e5b17]] [formerly a4fe3d96c2 [formerly eb922ea2e2] [formerly e6cd8b3167] [formerly e6cd8b3167 [formerly 77041e5b17]] [formerly 75120a09cd [formerly e6cd8b3167 [formerly 77041e5b17] [formerly 75120a09cd [formerly 7e38454a31aa55c606c155a108253c0433ecb517]]]]]
Former-commit-id: 75120a09cd
Former-commit-id: a577d87dc7 [formerly 82a8490dfc] [formerly e2995114dc] [formerly 26be957a83688a7104fbc8728dc5b5c25fdd0a0f [formerly b6272ae932f2784e4677fe602769adb1fef911b2] [formerly e2995114dc [formerly d29daf8ede]]]
Former-commit-id: 393ddab0dcf08bfc869c42e0cc1a93dec0674d69 [formerly 3fdb707afe0c7c8354db1df1089d473246d1649a] [formerly 1bde438f3a [formerly fc62e2679d]]
Former-commit-id: 1bde438f3a
Former-commit-id: b6b13cea10
|
2014-03-12 14:19:49 -05:00 |
|
Richard Peter
|
09ad6f47ca
|
Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
Former-commit-id: 601934ff26 [formerly 4d5c7e49f9] [formerly e981ce3e36] [formerly e981ce3e36 [formerly 18234c5d73]] [formerly 601934ff26 [formerly 4d5c7e49f9] [formerly e981ce3e36] [formerly e981ce3e36 [formerly 18234c5d73]] [formerly f59d1433db [formerly e981ce3e36 [formerly 18234c5d73] [formerly f59d1433db [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]]]]]
Former-commit-id: f59d1433db
Former-commit-id: 3462494d44 [formerly 90f3b627af] [formerly cc35481b48] [formerly 9495fe864eb3a22c8166988cff5a68245a63333d [formerly 5f03de8c59b4bb9535d972f40d6cc693c365c3da] [formerly cc35481b48 [formerly 76f15c73dd]]]
Former-commit-id: fa461f3be4e5c6f1c070c9231aa695220ef4ce4e [formerly ff2e21df08c5b0602d23df7b135c00450a1c40da] [formerly 318c61b1bf [formerly 937c89866d]]
Former-commit-id: 318c61b1bf
Former-commit-id: 64feddc462
|
2014-03-11 16:43:37 -05:00 |
|
Dave Hladky
|
21c106f0f4
|
Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: 88ce074037 [formerly b440063bb9] [formerly 7cd4304140] [formerly 7cd4304140 [formerly 3500ad262a]] [formerly 88ce074037 [formerly b440063bb9] [formerly 7cd4304140] [formerly 7cd4304140 [formerly 3500ad262a]] [formerly 76e216d319 [formerly 7cd4304140 [formerly 3500ad262a] [formerly 76e216d319 [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]]]]]
Former-commit-id: 76e216d319
Former-commit-id: 5bbcd0000b [formerly 39cc47bc52] [formerly f3876233e4] [formerly 13c00209e250398b76234bba84729513bdc2a8a1 [formerly 28b9b16fdbb85a6e9a3afb5298b0813e917a59b1] [formerly f3876233e4 [formerly 03fd32144a]]]
Former-commit-id: 58a3bcd91853ef93ff1d23d47ca680bc6746c536 [formerly 451a7125613fe9ce3c298e07c814874021718d47] [formerly 78441a1250 [formerly c0d2eb8f6b]]
Former-commit-id: 78441a1250
Former-commit-id: 177e76f996
|
2014-03-11 15:53:59 -05:00 |
|
Nate Jensen
|
b1235a6c8a
|
Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
Former-commit-id: e74aa06f41 [formerly a9811bdb2c] [formerly cef0438c35] [formerly cef0438c35 [formerly 85f5821a6f]] [formerly e74aa06f41 [formerly a9811bdb2c] [formerly cef0438c35] [formerly cef0438c35 [formerly 85f5821a6f]] [formerly afbdf6962c [formerly cef0438c35 [formerly 85f5821a6f] [formerly afbdf6962c [formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]]]]]
Former-commit-id: afbdf6962c
Former-commit-id: 450dbbb07b [formerly fd0a81a181] [formerly 3411167042] [formerly 8de46cef0958224bda398c767d92e84107ad1a25 [formerly 2ac85b86fee6285f476e7194d549ae07555767d9] [formerly 3411167042 [formerly 09f4bd9883]]]
Former-commit-id: 439c2001a6d92cf390f657f5490fe70eea149ae5 [formerly 0f271f5e259517b85add913a4d42f6b3fbb92885] [formerly 39d73f1569 [formerly be9744c6f9]]
Former-commit-id: 056b956101e88434431787ec0ec4616e6f1bbedf [formerly 39d73f1569]
Former-commit-id: 95a07d847e
|
2014-03-11 12:35:44 -05:00 |
|
David Gillingham
|
e9b7a28af5
|
Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68
Former-commit-id: ee62f41ef7 [formerly 751d8956a9] [formerly e3a3cf7bad] [formerly e3a3cf7bad [formerly b0783b64ce]] [formerly ee62f41ef7 [formerly 751d8956a9] [formerly e3a3cf7bad] [formerly e3a3cf7bad [formerly b0783b64ce]] [formerly 187196b519 [formerly e3a3cf7bad [formerly b0783b64ce] [formerly 187196b519 [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]]]]]
Former-commit-id: 187196b519
Former-commit-id: bc783123ae [formerly 6fcb5b7e73] [formerly 4179172d0e] [formerly 4dc83d991d97997a320d0b71b8d06f4d53d372c7 [formerly e949b41e8ce1e7c37f0f510cdbbac24e2438f30d] [formerly 4179172d0e [formerly 68edb8d9a1]]]
Former-commit-id: 7ce80ab104ade4283ae54b7b1c9c5139346e8dd4 [formerly db669e661b0dcdd0789172fe8a31d92ad669695d] [formerly 0e0fdae804 [formerly f30292b471]]
Former-commit-id: 0e0fdae804
Former-commit-id: 7c4f0bcee6
|
2014-03-11 11:54:25 -05:00 |
|
Ben Steffensmeier
|
87d747380e
|
Issue #2896 Fix sat best res on weird projections
Former-commit-id: c4d37bb6ea [formerly a9c4875038] [formerly c7fa392f3f] [formerly c7fa392f3f [formerly 8bb517836a]] [formerly c4d37bb6ea [formerly a9c4875038] [formerly c7fa392f3f] [formerly c7fa392f3f [formerly 8bb517836a]] [formerly 560fc688bc [formerly c7fa392f3f [formerly 8bb517836a] [formerly 560fc688bc [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]]]
Former-commit-id: 560fc688bc
Former-commit-id: 07f8f4b105 [formerly 20b99bc6c5] [formerly 7a06fdd71a] [formerly eb8fabf9e206e5f8c1f77a240979a79beff004f6 [formerly 3dd12b4d2d8faad952b606b3c39220f5602545d4] [formerly 7a06fdd71a [formerly b474e92189]]]
Former-commit-id: b996ac5af0d154599d05131714e5aa7ae1bd05cc [formerly 5c6ba99d716537fdfe23db7e188caebb8b401e59] [formerly 470ac4a1b9 [formerly 30683880ee]]
Former-commit-id: 470ac4a1b9
Former-commit-id: d3992ef6d7
|
2014-03-11 11:07:43 -05:00 |
|
Nate Jensen
|
7ae8b69d9d
|
Issue #2779 update memory settings for renamed NC perspective
Former-commit-id: 3ad4d8ef22 [formerly ebf5186d75] [formerly 17aa39ce0a] [formerly 17aa39ce0a [formerly ccb06db199]] [formerly 3ad4d8ef22 [formerly ebf5186d75] [formerly 17aa39ce0a] [formerly 17aa39ce0a [formerly ccb06db199]] [formerly 5eb892f4cf [formerly 17aa39ce0a [formerly ccb06db199] [formerly 5eb892f4cf [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: 35772209be [formerly 219f232fcb] [formerly 42c545804c] [formerly fb19ff1039ed07d5b156cceff269b82ad1819706 [formerly dc64b4c9b5a35e0a38967549f2d086cd34c1fedf] [formerly 42c545804c [formerly 22ff235bcf]]]
Former-commit-id: 9593e29b4025a74acf48f54c2d97f1168b9c21ab [formerly c46da055ba6866f0ae818586090fa0544db52dc7] [formerly 391deee18c [formerly 15a2fb216e]]
Former-commit-id: 22930c10ff17363fae12bf161ea61445593a7371 [formerly 391deee18c]
Former-commit-id: 611915a88c
|
2014-03-11 10:28:01 -05:00 |
|
Brian.Dyke
|
08f62717e4
|
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
Former-commit-id: c27f5fc24f [formerly 1cb3691cc4] [formerly fa16721854] [formerly fa16721854 [formerly 552490206f]] [formerly c27f5fc24f [formerly 1cb3691cc4] [formerly fa16721854] [formerly fa16721854 [formerly 552490206f]] [formerly fcc9115b0d [formerly fa16721854 [formerly 552490206f] [formerly fcc9115b0d [formerly eaa41b4f2dd9fce2d957a2311ee3f4f04f220365]]]]]
Former-commit-id: fcc9115b0d
Former-commit-id: ed08da749b [formerly a42c10c21d] [formerly 3070b42ed3] [formerly fba702689b0af5d15b478f2b7406d20b9e84b9ba [formerly 96892f7695c369e44e299b4077a8590a12b79541] [formerly 3070b42ed3 [formerly 83822661e8]]]
Former-commit-id: 6b5c88393355e4f59785c49146f1478a984a4b4d [formerly 976fbb149cf7a3f819169004bcb228fd4ddf1282] [formerly b301ef8190 [formerly fdaab3d981]]
Former-commit-id: b301ef8190
Former-commit-id: b34425dbf0
|
2014-03-11 10:44:03 -04:00 |
|
Juliya Dynina
|
d878399b42
|
Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
Former-commit-id: a16e3beada [formerly 2b55a4240e] [formerly b3ec4c363f] [formerly b3ec4c363f [formerly 6bbd88e62c]] [formerly a16e3beada [formerly 2b55a4240e] [formerly b3ec4c363f] [formerly b3ec4c363f [formerly 6bbd88e62c]] [formerly 7952862443 [formerly b3ec4c363f [formerly 6bbd88e62c] [formerly 7952862443 [formerly a167748b77baad66784893304a18e8866f5471f1]]]]]
Former-commit-id: 7952862443
Former-commit-id: 663eb504fd [formerly d1b202fcd0] [formerly bedc9082b0] [formerly 4fcdb91357245228c6122eab65cb718a6354b579 [formerly 30b12a7237013355ab82100b5cd40d97cfd766da] [formerly bedc9082b0 [formerly 7e35f36651]]]
Former-commit-id: f2cc5b8eb42185b07b34e02280c9659c0b9c510c [formerly 187c2bed7707310ed1c946986736df1dabeef617] [formerly ddf1c4f4f6 [formerly 7966aac771]]
Former-commit-id: d5d1054f57c207f0d4fbe098cfb6cbb2ef1f6f4e [formerly ddf1c4f4f6]
Former-commit-id: 98b24cf46b
|
2014-03-11 09:24:12 -05:00 |
|
Brian.Dyke
|
936b2b022e
|
Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1
Former-commit-id: 9b1a78f861 [formerly 90154e7ae1] [formerly bcf9a5dc83] [formerly bcf9a5dc83 [formerly c6f2010ce6]] [formerly 9b1a78f861 [formerly 90154e7ae1] [formerly bcf9a5dc83] [formerly bcf9a5dc83 [formerly c6f2010ce6]] [formerly 4269f9d875 [formerly bcf9a5dc83 [formerly c6f2010ce6] [formerly 4269f9d875 [formerly 0e02910adc2ef73df2eff5b41c1e9945a5536a0a]]]]]
Former-commit-id: 4269f9d875
Former-commit-id: 933e4056f4 [formerly 3667299983] [formerly c26c40d6e3] [formerly 3d949fee4f7255e3f98ed55e8ad312a6bc4aecb7 [formerly 738fc5f415c773f7bde24fd1a60b618f33307d23] [formerly c26c40d6e3 [formerly a453d3fd68]]]
Former-commit-id: 78b6a65a28734ed4185dc9816a41e14ef09cc791 [formerly 58e4c89bd43a8a7a0f7edf067cf9dff34a054c40] [formerly 305b2563fa [formerly 57b5d77dee]]
Former-commit-id: 305b2563fa
Former-commit-id: 0d72b90e5e
|
2014-03-10 15:42:38 -04:00 |
|
brian.dyke
|
e45b8a86f2
|
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
Former-commit-id: 5c855cd99d [formerly 730491d4bb] [formerly 1a482f91bc] [formerly 1a482f91bc [formerly 654778bb0d]] [formerly 5c855cd99d [formerly 730491d4bb] [formerly 1a482f91bc] [formerly 1a482f91bc [formerly 654778bb0d]] [formerly b1b216f196 [formerly 1a482f91bc [formerly 654778bb0d] [formerly b1b216f196 [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]]]
Former-commit-id: b1b216f196
Former-commit-id: e6c8986639 [formerly 41a37605d4] [formerly d1b389ae05] [formerly 78c031054b9dfc2beb7420496b5c54ba5ed734f4 [formerly 9bef04b7d89a16100ee76d159ab4225ead55540a] [formerly d1b389ae05 [formerly d57a3dd24c]]]
Former-commit-id: b1b125510734a20d8f6e817c848397511e5d4c0a [formerly db4eabc17ce8b18f073611f9c641761f09467a04] [formerly fba0188c90 [formerly f3df3e3690]]
Former-commit-id: fba0188c90
Former-commit-id: 3b1dd43698
|
2014-03-10 15:36:56 -04:00 |
|
Brian.Dyke
|
d8b53738e0
|
Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
Former-commit-id: 3c2f6baef7 [formerly 8d4a1e1204] [formerly 24785068be] [formerly 24785068be [formerly d710aec521]] [formerly 3c2f6baef7 [formerly 8d4a1e1204] [formerly 24785068be] [formerly 24785068be [formerly d710aec521]] [formerly fda6ab1344 [formerly 24785068be [formerly d710aec521] [formerly fda6ab1344 [formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]]]]
Former-commit-id: fda6ab1344
Former-commit-id: 8f16267a76 [formerly d197a72c20] [formerly c5502af3fa] [formerly bd41896fe0ecfba47f5f7ef37394b9fd53b0ec64 [formerly 6ec1b00cf64c71cead90fca582edef188ec24710] [formerly c5502af3fa [formerly 0aff5875b0]]]
Former-commit-id: 3a0cea2d008cabc9f6a1d2a0e32a80ac7b9ec151 [formerly 28dc637ae8563b78153684cbfa60e954caea69c9] [formerly 26e19974d1 [formerly dcade6e18a]]
Former-commit-id: 26e19974d1
Former-commit-id: 0a1ef77d16
|
2014-03-10 15:14:59 -04:00 |
|
Nate Jensen
|
2e3da45136
|
Issue #2779 add .ini generation of memory settings for other components
Former-commit-id: 201b5c6928 [formerly b77dde280f] [formerly 5a88f31a2b] [formerly 5a88f31a2b [formerly 6a75fe686a]] [formerly 201b5c6928 [formerly b77dde280f] [formerly 5a88f31a2b] [formerly 5a88f31a2b [formerly 6a75fe686a]] [formerly d599db4af2 [formerly 5a88f31a2b [formerly 6a75fe686a] [formerly d599db4af2 [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]]]
Former-commit-id: d599db4af2
Former-commit-id: 7a0f06c03a [formerly d32d855bb2] [formerly 39aa26c2b6] [formerly 47255c8b9e5d3049eff92cde37f418883db60446 [formerly 097c1a455c355cc0ebe8f7b95797516bfc05c8c6] [formerly 39aa26c2b6 [formerly 5094008bea]]]
Former-commit-id: 2ac870f8e005b6cc3996a96834fcae6a41a57897 [formerly fdddd15a0dc1ec336fdf3059c126c4240f794f5c] [formerly 6bafc51abe [formerly 19a0cfb972]]
Former-commit-id: 6bafc51abe
Former-commit-id: c508c4d9bb
|
2014-03-10 10:03:02 -05:00 |
|
Stephen Gilbert
|
827508da3a
|
VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2
Former-commit-id: 8229ecf3ef [formerly 8560c21c50] [formerly 200c7e60da] [formerly 200c7e60da [formerly 65dd8b4c3c]] [formerly 8229ecf3ef [formerly 8560c21c50] [formerly 200c7e60da] [formerly 200c7e60da [formerly 65dd8b4c3c]] [formerly f203a4c035 [formerly 200c7e60da [formerly 65dd8b4c3c] [formerly f203a4c035 [formerly 459cd2e6772efa05a683073798a1d4424aa2facf]]]]]
Former-commit-id: f203a4c035
Former-commit-id: e845f0ed47 [formerly 803a4584c9] [formerly 00c1f40997] [formerly d0203dcf0645705e43baf8ae3e39b6328797d0a0 [formerly ad4b7bcc63f7e8c66ec4b0f39eea3f4a987956f1] [formerly 00c1f40997 [formerly 46ebeb9969]]]
Former-commit-id: 1cc85bc069db9285b3207654ef69cfb07bdcea18 [formerly d34facf3627b4a21886984446a4d5d04222a5da1] [formerly aaa14d1b1d [formerly abb11feb16]]
Former-commit-id: aaa14d1b1d
Former-commit-id: 806b78cf4d
|
2014-03-07 19:10:08 -05:00 |
|
Stephen Gilbert
|
81f811dae3
|
VLab Issue #3223 - NSHARP: Improve selection operation
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d
Former-commit-id: 753cba0064 [formerly ba4869af46] [formerly 5fcb45a629] [formerly 5fcb45a629 [formerly 9a457213bb]] [formerly 753cba0064 [formerly ba4869af46] [formerly 5fcb45a629] [formerly 5fcb45a629 [formerly 9a457213bb]] [formerly e3aedaa1d6 [formerly 5fcb45a629 [formerly 9a457213bb] [formerly e3aedaa1d6 [formerly 16fcc171c65d79d5698feeb3ff0ace49c31d976f]]]]]
Former-commit-id: e3aedaa1d6
Former-commit-id: e1f27059e5 [formerly fb4c74e0cd] [formerly c4b73eb02e] [formerly 28aa35b5d66dca5e0bef459c615fa78defd2b995 [formerly c9da8cd134141da14e27b89961b37aff9bce21eb] [formerly c4b73eb02e [formerly b1e1d9178a]]]
Former-commit-id: 1838ecdbc8f096f6ae6a78d2445e7e9279307ae0 [formerly d2c9ed404a1b1977c532dfd66aa6f8681ccc6fad] [formerly 08b8f4c679 [formerly 05328b9103]]
Former-commit-id: 08b8f4c679
Former-commit-id: e3d279329d
|
2014-03-07 19:07:28 -05:00 |
|
Stephen Gilbert
|
0e035b1cbf
|
VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57
Former-commit-id: ebe658e523 [formerly 78e4214f3d] [formerly a7fd09a409] [formerly a7fd09a409 [formerly 1632166902]] [formerly ebe658e523 [formerly 78e4214f3d] [formerly a7fd09a409] [formerly a7fd09a409 [formerly 1632166902]] [formerly 49a6d6ec7e [formerly a7fd09a409 [formerly 1632166902] [formerly 49a6d6ec7e [formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]]]]
Former-commit-id: 49a6d6ec7e
Former-commit-id: 3a2c0269a0 [formerly fee37acf0c] [formerly 6d40a42c39] [formerly d766c48c699aa0d80c233817b66da6f0d84bc3dc [formerly cf3ae4ba60186788d49675c04096c67eee23603a] [formerly 6d40a42c39 [formerly de6e50d8e6]]]
Former-commit-id: 438b6c00bee888b36482cb6e5feb314bf200f4e8 [formerly 6488fc0d38e5381f3847719213a5fbb4e7249d10] [formerly 5eea989db5 [formerly 40a62c63cd]]
Former-commit-id: 5eea989db5
Former-commit-id: 5652cbdde4
|
2014-03-07 18:49:21 -05:00 |
|
Stephen Gilbert
|
4288552d42
|
VLab Issue #3221 - Fix XML serialization problems
A few problems reading/writing XML files were noticed after upgrading to
14.2.1. This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.
Change-Id: I8aad4197029c70f72612299a25329687892884af
Former-commit-id: 74ed637025 [formerly 6f8caa3515] [formerly cce06bfbe3] [formerly cce06bfbe3 [formerly 625fcb0064]] [formerly 74ed637025 [formerly 6f8caa3515] [formerly cce06bfbe3] [formerly cce06bfbe3 [formerly 625fcb0064]] [formerly 6dd6ae8d36 [formerly cce06bfbe3 [formerly 625fcb0064] [formerly 6dd6ae8d36 [formerly 4f58998c899e28521658bf17dee852592c534713]]]]]
Former-commit-id: 6dd6ae8d36
Former-commit-id: fa3a0cb620 [formerly b69374b56d] [formerly ce73240c40] [formerly 75ee5f09d63d58fe93584f50c865748e697dedfc [formerly 53869af84fd3c1760276c2fccf36acd25767d8aa] [formerly ce73240c40 [formerly 204d047289]]]
Former-commit-id: 1b79f2e0bc38931412e85aab2a22a1933019231e [formerly 24c6ee760a153abacd30869121c5aeaaddae79fa] [formerly e0f2f91b21 [formerly ebafac1725]]
Former-commit-id: e0f2f91b21
Former-commit-id: 3787125175
|
2014-03-07 18:36:42 -05:00 |
|
Steve Harris
|
7f6debc2c5
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 75dfbf2f50 [formerly da2d7fc334] [formerly 068297b90a] [formerly 068297b90a [formerly 92232fa063]] [formerly 75dfbf2f50 [formerly da2d7fc334] [formerly 068297b90a] [formerly 068297b90a [formerly 92232fa063]] [formerly 40b543f9a8 [formerly 068297b90a [formerly 92232fa063] [formerly 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: c9fe927a17 [formerly a94f800324] [formerly 4d1fbf8743] [formerly efba617a73c26bfacea16cc9961421508d57dd5c [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb] [formerly 4d1fbf8743 [formerly f992a6b046]]]
Former-commit-id: 12f0692d5652bc442f51abcadf8aa619047cc4c8 [formerly 0b70d2b7739772b630136c56408866dc53a2bdcd] [formerly e29b96b6bd [formerly ea01373320]]
Former-commit-id: e29b96b6bd
Former-commit-id: 3348f6857a
|
2014-03-07 15:16:18 -06:00 |
|
Shawn.Hooper
|
eba4d5211e
|
ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: c2dbae2b2d [formerly bd02f6a1a6] [formerly e894b1279a] [formerly e894b1279a [formerly 41a4905f9f]] [formerly c2dbae2b2d [formerly bd02f6a1a6] [formerly e894b1279a] [formerly e894b1279a [formerly 41a4905f9f]] [formerly 56a949fba8 [formerly e894b1279a [formerly 41a4905f9f] [formerly 56a949fba8 [formerly b18b8f64040b1c41810f391b8ed785327b6e5d59]]]]]
Former-commit-id: 56a949fba8
Former-commit-id: da3ad78123 [formerly 1acdbf20f2] [formerly 84b71d7252] [formerly 8800d09598e1aa53d121bf13f31e8a45f8327b42 [formerly 8e558f4668f969675b3426aa8d9a1fd8674746ec] [formerly 84b71d7252 [formerly aa827610b1]]]
Former-commit-id: 091e2fa5d588461292717701c5bc31d2eb3cc9c2 [formerly 16550e6ebdc23f503b230c433c6ada3ea1da148b] [formerly df59dabcb5 [formerly fb673d390f]]
Former-commit-id: df59dabcb5
Former-commit-id: 671d334f18
|
2014-03-07 14:53:54 -05:00 |
|
Shawn.Hooper
|
b54a97f3c7
|
ASM #377 - Baseline National River Location Database fails
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 4b6e2e4b6a [formerly 94e4e3e649] [formerly 6a8a1c397b] [formerly 6a8a1c397b [formerly 670da1895b]] [formerly 4b6e2e4b6a [formerly 94e4e3e649] [formerly 6a8a1c397b] [formerly 6a8a1c397b [formerly 670da1895b]] [formerly 85db05e819 [formerly 6a8a1c397b [formerly 670da1895b] [formerly 85db05e819 [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]]]]]
Former-commit-id: 85db05e819
Former-commit-id: 3bce709ae0 [formerly d549088e33] [formerly b7cf50dd31] [formerly 09f914692b2655309e0ed1c1f49846eaa23b6dfe [formerly 32e11e96551b8e3081b3d4dde88e4590083e6392] [formerly b7cf50dd31 [formerly 62a0c1dadf]]]
Former-commit-id: 0b72306f1b341b33a2f33224af6cc7d9cc663baa [formerly b7f2c27096f052aab3c364f5bc82543098085d30] [formerly 94a008ff56 [formerly 6401571e92]]
Former-commit-id: 94a008ff56
Former-commit-id: aedaebcd97
|
2014-03-07 13:12:11 -05:00 |
|
Shawn.Hooper
|
e18fd10210
|
ASM #378 - MPE gages are not listed/available in gage table
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: 81a558c120 [formerly fb051c5a5f] [formerly b46b87cb5e] [formerly b46b87cb5e [formerly 8c9f9b3ae0]] [formerly 81a558c120 [formerly fb051c5a5f] [formerly b46b87cb5e] [formerly b46b87cb5e [formerly 8c9f9b3ae0]] [formerly dc3aadd149 [formerly b46b87cb5e [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]]]
Former-commit-id: dc3aadd149
Former-commit-id: 53d1b15925 [formerly e33de27296] [formerly 68d8f9be14] [formerly 9b98e1e2fc891e0dc40c509f43fdaa86fd31504e [formerly f304d2fa3946f5a199255a03597cdc0f3f79d636] [formerly 68d8f9be14 [formerly 05bb380e77]]]
Former-commit-id: dbf82bfefa6f202f6623e28913fd0f0475d4c3cf [formerly 701e61da1838f2875ec87860a05500044bd28ae9] [formerly db1c090463 [formerly 26a112b34b]]
Former-commit-id: db1c090463
Former-commit-id: 20c67c86e1
|
2014-03-07 12:57:36 -05:00 |
|
Brian.Dyke
|
8305b4aea2
|
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
Former-commit-id: 4f9a634578 [formerly 92bff38059] [formerly 48cc3b6c55] [formerly 48cc3b6c55 [formerly 3ac2a61218]] [formerly 4f9a634578 [formerly 92bff38059] [formerly 48cc3b6c55] [formerly 48cc3b6c55 [formerly 3ac2a61218]] [formerly 1fe5504d4c [formerly 48cc3b6c55 [formerly 3ac2a61218] [formerly 1fe5504d4c [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]]]]
Former-commit-id: 1fe5504d4c
Former-commit-id: 6612abfd65 [formerly 1f7e61b3df] [formerly 48f1f544d6] [formerly 7d1135de4dc49bb6b242670c730aa0449fb721c3 [formerly a7d6f4f47c9df94b8ae88988530dc06d80b92b0a] [formerly 48f1f544d6 [formerly 0c4b9469b0]]]
Former-commit-id: 64813ec1e5e70b255ba329c677cc94dcbae19182 [formerly abc0a250d76460ad95e9e08c0cae29d6d481bfd2] [formerly d9f1b98ce7 [formerly 795c5424cb]]
Former-commit-id: d9f1b98ce7
Former-commit-id: 15a5404df3
|
2014-03-07 11:50:06 -05:00 |
|
David Friedman
|
c00bffe1f9
|
ASM #349 - Workaround for QPID-5569
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: d7db4bf632 [formerly b8aadf1781] [formerly 103fece7b7] [formerly 103fece7b7 [formerly 2c1a3442d6]] [formerly d7db4bf632 [formerly b8aadf1781] [formerly 103fece7b7] [formerly 103fece7b7 [formerly 2c1a3442d6]] [formerly a58f3cb7df [formerly 103fece7b7 [formerly 2c1a3442d6] [formerly a58f3cb7df [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]]]]
Former-commit-id: a58f3cb7df
Former-commit-id: a1738767f4 [formerly 951bd668ae] [formerly 91b22ff9bb] [formerly f2e81550b0af2068d152eb149f81e903079629fe [formerly 38bf85175bedb3976ea85ab928e8bdea8f6e4a64] [formerly 91b22ff9bb [formerly 2a4a92c223]]]
Former-commit-id: 9085352f659bfa05328334cffbd2b49251e97a23 [formerly e4fe776694b8d4beb5605017347016019fb2ec75] [formerly 2eb0b3dfb0 [formerly ab5f533c72]]
Former-commit-id: 2eb0b3dfb0
Former-commit-id: 87ed26568e
|
2014-03-07 14:58:09 +00:00 |
|
Brian.Dyke
|
6bc2e4535d
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 103b06b186 [formerly c2449e7821] [formerly a0e3f08fce] [formerly a0e3f08fce [formerly 394076196b]] [formerly 103b06b186 [formerly c2449e7821] [formerly a0e3f08fce] [formerly a0e3f08fce [formerly 394076196b]] [formerly 7b798ab5d2 [formerly a0e3f08fce [formerly 394076196b] [formerly 7b798ab5d2 [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: 3664571639 [formerly eb6abe6faa] [formerly fa189c0ef6] [formerly 04d354461e6f8a3957ce212199076a8d6419f4d3 [formerly e502d460a99724c0ff3efb14c8d0f8d731aad320] [formerly fa189c0ef6 [formerly 6ced1bedc2]]]
Former-commit-id: 481514ac434bfc7de1a0b297e45cc195df92dbd2 [formerly c243cc113e92d596862d61e7a6a2878bf1eafda3] [formerly ac07a4fc49 [formerly c8b3730fef]]
Former-commit-id: ac07a4fc49
Former-commit-id: 603695a2a4
|
2014-03-07 09:01:09 -05:00 |
|
Brian.Dyke
|
f557956bc4
|
Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: 74d19f707a [formerly e1cc8eb59a] [formerly 0bbf137b05] [formerly 0bbf137b05 [formerly 312cd8a3e8]] [formerly 74d19f707a [formerly e1cc8eb59a] [formerly 0bbf137b05] [formerly 0bbf137b05 [formerly 312cd8a3e8]] [formerly 6414bdab57 [formerly 0bbf137b05 [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]]]
Former-commit-id: 6414bdab57
Former-commit-id: 3e787975d2 [formerly 50621ec3e5] [formerly 2eec413d72] [formerly eb691e30c988ae59a417e5e908b795b25b945453 [formerly 1e0890d0f70a0aeffbbcabd7f8be3e396daae297] [formerly 2eec413d72 [formerly 2f94480121]]]
Former-commit-id: 887e32b93aa0be2d6e80624ef335e498dbfbb3db [formerly d006a47edee1a1939aadf15ef61024f22a80931d] [formerly da36dde938 [formerly 8f2271403d]]
Former-commit-id: da36dde938
Former-commit-id: b8ee763baa
|
2014-03-07 08:57:07 -05:00 |
|
Brian.Dyke
|
8de1a65d9f
|
14.1.1-22 baseline
Former-commit-id: 935c79a5dd [formerly 1dcc56775d] [formerly fe30e1d545] [formerly fe30e1d545 [formerly 21f17d4f9b]] [formerly 935c79a5dd [formerly 1dcc56775d] [formerly fe30e1d545] [formerly fe30e1d545 [formerly 21f17d4f9b]] [formerly 08d8f1a0ee [formerly fe30e1d545 [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly ae37ad5bac445251d1456f37588819fccfede061]]]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 90aae085ad [formerly 3c9cde458a] [formerly 9406a1d6c0] [formerly 24ebeb47069cc97206387ce7b40d8dbb66247a7d [formerly f1658f5e11228e084b4f3ed536ccf891c20f621a] [formerly 9406a1d6c0 [formerly a4c136fd60]]]
Former-commit-id: 4b2defbe98126c30e265edc98bfd5af37a5f0445 [formerly 385ffc492ff49872acfb40d1c47fffb7dff76ec2] [formerly c1dab50ce0 [formerly 067802b104]]
Former-commit-id: c1dab50ce0
Former-commit-id: ed94e1bc6b
|
2014-03-07 08:49:00 -05:00 |
|
Steve Harris
|
0908bde34a
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: afbf38d76f [formerly 93aa41a34b] [formerly 3358e8d6ef] [formerly 3358e8d6ef [formerly 7f1ad89df9]] [formerly afbf38d76f [formerly 93aa41a34b] [formerly 3358e8d6ef] [formerly 3358e8d6ef [formerly 7f1ad89df9]] [formerly a2e36f4c6c [formerly 3358e8d6ef [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 0ee6eca712 [formerly 3715195901] [formerly 2371a74a29] [formerly 932e6bd0cced8920652c51cdb795a6002399ca41 [formerly 4de1a1cd26a0d873cc898cd411cc38ab4cc889c6] [formerly 2371a74a29 [formerly 8ec20fc5e9]]]
Former-commit-id: 12bed867bcdd8dca8ff57d7a87ae372836fcc6d9 [formerly 550b2170a0e7b2252cdcb3421b25e5704cf2cdac] [formerly 71c8e15b78 [formerly 104b3d369a]]
Former-commit-id: 71c8e15b78
Former-commit-id: f7a15a87e5
|
2014-03-06 18:19:55 -06:00 |
|
David Friedman
|
a7c3399e93
|
ASM #74 - Fix RadarServer configuration import utility JAR dependency
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70
Former-commit-id: e88dd49d06 [formerly e7def94c5f] [formerly fa849dfefa] [formerly fa849dfefa [formerly 11d0d191fd]] [formerly e88dd49d06 [formerly e7def94c5f] [formerly fa849dfefa] [formerly fa849dfefa [formerly 11d0d191fd]] [formerly d08597a0d4 [formerly fa849dfefa [formerly 11d0d191fd] [formerly d08597a0d4 [formerly 1a4183ed991cf1aed5895334c7b823a66ad58a7a]]]]]
Former-commit-id: d08597a0d4
Former-commit-id: 4576be93a6 [formerly 3d09743022] [formerly 7efff2943c] [formerly ddfcc80ebdfc75765aee7fcbd90fcbb1b8420dde [formerly 0bdcf1f23aab3fbfc22ef2ba180d8b9df0c2616a] [formerly 7efff2943c [formerly 591ce333dc]]]
Former-commit-id: edbdcefcd8029e078b6865581a69a3f544376263 [formerly 89fc9937b925fbd68ad74bb2b24a9bffae38c3df] [formerly 3dde8aeda7 [formerly 89b6f79565]]
Former-commit-id: 3dde8aeda7
Former-commit-id: b62acbc154
|
2014-03-06 17:07:23 +00:00 |
|
Brian.Dyke
|
f425afb596
|
Merge 13.5.3 DR_16824
Former-commit-id: 5b433c0295 [formerly b8a4de2bf0] [formerly 7baa5ee0d5] [formerly 7baa5ee0d5 [formerly b8fd0f16ed]] [formerly 5b433c0295 [formerly b8a4de2bf0] [formerly 7baa5ee0d5] [formerly 7baa5ee0d5 [formerly b8fd0f16ed]] [formerly dafe7e6a42 [formerly 7baa5ee0d5 [formerly b8fd0f16ed] [formerly dafe7e6a42 [formerly 1b9ed749da0d1893f44e68400644f37c763e324a]]]]]
Former-commit-id: dafe7e6a42
Former-commit-id: 6d4c2f8b87 [formerly e72bd45b20] [formerly 981373f82b] [formerly aab3fd100fcdd688520fb5b16074c30055191612 [formerly efa362d2eeba660bf5dac619a16ffd73dbad64c8] [formerly 981373f82b [formerly 8c16576a82]]]
Former-commit-id: 0bd33416ba1c3ff1f1ae2b7839d632f8d3db81ce [formerly 3a95079d38c634aa43d85134508e3d0b5d606551] [formerly 4e38785329 [formerly bcf5bf170d]]
Former-commit-id: 5a6a185c155e3b3bbea88cd10d066f1116969b13 [formerly 4e38785329]
Former-commit-id: 24affa400b
|
2014-03-06 11:22:08 -05:00 |
|
Brian.Dyke
|
54e42a83b9
|
ASM #221 - LDM Missing Visible Satellite Solution - Part 2 (ldmd.conf change)
Former-commit-id: da4afb759b [formerly 8c54df9e0c] [formerly 26fe429c4b] [formerly 26fe429c4b [formerly 1778d20745]] [formerly da4afb759b [formerly 8c54df9e0c] [formerly 26fe429c4b] [formerly 26fe429c4b [formerly 1778d20745]] [formerly 010b7a1df5 [formerly 26fe429c4b [formerly 1778d20745] [formerly 010b7a1df5 [formerly 85700a6c632125b5f1d36b37a70767fbd9819142]]]]]
Former-commit-id: 010b7a1df5
Former-commit-id: 433adbce74 [formerly df3291e0b4] [formerly 14844a10b6] [formerly 157d5cb6502d0dd1e7073a9370f666671a0e518a [formerly 0ef04c99b170216a3f24341f708895d2df66d675] [formerly 14844a10b6 [formerly c6dae5a81f]]]
Former-commit-id: dd4ab9e06a804f3c6447026ed768a9bae4727081 [formerly 2a8a80f5ec679fb777138b8501782bf43dc7de32] [formerly 0c6ba63abc [formerly 863de85b6b]]
Former-commit-id: 0c6ba63abc
Former-commit-id: b1435c612e
|
2014-03-06 11:04:34 -05:00 |
|
Brian.Dyke
|
6b5a14336f
|
ASM #220 - LDM Missing Visible Satellite Solution - Part 1 (qpidd wrapper.conf)
Former-commit-id: 6c2229761b [formerly e5972b7159] [formerly 6313b7af0c] [formerly 6313b7af0c [formerly 2dbac1697d]] [formerly 6c2229761b [formerly e5972b7159] [formerly 6313b7af0c] [formerly 6313b7af0c [formerly 2dbac1697d]] [formerly cb1b4a7ac5 [formerly 6313b7af0c [formerly 2dbac1697d] [formerly cb1b4a7ac5 [formerly c1dc533bf7ee6500da3f6d75699ad7758a39462b]]]]]
Former-commit-id: cb1b4a7ac5
Former-commit-id: 5736be2741 [formerly b2cd2711f9] [formerly 57a28e817d] [formerly 38da43ac25d3d18842b31001d43b1cf109c867d1 [formerly 92fbb4b7ccf0b4c7c32f6ac2ac82358fc9c89c38] [formerly 57a28e817d [formerly 3fdb85c62d]]]
Former-commit-id: bdc8bf767164315d9e047f4a5f9f9419682c5433 [formerly ed9a44ece7652bc19f6481662d2caead4061477f] [formerly 36e0ad0fdd [formerly 6f5baf3984]]
Former-commit-id: bfe2ffc659f60ce1293fd586e770ce6b32f869ae [formerly 36e0ad0fdd]
Former-commit-id: 9762ca9d59
|
2014-03-06 10:56:44 -05:00 |
|
Brian.Dyke
|
f35a08d2b4
|
ASM #124 - Display GLD360 lightning data
Former-commit-id: 27dc8e8eb2 [formerly 972c2c284b] [formerly bd81ebd8c2] [formerly bd81ebd8c2 [formerly db274c890f]] [formerly 27dc8e8eb2 [formerly 972c2c284b] [formerly bd81ebd8c2] [formerly bd81ebd8c2 [formerly db274c890f]] [formerly eefe8c45fe [formerly bd81ebd8c2 [formerly db274c890f] [formerly eefe8c45fe [formerly 1edba9216beac913f9bd867da9988e213394a396]]]]]
Former-commit-id: eefe8c45fe
Former-commit-id: 6732b47d23 [formerly 6ef9f7fd37] [formerly 26140187b1] [formerly 44df9b28594b77e69793f3a9ca468dcbb216ef7c [formerly 44a38ade0727afc9f135777d46659f273033a036] [formerly 26140187b1 [formerly b657767cb1]]]
Former-commit-id: d27b72416c5e056812025e560edc8b3f6377b0d8 [formerly 5fde31dc71e51a7f747df35d265aff302392ec26] [formerly 8de6b2d57b [formerly b9e9126e11]]
Former-commit-id: 8de6b2d57b
Former-commit-id: db44e7f0ec
|
2014-03-06 10:54:15 -05:00 |
|