Commit graph

3124 commits

Author SHA1 Message Date
Ron Anderson
b4a2ae3aae Issue #3317 Fix merge problem that removed GFE notification of D2D purge
Change-Id: I925b7287bdb2fb7f9c330b05b1b2c32031e693d9

Former-commit-id: 5dd7a035ac [formerly ead09dd683] [formerly 5dd7a035ac [formerly ead09dd683] [formerly a6956a8ccd [formerly 04805a8957ef14754225f85f4722d8302cde8df3]]]
Former-commit-id: a6956a8ccd
Former-commit-id: 8b027efdec [formerly 7abeff57cc]
Former-commit-id: e5b81ccee0
2014-06-25 19:12:51 +00:00
Ron Anderson
849625a3e1 Issue #3317 Fix issue with obsolete D2DGridDatabases not getting purged.
Change-Id: If792327215bb9f8db470c95099463e735c462d46

Former-commit-id: f76a2d3700 [formerly 898b30fadb] [formerly f76a2d3700 [formerly 898b30fadb] [formerly 2ac9cd84ec [formerly 2a84ea1af7bb767e9e85387de1fd90c662f9f91d]]]
Former-commit-id: 2ac9cd84ec
Former-commit-id: ddcfe574d8 [formerly ff5c0f2c33]
Former-commit-id: 2cc92ecc69
2014-06-25 13:21:32 -05:00
Nate Jensen
124d873714 Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
Former-commit-id: c9696dbd3b [formerly 791ab4913c] [formerly c9696dbd3b [formerly 791ab4913c] [formerly 4bd68c8bd0 [formerly 3a87ec22c684ea4abab3a6328cc50682c5315cb9]]]
Former-commit-id: 4bd68c8bd0
Former-commit-id: 299c77f875 [formerly ce7812983a]
Former-commit-id: 374fb4373e
2014-06-25 09:54:38 -05:00
Nate Jensen
775da8ecd4 Merge "Omaha #3311 fix storing UnlinkedContourVectorPacket" into omaha_14.4.1
Former-commit-id: 31804ce5f9 [formerly c59ee0663f] [formerly 31804ce5f9 [formerly c59ee0663f] [formerly adc60e187d [formerly ef2d479ff08fbdbed2e57f72046d8c9fb9baa421]]]
Former-commit-id: adc60e187d
Former-commit-id: 3e954acf16 [formerly 960b44b9fb]
Former-commit-id: 5fbe5c1f2e
2014-06-25 08:45:09 -05:00
Nate Jensen
0938ff0ab7 Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
Former-commit-id: 9c058c1e56 [formerly eacd31aa9b] [formerly 9c058c1e56 [formerly eacd31aa9b] [formerly 425651652d [formerly 45ac7ca480ea49dabff490ccc5b29878f0481b90]]]
Former-commit-id: 425651652d
Former-commit-id: 7d54b214e1 [formerly 3b288534e4]
Former-commit-id: c811adf70b
2014-06-25 08:32:25 -05:00
Ben Steffensmeier
8dbd523f44 Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: 08fe257daa [formerly e244664b7d] [formerly 08fe257daa [formerly e244664b7d] [formerly 5c4f89644c [formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]]]
Former-commit-id: 5c4f89644c
Former-commit-id: d52b2254f5 [formerly 4d22a3c58e]
Former-commit-id: 397f83b2da
2014-06-24 18:16:09 -05:00
Nate Jensen
da51903415 Omaha #3311 fix storing UnlinkedContourVectorPacket
Change-Id: Iab87dbbcc2900ec781c881ca46bf23661fead2eb

Former-commit-id: af62c5950c [formerly e8beab36b6] [formerly af62c5950c [formerly e8beab36b6] [formerly d81fbb83ea [formerly 15a3026ccf38896b0858187c9e4d0e62a58c0336]]]
Former-commit-id: d81fbb83ea
Former-commit-id: db48912fc4 [formerly a4066337ec]
Former-commit-id: a0040bf8cc
2014-06-24 15:53:11 -05:00
Nate Jensen
3ca7ba6f4b Merge "Omaha #3235 Properly clear the coordinates map. Switch to slf4j. Update manifest. Precompile patterns. Add some Javadoc." into omaha_14.4.1
Former-commit-id: ee3d343a64 [formerly 0447d48232] [formerly ee3d343a64 [formerly 0447d48232] [formerly 8dc15b71b5 [formerly 976a1fff0ca0d531b667b18e63e775d1ccd90bbc]]]
Former-commit-id: 8dc15b71b5
Former-commit-id: 733d4740f8 [formerly fd0339464f]
Former-commit-id: 9f4f2add10
2014-06-24 13:20:10 -05:00
Nate Jensen
532d98b1bb Merge "Omaha #3225 Reduce default hibernate connections" into omaha_14.4.1
Former-commit-id: c10194a645 [formerly 5e2f46e892] [formerly c10194a645 [formerly 5e2f46e892] [formerly 1ae399d824 [formerly 762a5f67f31537f481f38246fba7cf074f1c859f]]]
Former-commit-id: 1ae399d824
Former-commit-id: 32573bfa05 [formerly dbf37c2bde]
Former-commit-id: 482553f0e1
2014-06-24 12:37:56 -05:00
Nathan Bowler
f13bc3f200 Omaha #3235 Properly clear the coordinates map. Switch to slf4j. Update manifest. Precompile patterns. Add some Javadoc.
Change-Id: I405b8abc09fcfd5346af1880fe0807bade54af37

Former-commit-id: 3b35b9e54e [formerly 579f14356a] [formerly 3b35b9e54e [formerly 579f14356a] [formerly 229783d3b0 [formerly b8d9c02463b595ac3adef027cd1f2a03ddc95e4e]]]
Former-commit-id: 229783d3b0
Former-commit-id: 2de56a4000 [formerly 99c6d288fd]
Former-commit-id: 91d5e4fcbb
2014-06-24 13:27:57 -04:00
Brian Clements
be85fe241f Omaha #3245 altered utility scripts to account for cave subprocess
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd

Former-commit-id: 27a0d3fb28 [formerly 0f25ac3b5b] [formerly 27a0d3fb28 [formerly 0f25ac3b5b] [formerly 3b71bedd14 [formerly aceeff1e02c896ff27794755eb10fc275718a68c]]]
Former-commit-id: 3b71bedd14
Former-commit-id: 91d1378c31 [formerly be3d47e5e9]
Former-commit-id: f1a30bf16e
2014-06-24 11:15:45 -05:00
Steve Harris
2841134c60 Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 3f2058a1ab [formerly 89606076ec] [formerly 3f2058a1ab [formerly 89606076ec] [formerly ddc6f2092a [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]
Former-commit-id: ddc6f2092a
Former-commit-id: 304d918a7c [formerly 1f033d22e6]
Former-commit-id: 323c240f59
2014-06-24 10:57:56 -05:00
Nate Jensen
faba1a57a1 Merge "Omaha #3133 remove unnecessary register buddies" into omaha_14.4.1
Former-commit-id: b851e4aa94 [formerly b728fac741] [formerly b851e4aa94 [formerly b728fac741] [formerly a09f079064 [formerly e00ce449cd00ded5ba3b84602b03f2cca8c705de]]]
Former-commit-id: a09f079064
Former-commit-id: ea738bb20a [formerly 7ea4049f2b]
Former-commit-id: c8abe9f457
2014-06-23 17:41:45 -05:00
Richard Peter
c30441844d Omaha #3225 Reduce default hibernate connections
Change-Id: Ia32e465b77d1e201ab4f3b1474af610753602b06

Former-commit-id: b609209848 [formerly 2bbb6fd90c] [formerly b609209848 [formerly 2bbb6fd90c] [formerly 47081e7ae3 [formerly fa5b34de9240e02a1ae555d7ccaf65efa2039a9b]]]
Former-commit-id: 47081e7ae3
Former-commit-id: 13c116bae5 [formerly 2502fc9543]
Former-commit-id: 41650b47f4
2014-06-23 17:20:46 -05:00
Nate Jensen
284ddc9583 Merge "Omaha #3133 remove dead plugin" into omaha_14.4.1
Former-commit-id: f714c75bfc [formerly e2826c52c0] [formerly f714c75bfc [formerly e2826c52c0] [formerly 988e2877e1 [formerly c81ee641c5e84cd1c85f31210250ca19d3674d6a]]]
Former-commit-id: 988e2877e1
Former-commit-id: f5b68cc357 [formerly b17e12606e]
Former-commit-id: f48422449c
2014-06-23 14:24:14 -05:00
Nate Jensen
6d3b2d3119 Omaha #3133 remove unnecessary register buddies
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: 6077794cc9 [formerly 9219e1e254] [formerly 6077794cc9 [formerly 9219e1e254] [formerly 53633a6ed4 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]]]
Former-commit-id: 53633a6ed4
Former-commit-id: 1117e5b995 [formerly 5062338b2d]
Former-commit-id: 3239b1956b
2014-06-23 14:13:19 -05:00
Nate Jensen
1d76825805 Omaha #3133 remove dead plugin
Change-Id: I0558c70b2c3c84ba3ed4f4c966bfd8dbd3c0369c

Former-commit-id: 65a42a5689 [formerly 1c2b5a5c4e] [formerly 65a42a5689 [formerly 1c2b5a5c4e] [formerly 6ba15e68b2 [formerly 22bcc1db6482f662d79be82e585912ce8c451d7e]]]
Former-commit-id: 6ba15e68b2
Former-commit-id: 92adc389fc [formerly 14d9616890]
Former-commit-id: f0833bdb17
2014-06-23 14:09:20 -05:00
Nathan Bowler
bb83588aae Omaha #3272 Throw UnrecognizedDataException instead of a NPE when records weren't found. Switch to slf4j. Updated Manifest per Code review and removed trailing space.
Change-Id: I9a512dcd140e02d092897df4f306c1c25ea84377

Former-commit-id: 705a20e39d [formerly d1cde2f291] [formerly 705a20e39d [formerly d1cde2f291] [formerly e2e6724043 [formerly ca5b7fa9d91d085f0684320a4582a974a4356063]]]
Former-commit-id: e2e6724043
Former-commit-id: 062106864b [formerly 61b2e5e6f5]
Former-commit-id: ef7161188a
2014-06-23 15:03:00 -04:00
Dave Hladky
68ad68a6f5 Omaha #3306 Made DPA SSL comms work
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d

Former-commit-id: 67d1468c8c [formerly c6a1a5592c] [formerly 67d1468c8c [formerly c6a1a5592c] [formerly 47cc398e91 [formerly 9061033cd5f8299435b5aa83410e2d99f477d07e]]]
Former-commit-id: 47cc398e91
Former-commit-id: 05360ecd9f [formerly df958f67c5]
Former-commit-id: 3c48f43e37
2014-06-23 13:03:25 -05:00
Nate Jensen
e62629413d Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor

Change-Id: I210ac789322c975cb93584facb3eec417f5097f2
(cherry picked from commit e8d704968a2a87105489ad9cb51cd8aea78401aa [formerly 65eb76ff66] [formerly 4558fe5862 [formerly 845483346f] [formerly 4558fe5862 [formerly 845483346f] [formerly 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]])

Former-commit-id: 333f8317bb [formerly ca27873204] [formerly 333f8317bb [formerly ca27873204] [formerly 65619399a0 [formerly f0ad63d2ccf347e92274701f9890e120b9e70140]]]
Former-commit-id: 65619399a0
Former-commit-id: 3add021413 [formerly f9fce25836]
Former-commit-id: e717dbfeb1
2014-06-23 11:59:26 -05:00
Brad Gonzales
59e3eed9f3 Omaha #3197 moved ncep edex plugins that are only needed by the national centers to a separate rpm.
Removed the ingest modes excludes since they are not needed (the rpm is only installed where it is needed.)

Amend:  Commented out local deploy of National Central Operations EDEX plugins and added a comment.
        Updated comment.

Change-Id: I98cfd70ec3d1917404fe7c4b70b380224ef7d14d

Former-commit-id: 955e37bca7 [formerly 57b49b4868] [formerly 955e37bca7 [formerly 57b49b4868] [formerly a6138bfc17 [formerly 6159b6ec34966762e7dd8ce2f66c24004d11bd95]]]
Former-commit-id: a6138bfc17
Former-commit-id: e9dca26ebf [formerly 1d4903be35]
Former-commit-id: fc0ed548f0
2014-06-23 10:49:35 -05:00
Steve Harris
196f53e609 CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java

Former-commit-id: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 419c5f4aba
Former-commit-id: af06c5a890 [formerly 66d30e59a3]
Former-commit-id: 935542914d
2014-06-20 14:01:55 -04:00
Nate Jensen
1d44a9f517 Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
Former-commit-id: 3971e05c4c [formerly 644fdf50c7] [formerly 3971e05c4c [formerly 644fdf50c7] [formerly caf278ca5c [formerly 741f2710372a713c53e70602395bf7c54fd17cdf]]]
Former-commit-id: caf278ca5c
Former-commit-id: ad63e5b322 [formerly 977a3818f1]
Former-commit-id: d67339b3a9
2014-06-19 13:42:06 -05:00
Brian Clements
cadb1091fb Omaha #3214 added pulse and cloud flash rendering to cave
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce

Former-commit-id: 6345119f9b [formerly 7dd90e6f85] [formerly 6345119f9b [formerly 7dd90e6f85] [formerly a18069809a [formerly 136bb5feca753f83f53d9d1e9381061853edc402]]]
Former-commit-id: a18069809a
Former-commit-id: bd2288e066 [formerly 6d5cbf29a5]
Former-commit-id: 74d4ebf071
2014-06-19 12:50:56 -05:00
Nate Jensen
201d03f319 Merge "Omaha #3226 fixed lightning decrypt validation, added initialization vector" into omaha_14.4.1
Former-commit-id: 472e6ec591 [formerly 557aa84227] [formerly 472e6ec591 [formerly 557aa84227] [formerly 3f5c895d64 [formerly f829356f22771dbcb408da598bfe80b11cbd8de9]]]
Former-commit-id: 3f5c895d64
Former-commit-id: 31e4d9573f [formerly 920ec92736]
Former-commit-id: 6fc60d3edb
2014-06-19 12:14:58 -05:00
Benjamin Phillippe
00e06c15fb Omaha #3255 Removed security plugin from ebxml common plugin to fix build
Former-commit-id: 44c5a9efe8 [formerly df37c55132] [formerly 44c5a9efe8 [formerly df37c55132] [formerly 2c646cf054 [formerly ee89581aeb3d2f640656f37c2e4118a78dee5ca0]]]
Former-commit-id: 2c646cf054
Former-commit-id: 4b480fa686 [formerly f1d3019bf0]
Former-commit-id: a43a3a94c7
2014-06-19 11:03:04 -05:00
Ben Steffensmeier
a111506648 Omaha #2061 Fix recco.
Former-commit-id: 6c3a3cc707 [formerly d953e65ac9] [formerly 6c3a3cc707 [formerly d953e65ac9] [formerly 135452a593 [formerly 16f0ae623de79d7a46573f2ec3833403d6cfd79f]]]
Former-commit-id: 135452a593
Former-commit-id: 961a8402cc [formerly 8613e5b11c]
Former-commit-id: 754c076e94
2014-06-19 10:46:29 -05:00
Brian Clements
2ad045e4c7 Omaha #3226 fixed lightning decrypt validation, added initialization vector
Change-Id: I8c72ef66f3f65a5bb1c3fdf8a2dd391c0cb5c554

Former-commit-id: 9064c50f01 [formerly da6eea7f57] [formerly 9064c50f01 [formerly da6eea7f57] [formerly 36f8207246 [formerly 38a729b7d5b42ac60004473a4c875b5171a93569]]]
Former-commit-id: 36f8207246
Former-commit-id: b5bc5cf85b [formerly bb69af4aef]
Former-commit-id: 18fd0db668
2014-06-19 10:32:05 -05:00
Nate Jensen
65a65a4b25 Merge "Omaha #2061 Remove another reference to IDecoderGettable." into omaha_14.4.1
Former-commit-id: 67d6e9ce3b [formerly 17554ba5c9] [formerly 67d6e9ce3b [formerly 17554ba5c9] [formerly 5d209448da [formerly 5741f0c527a75700bb0f745bbbdaf95929607e9d]]]
Former-commit-id: 5d209448da
Former-commit-id: 44b52b1328 [formerly 413ac17101]
Former-commit-id: f8359db428
2014-06-19 10:12:18 -05:00
Nate Jensen
55aa294dad Issue #3248 ensure that a locking file output streams obtains the lock
before calling the FileOutputStream constructor

Change-Id: I210ac789322c975cb93584facb3eec417f5097f2

Former-commit-id: 4558fe5862 [formerly 845483346f] [formerly 4558fe5862 [formerly 845483346f] [formerly 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]
Former-commit-id: 65eb76ff66
Former-commit-id: 0ea72ce3ed [formerly d1766dc991]
Former-commit-id: 0d1d12158d
2014-06-19 10:02:34 -05:00
Benjamin Phillippe
77f29751bb Omaha #3255 Fix build
Former-commit-id: ebecdaeb36 [formerly 3864eb622e] [formerly ebecdaeb36 [formerly 3864eb622e] [formerly bc9e7f1cb3 [formerly cd985e372ebdd705e1e93c4760fc02f229ddfddd]]]
Former-commit-id: bc9e7f1cb3
Former-commit-id: 22b5114802 [formerly 4bb4c753ba]
Former-commit-id: 953bf4a72f
2014-06-18 14:03:23 -05:00
Nate Jensen
2e803f21b3 Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
Former-commit-id: 0167a89312 [formerly 042b69ba9a] [formerly 0167a89312 [formerly 042b69ba9a] [formerly 9fd4e4a8d9 [formerly b209ae6772fe33ca73a130468c4c314f86ffeba5]]]
Former-commit-id: 9fd4e4a8d9
Former-commit-id: fdebae41d5 [formerly 806b3b1490]
Former-commit-id: 5d1cf81f99
2014-06-18 12:14:45 -05:00
Ben Steffensmeier
3d6aa182fa Omaha #2061 Remove another reference to IDecoderGettable.
Former-commit-id: a55d42d479 [formerly cc72f9d983] [formerly a55d42d479 [formerly cc72f9d983] [formerly 7b356e8ce0 [formerly bdca92f18fa4a7348dd82d9f2348583398dd5c30]]]
Former-commit-id: 7b356e8ce0
Former-commit-id: b01f99e5f2 [formerly 49fc12968f]
Former-commit-id: 95dceeab13
2014-06-18 12:12:01 -05:00
Benjamin Phillippe
a8d99c348d Omaha #3255 Dependency cleanup
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e

Former-commit-id: b41f79658f [formerly 270caaadde] [formerly b41f79658f [formerly 270caaadde] [formerly c2ed8a39d1 [formerly dbac62df979f23402594dc6439b53e7884ea1bd1]]]
Former-commit-id: c2ed8a39d1
Former-commit-id: 38abcb36f5 [formerly 447fb0572a]
Former-commit-id: 5d908f2288
2014-06-18 09:54:40 -05:00
Brian.Dyke
b602d29456 CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: be589ceb9b [formerly 399c06820a] [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: e28febcf27 [formerly 9031f58d02]
Former-commit-id: 3e10995d87
2014-06-18 08:55:49 -04:00
Nate Jensen
11753fc2d3 Omaha #3245 fix GFE starting without a cave data
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7

Former-commit-id: 2ce0e5aee5 [formerly 19aa9dc96e] [formerly 2ce0e5aee5 [formerly 19aa9dc96e] [formerly 8ab7d86a8f [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]]
Former-commit-id: 8ab7d86a8f
Former-commit-id: 5129fee3e6 [formerly 451b265ce6]
Former-commit-id: e59c180fdc
2014-06-17 16:31:20 -05:00
Nate Jensen
84e78f0edf Merge "Omaha #3288 collaboration feed venue config comes from server" into omaha_14.4.1
Former-commit-id: 1df0cf7aff [formerly 812f679b22] [formerly 1df0cf7aff [formerly 812f679b22] [formerly d334c16d1c [formerly 615a1baccb5f263bd29a5e4a6da95f1a8c6e6568]]]
Former-commit-id: d334c16d1c
Former-commit-id: 41e11f430c [formerly 3d2de14300]
Former-commit-id: d083f76eb4
2014-06-17 11:19:03 -05:00
Brian Clements
0dcfac1a44 Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: 8205f7cd56 [formerly b6a2bf0ae4] [formerly 8205f7cd56 [formerly b6a2bf0ae4] [formerly 84e3f967d9 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]]
Former-commit-id: 84e3f967d9
Former-commit-id: 4dc81aabfa [formerly 5436efb886]
Former-commit-id: 616315d830
2014-06-17 09:26:24 -05:00
Nate Jensen
e699c6e40e Omaha #3255 attempt to fix build
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25

Former-commit-id: 985c88d38b [formerly bc48674092] [formerly 985c88d38b [formerly bc48674092] [formerly 3c57231c82 [formerly 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3]]]
Former-commit-id: 3c57231c82
Former-commit-id: f2424f843e [formerly ec83717594]
Former-commit-id: 9a7e51f8b2
2014-06-17 08:42:29 -05:00
Nate Jensen
dde3272ecb Omaha #3255 fix build
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46

Former-commit-id: 4fd29b211a [formerly a8bae916f3] [formerly 4fd29b211a [formerly a8bae916f3] [formerly c65c392d63 [formerly 579cef6ab063bae1df0cfe85411d174dc75b08bd]]]
Former-commit-id: c65c392d63
Former-commit-id: 47907b7dcd [formerly 9cd933cc7b]
Former-commit-id: 22b353ee4e
2014-06-17 07:40:18 -05:00
Steve Harris
a0d17947a9 Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 97843cf58e [formerly 9213369739] [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]
Former-commit-id: e1c8ad2611
Former-commit-id: d7cd0ac02c [formerly 362988b9d7]
Former-commit-id: 8270fd8a9f
2014-06-16 08:19:12 -05:00
Steve Harris
e0be1f390e Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
Former-commit-id: 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 0c3dcb77d5 [formerly 1d2b8aeb7b] [formerly 6c82cc5c3d [formerly 4041e8afbb4bf1c0c416624140d74d27e963f9c8]]]
Former-commit-id: 6c82cc5c3d
Former-commit-id: f2d30c4c62 [formerly 7a8741d8fa]
Former-commit-id: 61112bc258
2014-06-16 07:49:58 -05:00
Brian.Dyke
3da13f3d12 CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 5064d24e26 [formerly 346bf852cd] [formerly 5064d24e26 [formerly 346bf852cd] [formerly 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]
Former-commit-id: 81832d97e5
Former-commit-id: 764b729546 [formerly 4bca0769fb]
Former-commit-id: 766974a05d
2014-06-13 13:21:19 -04:00
Benjamin Phillippe
3845d1e1cb Omaha #3255 Fix Build
Former-commit-id: 67ee2613d7 [formerly a22c77cbfb] [formerly 67ee2613d7 [formerly a22c77cbfb] [formerly 63d104d18d [formerly 6a4e388f9778101d5edd6a1b8ee1d1dc41e422b6]]]
Former-commit-id: 63d104d18d
Former-commit-id: 2b58b5736d [formerly e53e82e5c0]
Former-commit-id: 1c74add53a
2014-06-13 11:17:55 -05:00
Benjamin Phillippe
1514b2d812 Omaha #3255 Fix Build
Former-commit-id: 9a2b844db1 [formerly 0baf11790f] [formerly 9a2b844db1 [formerly 0baf11790f] [formerly 493302f63b [formerly 3182016dc2a85aef65a6f715dc1ed5e60bedb27d]]]
Former-commit-id: 493302f63b
Former-commit-id: 990ba586b4 [formerly e3f37f8ddd]
Former-commit-id: dd9658b657
2014-06-13 10:55:23 -05:00
Ron Anderson
5822560328 Merge "Omaha #3244 Improved GFE purge error handling" into omaha_14.4.1
Former-commit-id: 606920b67d [formerly ee21383c07] [formerly 606920b67d [formerly ee21383c07] [formerly 97c35aacd2 [formerly a4102501a895730d99e03b6fbafe0e7152b198cd]]]
Former-commit-id: 97c35aacd2
Former-commit-id: 857be88042 [formerly 47ec04766d]
Former-commit-id: 795aa07ddc
2014-06-13 10:45:48 -05:00
Richard Peter
decbe09951 Merge "Omaha #3229 added bufr buoy support" into omaha_14.4.1
Former-commit-id: 5c343e736a [formerly 9f2854abe8] [formerly 5c343e736a [formerly 9f2854abe8] [formerly 7a750bc86a [formerly e5d608a8977a62143bf487737e1852cd43776cfd]]]
Former-commit-id: 7a750bc86a
Former-commit-id: fa29bb1f50 [formerly 458ead4d6b]
Former-commit-id: fb9beb4150
2014-06-12 16:50:20 -05:00
Richard Peter
e9d1b4d22f Merge "Omaha #3280 Sister ticket to 3141 for DD repo. Setup SOAP metadata transfers for DPA" into omaha_14.4.1
Former-commit-id: 581b2cc7b7 [formerly b630aa2971] [formerly 581b2cc7b7 [formerly b630aa2971] [formerly 418ad24111 [formerly 5dab0d8232781688132d7df0710a86ea98f93810]]]
Former-commit-id: 418ad24111
Former-commit-id: b645f7423b [formerly 601a4c7ee0]
Former-commit-id: 410f807554
2014-06-12 16:50:09 -05:00
Benjamin Phillippe
68a4e59e08 Omaha #3255 Fixing bundle version to fix build
Former-commit-id: 025597ee18 [formerly 7da0490ede] [formerly 025597ee18 [formerly 7da0490ede] [formerly ed5a7a50f2 [formerly 5201bd2f8cc36c2dd39ac7bab51693affa5e6da1]]]
Former-commit-id: ed5a7a50f2
Former-commit-id: 50d1f6b858 [formerly 13549f05d8]
Former-commit-id: b4126beaaf
2014-06-12 16:39:25 -05:00
Nate Jensen
53fe673750 Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
Former-commit-id: dd10c76b19 [formerly 387b0604cc] [formerly dd10c76b19 [formerly 387b0604cc] [formerly d3417d8e45 [formerly 6e2588a672ceb81a922be9fcdac9a4212376ed5f]]]
Former-commit-id: d3417d8e45
Former-commit-id: 66c3efd784 [formerly 6220def099]
Former-commit-id: 4dc987369a
2014-06-12 14:27:47 -05:00