Nate Jensen
|
c6526b09d8
|
Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
Former-commit-id: 63d524c431 [formerly dd72c8e139] [formerly 116f6840e2] [formerly 63d524c431 [formerly dd72c8e139] [formerly 116f6840e2] [formerly 53f2bf8395 [formerly 116f6840e2 [formerly 155fdc66bca15c242345858152fcf0b129e28a6d]]]]
Former-commit-id: 53f2bf8395
Former-commit-id: 0b9ac4f0b6 [formerly 026a2eaa11] [formerly d2b391bcede8d48901bb6d5c5dd7a23e1187ca17 [formerly 96790c0377]]
Former-commit-id: 7124fa90c17af1ac99e83dfa7ed053710a9b9dc2 [formerly 40b23efda4]
Former-commit-id: de77597192
|
2014-10-01 15:06:03 -05:00 |
|
Shawn.Hooper
|
31e8a0ce78
|
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: 5254c781ef [formerly 22c3fde0ef] [formerly f9428ace1f] [formerly 5254c781ef [formerly 22c3fde0ef] [formerly f9428ace1f] [formerly ae02cbc2da [formerly f9428ace1f [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]]]]
Former-commit-id: ae02cbc2da
Former-commit-id: 822bf53765 [formerly 9ecf241616] [formerly 327e246075a5678f3f87a2f176ae5a099cda1f84 [formerly f2d7288970]]
Former-commit-id: b565ebbaf4b308868a0989d66bf53b79c61b72e6 [formerly e5b5160a51]
Former-commit-id: 5a228f5a5c
|
2014-10-01 15:58:48 -04:00 |
|
Brian.Dyke
|
64b52f6e95
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 64529eea01 [formerly 0be927be2d] [formerly 5ed17c0e24] [formerly 64529eea01 [formerly 0be927be2d] [formerly 5ed17c0e24] [formerly a4bfbea3c2 [formerly 5ed17c0e24 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]]]
Former-commit-id: a4bfbea3c2
Former-commit-id: f180f63136 [formerly 4df4eb9c2b] [formerly a57615d594bf6386e1ca03920b1004483f28976a [formerly 914da168c8]]
Former-commit-id: af85c1c0498d395eb57281594d2bd53c3aeec77f [formerly 8184df119d]
Former-commit-id: ea401b327b
|
2014-10-01 15:36:06 -04:00 |
|
Andrew Benak
|
7f84fac2e6
|
Omaha #3638 plugin xml for *export.point is now properly included
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909
Former-commit-id: 68f934e63c [formerly 8ae0af5c6f] [formerly 659f4869bc] [formerly 68f934e63c [formerly 8ae0af5c6f] [formerly 659f4869bc] [formerly 7c7510d471 [formerly 659f4869bc [formerly 8c3cb6032fe79f68f24eb5dee7f3a820aa475257]]]]
Former-commit-id: 7c7510d471
Former-commit-id: 0b750823dd [formerly c711fa910f] [formerly 046414031b27e91c03c30ed846bc0f672ece6786 [formerly f2cfa613fc]]
Former-commit-id: 32bcc7aec3bfec34b9c10f79ae07799fea8b23b6 [formerly 3e4656a60a]
Former-commit-id: 04c5093eee
|
2014-10-01 14:30:28 -05:00 |
|
Nate Jensen
|
b712c8253c
|
Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f
Former-commit-id: 4dd895a3c5 [formerly 74883424ca] [formerly 319ea78480] [formerly 4dd895a3c5 [formerly 74883424ca] [formerly 319ea78480] [formerly 87d1286a0c [formerly 319ea78480 [formerly 3f63e3887f21b1cb5eb1ea1bb5225f492e161021]]]]
Former-commit-id: 87d1286a0c
Former-commit-id: 11fda5a021 [formerly 3e9cb23496] [formerly f2d72c6cb377ab601a5112dcea06cb19760c30ae [formerly b658187cdb]]
Former-commit-id: fa9bc4bb70b11c8a6ad1dd3e97cdcb2ef26df4fc [formerly 14da412d3d]
Former-commit-id: 91e97ad173
|
2014-10-01 14:22:22 -05:00 |
|
Nathan Bowler
|
8e9c981ab5
|
Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d
Former-commit-id: 1e4b1e36b2 [formerly 2d5d90c055] [formerly 368b6341b0] [formerly 1e4b1e36b2 [formerly 2d5d90c055] [formerly 368b6341b0] [formerly e4779f2e66 [formerly 368b6341b0 [formerly d67d1e941b89357e7d86fa0f810a82f9e01f4c27]]]]
Former-commit-id: e4779f2e66
Former-commit-id: 79af766519 [formerly b52c1bcafd] [formerly b4a68483c3c014922902f65e575fb102c53dbab2 [formerly a72fec1b38]]
Former-commit-id: 6b8908ca678fa42ab5f5a2ce8f4008e2b1c32ca6 [formerly ae5bde3c3d]
Former-commit-id: 8f18ed535e
|
2014-10-01 14:57:16 -04:00 |
|
Nate Jensen
|
c180b9d833
|
Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: 16907b03de [formerly f7eac5f1db] [formerly a5e4190b35] [formerly 16907b03de [formerly f7eac5f1db] [formerly a5e4190b35] [formerly 3146dd083c [formerly a5e4190b35 [formerly 227ab9d68d59a9899025055a51b278bbcd9123f5]]]]
Former-commit-id: 3146dd083c
Former-commit-id: 18945e612e [formerly e65065461c] [formerly a226aa671f6062c53c35774f2fc096ac613d3381 [formerly 728328f400]]
Former-commit-id: 88853bbd1a9a3555b9971c6c02d797461b1e27d8 [formerly d148780c7c]
Former-commit-id: 647dc473bf
|
2014-10-01 11:55:38 -05:00 |
|
Nate Jensen
|
56dd0566f7
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: 1a4b7cc454 [formerly fce7d5899f] [formerly 482af416b3] [formerly 1a4b7cc454 [formerly fce7d5899f] [formerly 482af416b3] [formerly f2633a56c0 [formerly 482af416b3 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]]]
Former-commit-id: f2633a56c0
Former-commit-id: f0362a03d4 [formerly f7a075907c] [formerly 2a2d868056e74cb4e29f291cba399ffd3f99c3fc [formerly 18acca9ef8]]
Former-commit-id: bc2c3efd4b7820055c54a4ed22e533c68dff148b [formerly b5998c975b]
Former-commit-id: d4b7693f81
|
2014-10-01 11:53:40 -05:00 |
|
Nate Jensen
|
3e77a9588e
|
Merge "Omaha #3596 Adding original, unaltered satellite scripts." into omaha_14.4.1
Former-commit-id: 8eb01b18bc [formerly 7a1508ac90] [formerly 7c5b340168] [formerly 8eb01b18bc [formerly 7a1508ac90] [formerly 7c5b340168] [formerly 629ab024dc [formerly 7c5b340168 [formerly e0f436a866f2a736b793c3fb2b4fbe770208c6c0]]]]
Former-commit-id: 629ab024dc
Former-commit-id: 298567b6cb [formerly d41f587a8d] [formerly 844c8e6d8d4a7e4559503416d825c98a3e63af7f [formerly 8b4bbbaea0]]
Former-commit-id: e99090224ba874a691b7ba5ebbab15c4224793f5 [formerly 0f7912967c]
Former-commit-id: e4fb2572c2
|
2014-10-01 11:46:51 -05:00 |
|
Lee Venable
|
a5349c7415
|
Merge "Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing." into omaha_14.4.1
Former-commit-id: 75a98f8e20 [formerly 3c26abe355] [formerly d12c4b998e] [formerly 75a98f8e20 [formerly 3c26abe355] [formerly d12c4b998e] [formerly aaf3198443 [formerly d12c4b998e [formerly 7807597daa7cbeb9d988eaadc3539eff876e867a]]]]
Former-commit-id: aaf3198443
Former-commit-id: 7ce44b2b6a [formerly 4390c9cb27] [formerly ef54512cbe0e05ec44029779598cd3a4bc873fef [formerly 5199641313]]
Former-commit-id: 492140876c70c308f8fc4a3f7f3f22d460fdd2aa [formerly 0502e5d2bf]
Former-commit-id: aabc441f2b
|
2014-10-01 11:45:05 -05:00 |
|
Nathan Bowler
|
689b635360
|
Omaha #3596 Adding original, unaltered satellite scripts.
Change-Id: I6441898e986df707376ee61d5952641dc7e9f266
Former-commit-id: 896e7fa52c [formerly 8f39df9850] [formerly ce2dac6af9] [formerly 896e7fa52c [formerly 8f39df9850] [formerly ce2dac6af9] [formerly 30a565a88b [formerly ce2dac6af9 [formerly f52d19b153d443fa643af1d6b763160f0937c603]]]]
Former-commit-id: 30a565a88b
Former-commit-id: 6dcb7011ce [formerly 89a119ad6f] [formerly 22989aa6eeeb58920a0c429c33fa94cbd2fbc0eb [formerly 92d069371c]]
Former-commit-id: a1b1ef13bd306e49d2721bb9ad669d903b53bc02 [formerly c2fd4fa310]
Former-commit-id: 91e5e487ee
|
2014-10-01 12:31:57 -04:00 |
|
Robert Blum
|
473b13d9d3
|
Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: 9e885cd270 [formerly 6a775aa2be] [formerly a1d23e4198] [formerly 9e885cd270 [formerly 6a775aa2be] [formerly a1d23e4198] [formerly d5994a8a6b [formerly a1d23e4198 [formerly 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b]]]]
Former-commit-id: d5994a8a6b
Former-commit-id: fb258e074b [formerly 4bb7ed8b2f] [formerly 2b50918a864a6561f6ca63465c557e0f0f669c60 [formerly 6c1676e743]]
Former-commit-id: afa8ac249a3defa7bcb35324e0be32ecf763713e [formerly 100e24245f]
Former-commit-id: 2d7c61f0a8
|
2014-10-01 10:22:25 -05:00 |
|
Nate Jensen
|
0e57a71184
|
Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 8c3c592190 [formerly 131f5ec9f7] [formerly 799ba1babf] [formerly 8c3c592190 [formerly 131f5ec9f7] [formerly 799ba1babf] [formerly 41427a57bb [formerly 799ba1babf [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]]
Former-commit-id: 41427a57bb
Former-commit-id: 0b0b9900fe [formerly e6100e8e7f] [formerly 8b3857e4c194aa2076e394aa0028ebf5c0ba2ab8 [formerly 78054658a3]]
Former-commit-id: eac63f07f79044de4bb76979473040b0e13d3b46 [formerly 86271d7dc9]
Former-commit-id: 18f7a6f1c0
|
2014-10-01 09:46:56 -05:00 |
|
Ron Anderson
|
df1ed325c5
|
Merge "Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm" into omaha_14.4.1
Former-commit-id: db992519c5 [formerly 83e7ceb415] [formerly 0750ccc067] [formerly db992519c5 [formerly 83e7ceb415] [formerly 0750ccc067] [formerly eb73f57321 [formerly 0750ccc067 [formerly 3e2a6efb67a9dda839bafe60bffc1d590ffe236c]]]]
Former-commit-id: eb73f57321
Former-commit-id: cf160047e3 [formerly 8df115bd06] [formerly 103c14a4b9eb0b04257367911c7209355a082a07 [formerly 149f4a4703]]
Former-commit-id: 85eff0892071ddb41a1d872cabfd68c5cb68d7b5 [formerly 68dfc93fe1]
Former-commit-id: 0b9028216f
|
2014-10-01 09:20:11 -05:00 |
|
Ron Anderson
|
92071a03c6
|
Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8
Former-commit-id: f97651285a [formerly 35657166ea] [formerly ec1530c5e8] [formerly f97651285a [formerly 35657166ea] [formerly ec1530c5e8] [formerly f44ac32b1e [formerly ec1530c5e8 [formerly 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59]]]]
Former-commit-id: f44ac32b1e
Former-commit-id: 88aae9d195 [formerly 841e270b6f] [formerly 8544b7d76afb53dadb3f5d65587b33d13b6e8ede [formerly b59e41705c]]
Former-commit-id: a736762ec6fda2c02a849ad08fec20a2cb13b150 [formerly 50acd7dc68]
Former-commit-id: 2d64e79be9
|
2014-09-30 14:09:31 -05:00 |
|
Chris Cody
|
239db8b8c8
|
Omaha #3365 Realign AWIPS2_baseline tests
Change-Id: I648d8bb6a62bb48c368e975aa65f45f1bcc7641f
Former-commit-id: c1468c97fb [formerly 9397356128] [formerly 98b767f573] [formerly c1468c97fb [formerly 9397356128] [formerly 98b767f573] [formerly 1f9c825de5 [formerly 98b767f573 [formerly 947bc37728f62ff4375f23b9eb8bc7142e220a90]]]]
Former-commit-id: 1f9c825de5
Former-commit-id: 31fbd06912 [formerly c6b1ff4e90] [formerly 62a7ea8c47bc0ed51d1ffff50aaf9436e4370625 [formerly 0d677d1aca]]
Former-commit-id: dca085578a33d714dae7b307df993171ea3bf283 [formerly 503a27310c]
Former-commit-id: d480271aeb
|
2014-09-30 12:53:20 -05:00 |
|
dmsys
|
6b2eccce36
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 0cb584f44e [formerly 07f84c6b26] [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4 [formerly b884e5e32d]]
Former-commit-id: 8f7a656cd223aa4bbbad7217939da98d6e8672ab [formerly e00ea2d8cd]
Former-commit-id: 71d6e48473
|
2014-09-30 13:45:54 -04:00 |
|
Nate Jensen
|
c542e399b8
|
Merge "Omaha #3629 Replacing matchElement()" into omaha_14.4.1
Former-commit-id: 20607f9d3f [formerly 5e97eb494e] [formerly 4569b23701] [formerly 20607f9d3f [formerly 5e97eb494e] [formerly 4569b23701] [formerly 3b0296cc99 [formerly 4569b23701 [formerly 5861d0f99dd2f89a37f72736e139233ea3337605]]]]
Former-commit-id: 3b0296cc99
Former-commit-id: 01a2917fa4 [formerly 8ceb856440] [formerly c91353142e7bf11c4897efe8382589a87814b257 [formerly fa29bf050e]]
Former-commit-id: 1bb587be0f9aa235fb55e6d5748a90dfd8945b3b [formerly 0eb6bd03d0]
Former-commit-id: a0cdaf33fe
|
2014-09-30 11:58:02 -05:00 |
|
Richard Peter
|
56992359cb
|
Merge "Omaha #3622 Fix null pointer in ServiceBackupLockManager" into omaha_14.4.1
Former-commit-id: 8e6a3af18c [formerly b81e0f4549] [formerly 9c0692f861] [formerly 8e6a3af18c [formerly b81e0f4549] [formerly 9c0692f861] [formerly 02fb12501e [formerly 9c0692f861 [formerly cac5f4e1c1f25ea1c5b9083410c1eeaf6b4af0f4]]]]
Former-commit-id: 02fb12501e
Former-commit-id: 09f22628e7 [formerly a33c36417b] [formerly b506c340003f665c31bceb5d0d8635dc508891b0 [formerly 4e05ef95b6]]
Former-commit-id: 061db7299a8ad9ad52f5905f51fb665c135e05ef [formerly 0e13f93da4]
Former-commit-id: 27df0ccc12
|
2014-09-30 11:45:25 -05:00 |
|
Mark Peters
|
dace392b52
|
Omaha #3629 Replacing matchElement()
Change-Id: Ie8ae1347a1aeb99532e42c7a3af7d200cf4c3a1e
Former-commit-id: 17f328433b [formerly 6a0703ad98] [formerly 6d59eb314d] [formerly 17f328433b [formerly 6a0703ad98] [formerly 6d59eb314d] [formerly 776420f2d9 [formerly 6d59eb314d [formerly 6f898cc3d7f30651846847c5645ec26ac448ec83]]]]
Former-commit-id: 776420f2d9
Former-commit-id: 2aca950d56 [formerly 406c3795ee] [formerly 481f92370c660fe23d20cbaa438c290c5ce59ec8 [formerly d3c3ee2a61]]
Former-commit-id: 933ace9809c28513ea230a66de34251731def17e [formerly 6c9aa42dba]
Former-commit-id: bc20d29233
|
2014-09-30 11:39:40 -05:00 |
|
Ron Anderson
|
22a9dee901
|
Omaha #3622 Fix null pointer in ServiceBackupLockManager
Change-Id: Idd29ac0b5330d9f2167c8fdc4acfd6e1ed961a99
Former-commit-id: edc1a9664a [formerly 83e46bb3d6] [formerly 437f2fdc47] [formerly edc1a9664a [formerly 83e46bb3d6] [formerly 437f2fdc47] [formerly 1c6fa09d4f [formerly 437f2fdc47 [formerly e6ae629d1667943ae7bf25598f32e2b479e748b1]]]]
Former-commit-id: 1c6fa09d4f
Former-commit-id: c7af0da2fb [formerly ed2caa33af] [formerly 7cbceaa2c98ab56f6535e4bc3681f01d67b2f983 [formerly 80ebbc73ef]]
Former-commit-id: 0e41edb3dd5c5453c6dcd203a98b061f9c836d08 [formerly b76b428114]
Former-commit-id: 0996164214
|
2014-09-30 11:32:30 -05:00 |
|
Nate Jensen
|
53b63710b8
|
Omaha #3671 turn on LZF compression of satellite hdf5 data
Change-Id: I6709fa5a262a0119d81d2b22745c2d4f67d649aa
Former-commit-id: d7f31df973 [formerly 9158ce06e2] [formerly 7e3b5f973b] [formerly d7f31df973 [formerly 9158ce06e2] [formerly 7e3b5f973b] [formerly 6a1ee6a5d0 [formerly 7e3b5f973b [formerly 2f79d47e4ed5aaf316d54a442123b9906fa8d2b9]]]]
Former-commit-id: 6a1ee6a5d0
Former-commit-id: 39e8d45ecd [formerly 40b7f9b574] [formerly fa805071411dd756b77cf19537665334a4a5b4a9 [formerly e288d38707]]
Former-commit-id: ca61149f86f3a120015675aa65133bb12ecea1de [formerly 534653c297]
Former-commit-id: 23204510d8
|
2014-09-30 10:58:21 -05:00 |
|
Ron Anderson
|
5b8ca52593
|
Omaha #3300 Merge #3661 and #3670 changes into 14.4.1 from 14.3.1_backports
Change-Id: I2be578791e61964c3e2fd6b2d810ef492056b69c
Former-commit-id: b2445d66c0 [formerly b948adc7d3] [formerly ec910127b6] [formerly b2445d66c0 [formerly b948adc7d3] [formerly ec910127b6] [formerly 3e3a2c2f70 [formerly ec910127b6 [formerly 525cffa1ec2a999d97a5fc3ca2153c8241c534be]]]]
Former-commit-id: 3e3a2c2f70
Former-commit-id: 5442c3b328 [formerly e9ba2ceb6b] [formerly 2cab616e561377a213f84b4bfd16e8ff395493f1 [formerly be738e8f4b]]
Former-commit-id: c53e2eb9ca8cda16dc5681a27d05f25ecfa2961a [formerly 8136efe384]
Former-commit-id: c9dbc2a8bc
|
2014-09-30 08:44:01 -05:00 |
|
Nate Jensen
|
7c60d22c70
|
Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 1b08756d5c [formerly 6d382220a3] [formerly 057e5eda1a] [formerly 1b08756d5c [formerly 6d382220a3] [formerly 057e5eda1a] [formerly 510d26050d [formerly 057e5eda1a [formerly 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083]]]]
Former-commit-id: 510d26050d
Former-commit-id: 9a5d59439a [formerly aa526b5dfd] [formerly 42e79970c3fdd6d0b0e8fb734c22677388f48746 [formerly a79d34801b]]
Former-commit-id: 8155626ac26143b96fcd6110ab76d9d781526da8 [formerly eaaacc67c6]
Former-commit-id: 3f983b9fa4
|
2014-09-29 17:50:34 -05:00 |
|
Nate Jensen
|
fd52d638a2
|
Omaha #3663 move features that contain primarily ncep plugins to ncep
folder
Change-Id: I5d59e1c0618fa26c1f8b3e6f340f255119a72a40
Former-commit-id: 3201dc473b [formerly 867a0e09ae] [formerly 1b51c48468] [formerly 3201dc473b [formerly 867a0e09ae] [formerly 1b51c48468] [formerly 8c0a087bf0 [formerly 1b51c48468 [formerly f785d88ee1c388b564921c3ecd8c931329639f04]]]]
Former-commit-id: 8c0a087bf0
Former-commit-id: 972b559eb5 [formerly 12ede9423a] [formerly 940599fb59d7ae7918d915486530788e8a8bbaaa [formerly d4793b5521]]
Former-commit-id: 53c4dced67d8ecab6955b08a7428a8178d45636d [formerly 900768960a]
Former-commit-id: 9875b5a58f
|
2014-09-29 17:24:34 -05:00 |
|
Ron Anderson
|
93fc56a9ca
|
Merge "Omaha #2975 optimize lookup of edit areas and gfe configs" into omaha_14.4.1
Former-commit-id: ed2b4e9bfb [formerly 8116a665a8] [formerly a9827b0545] [formerly ed2b4e9bfb [formerly 8116a665a8] [formerly a9827b0545] [formerly 245804a21a [formerly a9827b0545 [formerly 918dcb1b91fb45b84a82df42b7fe2d3fc2f86fa0]]]]
Former-commit-id: 245804a21a
Former-commit-id: 0d452f7961 [formerly d1ef4c7284] [formerly f644ea06f6a3769ab76168bd14a4459675cbc7ce [formerly 4ebb5b59df]]
Former-commit-id: 91b7bc7d29714ee5cd86f5d44c97d204d80245f3 [formerly 923aca6f7f]
Former-commit-id: 0e924a980f
|
2014-09-29 16:10:37 -05:00 |
|
Steve Harris
|
10752cbc42
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: e9774e46ea [formerly 842abaad49] [formerly 1f609e71c1d55fbd64663d85caf8d8fbf61ab92c [formerly 6330a62e85]]
Former-commit-id: df06a15df0e12cfd77916f5f59e1b95c241b34d2 [formerly 30f0d27dfb]
Former-commit-id: 4c4380580f
|
2014-09-29 12:58:56 -05:00 |
|
Nate Jensen
|
60aa88c327
|
Omaha #2975 optimize lookup of edit areas and gfe configs
Change-Id: Ic89c84e79a27476ebb28573d49f60429424d4c37
Former-commit-id: df979f3301 [formerly c75ff5530d] [formerly 1b70e053a1] [formerly df979f3301 [formerly c75ff5530d] [formerly 1b70e053a1] [formerly c3648d1989 [formerly 1b70e053a1 [formerly 860bcc70144d9a8478aef3cc9ebfe84e98b6c4a7]]]]
Former-commit-id: c3648d1989
Former-commit-id: 7e5e675179 [formerly 32bd82e744] [formerly 50c5e64cb59fdce443930c37b4f42e10da23e3c7 [formerly 0b2e919eae]]
Former-commit-id: f97432e5b76f62421fc4c2e904190b6f630b8c6b [formerly 98ff4d7cc5]
Former-commit-id: db4d16b3a0
|
2014-09-29 12:29:25 -05:00 |
|
Ben Steffensmeier
|
51d14fe247
|
Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: ed401f7250 [formerly b333960362] [formerly c573db2918] [formerly ed401f7250 [formerly b333960362] [formerly c573db2918] [formerly 95b096192b [formerly c573db2918 [formerly e93157375f90c6cc2038db9a78346592e4d46b0e]]]]
Former-commit-id: 95b096192b
Former-commit-id: 33ac3fa012 [formerly 923ead3167] [formerly b5b30fb554ce5a1662f9e0a71423cb921b5a5de4 [formerly 3c55b8166c]]
Former-commit-id: 44ec49710bc32dea4a3a15c9fafa5ec79198f50b [formerly dc7966cdec]
Former-commit-id: 41b2311008
|
2014-09-29 11:20:33 -05:00 |
|
Steve Harris
|
51dc2a3cc0
|
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: 73f0f5b364 [formerly fdfe16985d] [formerly 46da726675] [formerly 73f0f5b364 [formerly fdfe16985d] [formerly 46da726675] [formerly c03bc273da [formerly 46da726675 [formerly 49ad8e0e780443a0439227694a92ec8ab683b125]]]]
Former-commit-id: c03bc273da
Former-commit-id: 5258758f00 [formerly dd92661aba] [formerly e9d263d5e3d4ae86f04bc281e88f66ef7053628d [formerly 7c37aaa92e]]
Former-commit-id: 349ffbd052c9aafa425b36741904040d25416ad7 [formerly af7f1cf232]
Former-commit-id: d19a7675a9
|
2014-09-29 11:14:32 -05:00 |
|
Brian.Dyke
|
ade65cb1ab
|
Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: b89a2459ee [formerly 9661a1d7b1] [formerly 0c1b83b644] [formerly b89a2459ee [formerly 9661a1d7b1] [formerly 0c1b83b644] [formerly 0e0255ce5b [formerly 0c1b83b644 [formerly 6e79993fbf34ebd832ca07356cbac003efaf6405]]]]
Former-commit-id: 0e0255ce5b
Former-commit-id: 1cc416b17b [formerly 3b3e81d4a2] [formerly e1d7c0bc2a75cdb11de7602ec3d70def4a84dc95 [formerly 77e8985bdd]]
Former-commit-id: b95dc8cf8203e0355bb74fbd1477f87572b22689 [formerly 7bcee86aa2]
Former-commit-id: 5a3c7d3510
|
2014-09-29 11:55:16 -04:00 |
|
Ben Steffensmeier
|
f91216c747
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: a0d9cbede4 [formerly 6090625040] [formerly f92d021e96] [formerly a0d9cbede4 [formerly 6090625040] [formerly f92d021e96] [formerly 5b10ac2f36 [formerly f92d021e96 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]]]
Former-commit-id: 5b10ac2f36
Former-commit-id: 7af0ea9a67 [formerly 0724aa4e71] [formerly c2fe7f41a12299fdb484361788b79338e9ad2fb8 [formerly 107ccbf332]]
Former-commit-id: dc765b86dda41ab7f5eb30a55c9560bd57a0313f [formerly fc49d0bd55]
Former-commit-id: a69ec7c7af
|
2014-09-29 10:49:14 -05:00 |
|
Sean.Webb
|
e51a34bbf4
|
Merge "ASM #16720 - Added pushd and cd prior to patch extraction" into asm_14.2.4
Former-commit-id: 691367ac10 [formerly c679d1cc46] [formerly fbd892909b] [formerly 691367ac10 [formerly c679d1cc46] [formerly fbd892909b] [formerly 2d531d73fd [formerly fbd892909b [formerly c62a7e14e82c7274ed1868d73446aab895901546]]]]
Former-commit-id: 2d531d73fd
Former-commit-id: 1a43a17087 [formerly 8a2e8285c1] [formerly e92970318142c2e4401b4da4a250bd311ac98d15 [formerly 1a70eea0e0]]
Former-commit-id: ae8fbb7e955bc2332a71a148a9680706d9258e93 [formerly fac3e1fee0]
Former-commit-id: 14883994b6
|
2014-09-29 10:35:10 -05:00 |
|
Brian.Dyke
|
ab1f21c096
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: fac7a6aaa1 [formerly fce029653d] [formerly 0a497fc015] [formerly fac7a6aaa1 [formerly fce029653d] [formerly 0a497fc015] [formerly 46af1d0857 [formerly 0a497fc015 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]]]
Former-commit-id: 46af1d0857
Former-commit-id: ad3338e07f [formerly 886c1b7e3d] [formerly 9fc151f40941f9cab99d6eb050662408c5746324 [formerly 85676ff532]]
Former-commit-id: 0acefdbae8bda17deeb120ade9ca40a2e782cfaa [formerly 4d5f7db303]
Former-commit-id: 23450210b1
|
2014-09-29 11:20:57 -04:00 |
|
Sean.Webb
|
9d0e79bb1d
|
ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225
Former-commit-id: d3df1699db [formerly 224cddfe9b] [formerly 02e187a609] [formerly d3df1699db [formerly 224cddfe9b] [formerly 02e187a609] [formerly 600b75bd9f [formerly 02e187a609 [formerly c2af0284e9146dff8431ecd4f6ce88437ea83d9f]]]]
Former-commit-id: 600b75bd9f
Former-commit-id: 9c5957ef9f [formerly 1538817a38] [formerly f41e6444ab2ff3f5348a13f52e0f8be3af16c39c [formerly 293f860e93]]
Former-commit-id: e39674a87d4139148f14864f620545df8022ec71 [formerly f80a90d69f]
Former-commit-id: e45ec5cac9
|
2014-09-29 10:24:04 -04:00 |
|
Sean.Webb
|
af55511cf1
|
Merge "ASM #16720 - Removed extraneous popd which was changing dir when not needed" into asm_14.2.4
Former-commit-id: 801886c053 [formerly 9b25583e3a] [formerly dc3ad9863d] [formerly 801886c053 [formerly 9b25583e3a] [formerly dc3ad9863d] [formerly 6e1f0363c8 [formerly dc3ad9863d [formerly 8f44d89f1d11cd587106f7eda3edec93802f5cf3]]]]
Former-commit-id: 6e1f0363c8
Former-commit-id: 14b79aea22 [formerly 7eebdb1a1f] [formerly 91443454a619ad861f2b04ace401454530344121 [formerly 323adcd30c]]
Former-commit-id: 52234a660887c55810ea7468ff70e8a1a509710b [formerly 2cdd576f9e]
Former-commit-id: 104f95697e
|
2014-09-29 08:31:44 -05:00 |
|
Sean.Webb
|
89aa38db4a
|
ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683
Former-commit-id: 86382f5396 [formerly 6840d55343] [formerly 0738a41cbf] [formerly 86382f5396 [formerly 6840d55343] [formerly 0738a41cbf] [formerly 78f83fa594 [formerly 0738a41cbf [formerly 4faea9724adf17d0bec7f013bafc7f8dd2f7499e]]]]
Former-commit-id: 78f83fa594
Former-commit-id: 88580b8666 [formerly d70bc9fd9f] [formerly 7d13704772f862b4d8ca1264bf50de7ba0cbcd2d [formerly 197908686e]]
Former-commit-id: 079aaf5290e12bd890cc6e5d9fb1b9599c781840 [formerly c69f833921]
Former-commit-id: b7bae10212
|
2014-09-29 08:21:00 -04:00 |
|
Brian.Dyke
|
61e0794afa
|
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 008769daef [formerly 8e459ec500] [formerly 550ffba7b0] [formerly 008769daef [formerly 8e459ec500] [formerly 550ffba7b0] [formerly 142432ba5e [formerly 550ffba7b0 [formerly 93ddf672c137c7221e9595e8b5c1b279084cb451]]]]
Former-commit-id: 142432ba5e
Former-commit-id: 2933a8feb6 [formerly 5da730103f] [formerly c6128f8c799ccef707e6c3fff938b928bef40d43 [formerly 63e3d61ff5]]
Former-commit-id: c291b04ca8130a58761f4f6824329e24c5bdae85 [formerly de0dc96df8]
Former-commit-id: ab28cb0583
|
2014-09-26 16:14:06 -04:00 |
|
David Friedman
|
ed3bed65d4
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: ea894ca5fc [formerly 86100b6ca8] [formerly 6791e8d885] [formerly ea894ca5fc [formerly 86100b6ca8] [formerly 6791e8d885] [formerly 05707d0f20 [formerly 6791e8d885 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]]]]
Former-commit-id: 05707d0f20
Former-commit-id: 39608cef87 [formerly 78f7f0fc88] [formerly e4217632693bc1a8536646a8fa63f65c055822c6 [formerly b3bd3a9d7f]]
Former-commit-id: c1bf57bee47fd5a37681a17e8a8301df05b879d9 [formerly 1204c0d666]
Former-commit-id: cd643396d6
|
2014-09-26 20:05:46 +00:00 |
|
Mark Peters
|
6d7206c7aa
|
Omaha #3629 Move datatype specific code from edex.decodertools to the specific datatype edex plugins
Change-Id: I6b66103ef55107df78fdbb047dfb8c743deaf2d4
Former-commit-id: f920c9ab1f [formerly 5fb76a1532] [formerly 549cf2a2b1] [formerly f920c9ab1f [formerly 5fb76a1532] [formerly 549cf2a2b1] [formerly 0c657c2a49 [formerly 549cf2a2b1 [formerly e196f02cf7533498280b252e9c345f9b3c4a3629]]]]
Former-commit-id: 0c657c2a49
Former-commit-id: 05aafcc223 [formerly 34d60c7e4a] [formerly 2b5dcf7ff24a7cd99a58afa157245f68a9dea96a [formerly 8084133432]]
Former-commit-id: 61655c553247768ce8c90f5cb884e6302abc16e5 [formerly bd117c0ebf]
Former-commit-id: da12370e57
|
2014-09-26 14:50:03 -05:00 |
|
Brian.Dyke
|
81c73398bd
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: cf09c46335 [formerly 858cfa1078] [formerly 41921f7db2] [formerly cf09c46335 [formerly 858cfa1078] [formerly 41921f7db2] [formerly 814b9a2869 [formerly 41921f7db2 [formerly 60756ddb841a0daa347493047b76d2fcb93f7f4a]]]]
Former-commit-id: 814b9a2869
Former-commit-id: e4ea2693fd [formerly ee0c04ae93] [formerly 4c6b04163013250a17875ac3df684e189a90b847 [formerly a2b18e4bee]]
Former-commit-id: 7f93c819b12c5c538f65f20f09a3c964e5acf685 [formerly 7f406eb3b6]
Former-commit-id: ef96354985
|
2014-09-26 15:15:57 -04:00 |
|
Brian.Dyke
|
fe76a3b906
|
Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: bef2315cae [formerly 2495e16947] [formerly 989a9c5835] [formerly bef2315cae [formerly 2495e16947] [formerly 989a9c5835] [formerly f1755fb7ae [formerly 989a9c5835 [formerly 4ff65f7c83042dd40b5c2bf37ee54d12315c5714]]]]
Former-commit-id: f1755fb7ae
Former-commit-id: 7ab092b63b [formerly fecebad9b6] [formerly 5868c05818b1b78d884526cd0699e5a085fb6507 [formerly 8c2c886675]]
Former-commit-id: 0f16753f3100ca5a5d7c71e3245891fc79d99c1d [formerly 081fffae8e]
Former-commit-id: 7791acd7d4
|
2014-09-26 14:20:34 -04:00 |
|
Brian.Dyke
|
d81096c5ca
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 698273b551 [formerly 396f9755dc] [formerly 1ac61fb612] [formerly 698273b551 [formerly 396f9755dc] [formerly 1ac61fb612] [formerly f26fe97ec4 [formerly 1ac61fb612 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]]]
Former-commit-id: f26fe97ec4
Former-commit-id: 19bd990683 [formerly f6af0dd0df] [formerly 2c9cf5cc04ae60ed33371ee6fa605e762929a4a0 [formerly 33525968e3]]
Former-commit-id: 2fb1e2bc67ea5f2cb68c1b79a31dc29d8cfb3cb8 [formerly 4359e8dc47]
Former-commit-id: b481c3f064
|
2014-09-26 14:19:03 -04:00 |
|
Brian.Dyke
|
d07c8dfefb
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 67a9c88d27 [formerly f520ff97b6] [formerly 8245370186] [formerly 67a9c88d27 [formerly f520ff97b6] [formerly 8245370186] [formerly a4f68caac6 [formerly 8245370186 [formerly 6ed90023551e25216c10d05f2568593992326900]]]]
Former-commit-id: a4f68caac6
Former-commit-id: 062dbe5bb9 [formerly 328edcaebf] [formerly 781fbb9e9a10fef8b099386a964b7a41bc80831b [formerly 34a073a848]]
Former-commit-id: 6a13079a74ca3b525400419cdecb2b0ed33c775b [formerly 554cb1a84d]
Former-commit-id: ccbb922254
|
2014-09-26 13:02:49 -04:00 |
|
Richard Peter
|
30bef5dffd
|
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications. Check in the rest of the changes I missed the first time." into omaha_14.4.1
Former-commit-id: 472d8b2f38 [formerly 5b023b628e] [formerly 941305b33d] [formerly 472d8b2f38 [formerly 5b023b628e] [formerly 941305b33d] [formerly 1656522716 [formerly 941305b33d [formerly 3daaa4e6b33bd284a088f290b40b7f63b4c27a43]]]]
Former-commit-id: 1656522716
Former-commit-id: a68d4de1c2 [formerly 6f8183557e] [formerly 410744ab11dab9f62ef2fd6ecc7683b003e6b349 [formerly 844717fb57]]
Former-commit-id: 7fbd38c494389aab083ffc5537815421baa248b8 [formerly 9af9fbed55]
Former-commit-id: 32470b19e5
|
2014-09-26 11:44:41 -05:00 |
|
Ron Anderson
|
1746c362c8
|
Omaha #3622 Fix duplicate SiteActivationNotifications.
Check in the rest of the changes I missed the first time.
Change-Id: I8640f8f09aeb6019374a857daf335b27c69e0880
Former-commit-id: 3708671dfb [formerly e2d5bfa0b6] [formerly b032f7f24e] [formerly 3708671dfb [formerly e2d5bfa0b6] [formerly b032f7f24e] [formerly 43d3aca5ea [formerly b032f7f24e [formerly 67d19df57e57a77a0a1a83e695631a7a9cb22368]]]]
Former-commit-id: 43d3aca5ea
Former-commit-id: 5ee4834b47 [formerly 9bdae769c6] [formerly 922a279008982883208552f2c45046901949286b [formerly bc8a515870]]
Former-commit-id: 20e1e395213cc9255fb91374decb8df1d72ec7d6 [formerly 42da911091]
Former-commit-id: 72cb3d29b3
|
2014-09-26 11:39:06 -05:00 |
|
Richard Peter
|
0bbc82a8b9
|
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications." into omaha_14.4.1
Former-commit-id: f2199a38d4 [formerly c9c4dda54c] [formerly a4668b64a6] [formerly f2199a38d4 [formerly c9c4dda54c] [formerly a4668b64a6] [formerly 23747ad042 [formerly a4668b64a6 [formerly acbc667cfeab1ab6449a93967896e6e303bb238d]]]]
Former-commit-id: 23747ad042
Former-commit-id: 7b65c216f5 [formerly fffd7c6f48] [formerly c43e4f5a841c3a16f541a842886de6a6771e3c2b [formerly 554f75dc16]]
Former-commit-id: 1a8a59d85880bb5c6fe5a18708a50972dcac142e [formerly 6f644ed32e]
Former-commit-id: f91697cc5b
|
2014-09-26 11:27:53 -05:00 |
|
Sean.Webb
|
386758b569
|
Merge "ASM #16720 - Added updated palt.c to fix seq num in pqact pattern" into asm_14.2.4
Former-commit-id: 7102ba66c9 [formerly e8585c9d29] [formerly 96503843d9] [formerly 7102ba66c9 [formerly e8585c9d29] [formerly 96503843d9] [formerly 57342f0256 [formerly 96503843d9 [formerly d1ce11d690a1acf24fe82fc10acc83302e8f61f9]]]]
Former-commit-id: 57342f0256
Former-commit-id: 9e31a55d4a [formerly b18f341781] [formerly bd0f319fec2822e2062a65928b3c551cdcf7c13e [formerly d43119b40f]]
Former-commit-id: 8c7847477f956dce4a910702ba5588e2895b8314 [formerly feb73e67c5]
Former-commit-id: 18214a3d55
|
2014-09-26 11:01:04 -05:00 |
|
Brian.Dyke
|
b22b8a7e7e
|
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 3b71fe393a [formerly 0045c3100f] [formerly 586a504500] [formerly 3b71fe393a [formerly 0045c3100f] [formerly 586a504500] [formerly bd983e1932 [formerly 586a504500 [formerly d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7]]]]
Former-commit-id: bd983e1932
Former-commit-id: 8c9dab9e0d [formerly 30f8b55a19] [formerly 9542d4e85f18f0b367f543c554364189920d2e5c [formerly 95d80abd56]]
Former-commit-id: 9be16538ca3909938b2e8889eb9c1163b5ec910a [formerly 295e2814f7]
Former-commit-id: 7f65a5b799
|
2014-09-26 11:47:38 -04:00 |
|
Ron Anderson
|
f1dcd8fd67
|
Omaha #3622 Fix duplicate SiteActivationNotifications.
Change-Id: I647bf118f558721867722cfc13d889e637237911
Former-commit-id: 371589fc61 [formerly 71aad3ecff] [formerly 92575e8db3] [formerly 371589fc61 [formerly 71aad3ecff] [formerly 92575e8db3] [formerly dd4f22789a [formerly 92575e8db3 [formerly 8f687189a5c71f3bd04b5e31f6a45606fe456386]]]]
Former-commit-id: dd4f22789a
Former-commit-id: fd1284bb8a [formerly c4b97646fc] [formerly b8e7d41e35299ee5fe7cc2c3665a987d588b25fc [formerly 891e864f00]]
Former-commit-id: a61add13226f8dc9faa75aad7b891560d2aa81fe [formerly 3c3547ffcf]
Former-commit-id: 708b4d43fa
|
2014-09-26 15:19:08 +00:00 |
|