Lee Venable
|
62b59bc20a
|
Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
Former-commit-id: 389f8c5e13 [formerly b6321334e6] [formerly f8f0a0e41e] [formerly 389f8c5e13 [formerly b6321334e6] [formerly f8f0a0e41e] [formerly d42c36f365 [formerly f8f0a0e41e [formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]]]
Former-commit-id: d42c36f365
Former-commit-id: 1468a92082 [formerly c680cc3ea9] [formerly 84cbbb40a445a2c0f18f57bc065371cfaef10f48 [formerly da5cfb3d8e]]
Former-commit-id: c74dc0479155e96d534cdcdfca9a709e0b351ba4 [formerly d3b12f6973]
Former-commit-id: fd377ca4cc
|
2013-11-19 15:12:38 -06:00 |
|
Nate Jensen
|
036fa57da4
|
Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
Former-commit-id: 87a792417c [formerly f7034f933e] [formerly c6d6b07e3f] [formerly 87a792417c [formerly f7034f933e] [formerly c6d6b07e3f] [formerly a610825ef9 [formerly c6d6b07e3f [formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]]]
Former-commit-id: a610825ef9
Former-commit-id: 37f4ecfe9e [formerly 789f050b27] [formerly 4beedd31ac277b5c01f8da9cd36f06a6acf40875 [formerly 04de350ae7]]
Former-commit-id: 5f448b6e0ae144458579d677da2387bf34095954 [formerly ac93e07973]
Former-commit-id: 3cbf29226a
|
2013-11-19 14:11:01 -06:00 |
|
Richard Peter
|
5f779cd65c
|
Merge "Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed" into development
Former-commit-id: d7bc1d2975 [formerly c82e143fe1] [formerly 4c9bcf718a] [formerly d7bc1d2975 [formerly c82e143fe1] [formerly 4c9bcf718a] [formerly b296fd1d02 [formerly 4c9bcf718a [formerly d3559746302f09db933f9b8deecfe410e63d8430]]]]
Former-commit-id: b296fd1d02
Former-commit-id: 69d4c311b9 [formerly 93dbc58a93] [formerly 33f10b64c5308c0a5cabdcdc5cc87d9788e85a25 [formerly ba8fae576c]]
Former-commit-id: 4b2d83eea9ab2121a3b0ee3f4520aa0974582293 [formerly 8efa7a1512]
Former-commit-id: c5143e94e1
|
2013-11-19 13:18:05 -06:00 |
|
Nate Jensen
|
ca6de6494d
|
Issue #2361 don't initialize derived parameters on shutdown
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583
Former-commit-id: cd44881c08 [formerly 83c28fd04b] [formerly c90a7d7b3c] [formerly cd44881c08 [formerly 83c28fd04b] [formerly c90a7d7b3c] [formerly 5aee685557 [formerly c90a7d7b3c [formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]]]]
Former-commit-id: 5aee685557
Former-commit-id: cee86da089 [formerly 48632a81b3] [formerly 28a62e8d27dd2659e289060d6d67eda25d130e3e [formerly e9adf706ba]]
Former-commit-id: 16de96ff126e1735ea9cc6c041a171b1f7237755 [formerly cf87d1c335]
Former-commit-id: 9cbe1a123e
|
2013-11-19 12:59:10 -06:00 |
|
Mike Duff
|
3d66f30af1
|
Issue #1531 - Made bandwidth utilization graph resizable.
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475
Former-commit-id: 31964ce934 [formerly c7c20c6ce8] [formerly ed73a7e55a] [formerly 31964ce934 [formerly c7c20c6ce8] [formerly ed73a7e55a] [formerly 71093a685e [formerly ed73a7e55a [formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]]]]
Former-commit-id: 71093a685e
Former-commit-id: 4d18da0420 [formerly 8f9b847eff] [formerly 12ad71e7abd9db2b712a0ed6f4e8a8e81bf4cc49 [formerly 437df90354]]
Former-commit-id: 2c9c893948fa8f87a91c114556f3aaee31babb91 [formerly fcc96787c3]
Former-commit-id: e380af2664
|
2013-11-19 12:51:06 -06:00 |
|
Nate Jensen
|
ca61ec3ac0
|
Merge "Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring." into development
Former-commit-id: 275bdc13ed [formerly 50590a241f] [formerly 6927e960b2] [formerly 275bdc13ed [formerly 50590a241f] [formerly 6927e960b2] [formerly 5885d8027b [formerly 6927e960b2 [formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]]]]
Former-commit-id: 5885d8027b
Former-commit-id: 2cc539c3d3 [formerly aba433c4bb] [formerly a8aba4eda4a927d292566c88bac7dcffae609ef3 [formerly be3d016f93]]
Former-commit-id: 44cf6ba23f8b185fae87852a8dfdfc12ad5c71bb [formerly 0015c66955]
Former-commit-id: dcf7114d6b
|
2013-11-19 11:25:19 -06:00 |
|
Steve Harris
|
e167208631
|
Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
Former-commit-id: ad200adacd [formerly 920e06b8ff] [formerly c37908caa8] [formerly ad200adacd [formerly 920e06b8ff] [formerly c37908caa8] [formerly 39ab54c912 [formerly c37908caa8 [formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]]]]
Former-commit-id: 39ab54c912
Former-commit-id: 69710c8f63 [formerly 7b9bc1ae90] [formerly f2b3feeb03238e38bba68b87041e15e6592d811b [formerly 94a60728ca]]
Former-commit-id: 0dbdb8b56bcd9a174076ebaf21e6fcc45d778e86 [formerly 77d9b628fe]
Former-commit-id: 99232f6c6c
|
2013-11-19 10:08:45 -06:00 |
|
Mike Duff
|
7b285740e2
|
Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2
Former-commit-id: 7048853fd2 [formerly f8d5563973] [formerly c908647259] [formerly 7048853fd2 [formerly f8d5563973] [formerly c908647259] [formerly 665d9e7651 [formerly c908647259 [formerly cacc7a8560c589b24ea98191f152c31479c5631e]]]]
Former-commit-id: 665d9e7651
Former-commit-id: fd5a8b283d [formerly 8221f50e8a] [formerly fa1699e3e40e15a4fba251ecf2b68f464c00c042 [formerly 5afa90b967]]
Former-commit-id: 82ed33c047718d5a5664b805503ccce5378442c1 [formerly d254f954c4]
Former-commit-id: dd80768cc2
|
2013-11-19 08:55:27 -06:00 |
|
Nate Jensen
|
24bb2b914d
|
Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
Former-commit-id: 629d611145 [formerly accbd46ad6] [formerly edf51dffc9] [formerly 629d611145 [formerly accbd46ad6] [formerly edf51dffc9] [formerly 3d51d80170 [formerly edf51dffc9 [formerly b6420738e49d37840789c88089ecc8bab1103284]]]]
Former-commit-id: 3d51d80170
Former-commit-id: 32737415fc [formerly 7da95f7b57] [formerly d7ac7a454945a6f649dfab52f167467ddb507d1e [formerly f07f543cd3]]
Former-commit-id: 1eb3dd2593616960f8702398df44a591a5441f49 [formerly a5abd4dad0]
Former-commit-id: 1926ac3647
|
2013-11-18 12:50:38 -06:00 |
|
Nate Jensen
|
88725bf57b
|
Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
Former-commit-id: b64c20e99c [formerly 493cdb287c] [formerly 0dbe79344a] [formerly b64c20e99c [formerly 493cdb287c] [formerly 0dbe79344a] [formerly 827b7f5a93 [formerly 0dbe79344a [formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]]]
Former-commit-id: 827b7f5a93
Former-commit-id: f640ecf96e [formerly 3de7e3576b] [formerly ab02400e12a733ec9507e8ac73837821fa31df90 [formerly 6900d4e47f]]
Former-commit-id: b1e2fa733d9d12c12439bc83f67a8be4f1479985 [formerly b6fe32de06]
Former-commit-id: 553a32f5a3
|
2013-11-18 12:50:19 -06:00 |
|
Ben Steffensmeier
|
86418297ff
|
Issue #2543 fix gl buffer formating problems
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc
Former-commit-id: 830a28498b [formerly 6b6c46afa8] [formerly 105e3e359a] [formerly 830a28498b [formerly 6b6c46afa8] [formerly 105e3e359a] [formerly e7a068e595 [formerly 105e3e359a [formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]]]
Former-commit-id: e7a068e595
Former-commit-id: 8e2b4353cc [formerly 51c04680e2] [formerly ae49586b08f646c42f059223597489c739f0cdce [formerly e605758e57]]
Former-commit-id: 14e9b1c968978356e85b2e67c57fd8481fdfcd9a [formerly 9bd35b793d]
Former-commit-id: 9fa1dbbfa5
|
2013-11-18 11:51:51 -06:00 |
|
Ben Steffensmeier
|
c49ae5d321
|
Issue #2544 Fix recycling issues with Satellite resources.
Former-commit-id: 0a3d78555e [formerly 15ae95075d] [formerly e392185d78] [formerly 0a3d78555e [formerly 15ae95075d] [formerly e392185d78] [formerly 9ff1751f4e [formerly e392185d78 [formerly 166957a22c3447fa2407b13362eece24943675c9]]]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 00088654a0 [formerly 0788a82a99] [formerly 775873b42354a16c60bda95506731f0ccdc6e548 [formerly 1875f56695]]
Former-commit-id: d79a110b1a53c8b830a2684f1f2f27e3e8b4309f [formerly 55f26e277f]
Former-commit-id: 7de35d0111
|
2013-11-18 11:44:56 -06:00 |
|
Nate Jensen
|
64318dcc88
|
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
Former-commit-id: 9740e25c5e [formerly 93e93de742] [formerly 4f47800cae] [formerly 9740e25c5e [formerly 93e93de742] [formerly 4f47800cae] [formerly 0146ae59df [formerly 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]]
Former-commit-id: 0146ae59df
Former-commit-id: f9cdff25f0 [formerly d9d0eb7354] [formerly d73c34612b91ec5b6776253d400f6c0d34b344e2 [formerly a238ba2ba3]]
Former-commit-id: 6f1ac0cbf7524da75f1cd4b4998b7cdb7a08bd26 [formerly 951c1ff2f3]
Former-commit-id: 7e76b097c7
|
2013-11-18 11:39:12 -06:00 |
|
Steve Harris
|
2d3311aace
|
Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
cots/org.jep.linux32/libjep.so
cots/org.jep.linux64/libjep.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
(took all the omaha_14.1.1 versions)
Former-commit-id: f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly f7878c44cb [formerly 542a0946f2] [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 3b074763ab [formerly 3f9df61017] [formerly 1978596c628755147b84f2d7e363ca602a98cedf [formerly 869b505f80]]
Former-commit-id: aff5d0abe267c4419bbecd159b29ef6d6ca51480 [formerly c26818afe6]
Former-commit-id: 87ce579deb
|
2013-11-15 13:15:25 -06:00 |
|
Steve Harris
|
1c4b82577c
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)
Former-commit-id: 117cac310b [formerly dc4f3b7594] [formerly 1015e180f1] [formerly 117cac310b [formerly dc4f3b7594] [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: b1d82b9c2c [formerly 156395b85b] [formerly 72d35279c7375fe7db3bdc163cd5fbd4a655ec1d [formerly d97edb20d1]]
Former-commit-id: 29c5be7d12e460b8d18f00420279fd45027d33c8 [formerly 7127a1e665]
Former-commit-id: c4e9fe1c94
|
2013-11-15 13:05:40 -06:00 |
|
Steve Harris
|
e3de9e104e
|
14.1.1-9 baseline
Former-commit-id: ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly ba884f2a27 [formerly a32eadf384] [formerly f8f995b697] [formerly 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 7977f24d77 [formerly eab5bb1147] [formerly 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d]]
Former-commit-id: 7d3151fa65482d7fe7a3ae91e52a20bb86097b97 [formerly ea382798b5]
Former-commit-id: ed58bc7f71
|
2013-11-15 12:47:49 -05:00 |
|
Brad Gonzales
|
d72d725ba7
|
Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications.
Added missing comma to com.raytheon.edex.plugin.text.
Change-Id: Ifc970d31d8f2db29dc5a4749967cdedad84b6162
Former-commit-id: 437c29c7f4 [formerly 938683ba4d] [formerly aa8fb36fc1] [formerly 437c29c7f4 [formerly 938683ba4d] [formerly aa8fb36fc1] [formerly 53d4de12d9 [formerly aa8fb36fc1 [formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]]
Former-commit-id: 53d4de12d9
Former-commit-id: 66a8a30092 [formerly 4ec5ee7f74] [formerly e3193236411f9e577590904b1ee3e08e4ab9ffd5 [formerly 490c95d010]]
Former-commit-id: e7ce2920a68b4911c5e309cad65b7a703bffe97b [formerly 4499a8d1de]
Former-commit-id: 2c7e62ee89
|
2013-11-15 08:00:47 -06:00 |
|
Nate Jensen
|
6b09f38258
|
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 462878bf86 [formerly 757ca42a5f] [formerly dd99aa3f47] [formerly 462878bf86 [formerly 757ca42a5f] [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]]
Former-commit-id: 78b01f61c4
Former-commit-id: d8f4ecc2d7 [formerly d0d712ec6f] [formerly dc8aea52f7c970fb95e7d9d99a858f44faa15501 [formerly d96cdbe761]]
Former-commit-id: ec63b3c149df4d0ab77744254adbda1de3fcf101 [formerly f2c777ff48]
Former-commit-id: 2e81364691
|
2013-11-14 17:41:24 -06:00 |
|
Mike Duff
|
8f7fe5026c
|
Issue #2548 - fix malformed comment
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034
Former-commit-id: 24dc37f03b [formerly 0d83797a4e] [formerly 414cb1cf68] [formerly 24dc37f03b [formerly 0d83797a4e] [formerly 414cb1cf68] [formerly 95fda38cc5 [formerly 414cb1cf68 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]]]
Former-commit-id: 95fda38cc5
Former-commit-id: bc96849913 [formerly a13aa64b65] [formerly 041b2afc87e9fd510c3e653e8424f02271121cc3 [formerly 7be43c4a52]]
Former-commit-id: 975d2f3e3965fd819361ea85039cd6dd56556377 [formerly 0f2626f79f]
Former-commit-id: 44c4259ccc
|
2013-11-14 17:30:55 -06:00 |
|
Richard Peter
|
448c6c570e
|
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
Former-commit-id: 979fa16d04 [formerly 157e739623] [formerly 14b1e924a1] [formerly 979fa16d04 [formerly 157e739623] [formerly 14b1e924a1] [formerly 0bb5e2a61e [formerly 14b1e924a1 [formerly dba301df2f593baa951c14b684e7ce4794e32019]]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 586b11c80d [formerly 65e8ad1a62] [formerly 29857e1e475c9363f0f62efb31ac6cf02ee6e84f [formerly 1a7dd7723b]]
Former-commit-id: 267888101d1e70c5ebb253bbe68dc00463f279b2 [formerly 38d2c6564a]
Former-commit-id: 8247da7774
|
2013-11-14 17:21:48 -06:00 |
|
Brian Clements
|
241564343a
|
Issue #2361 fixed ncwf hibernate pickup
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names
Former-commit-id: e8c8314abe [formerly 55682480e1] [formerly cacdf313c5] [formerly e8c8314abe [formerly 55682480e1] [formerly cacdf313c5] [formerly 00490c2db2 [formerly cacdf313c5 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]]
Former-commit-id: 00490c2db2
Former-commit-id: 7625e0ef16 [formerly 878a677d18] [formerly 8742dd3b5b719d9daf15294c04f9699017a3a49b [formerly ab24330f23]]
Former-commit-id: 8e8a6bfd8a34aa6c97d6d0ea6b0fad6ad98a7ebf [formerly e7c355df52]
Former-commit-id: 1a2b934e97
|
2013-11-14 17:12:02 -06:00 |
|
Mike Duff
|
0e3d39d133
|
Issue #2548 - Add a subscription type slot for uniqueness.
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 223901d9cf [formerly 8cc9c1de59] [formerly 47011a70db] [formerly 223901d9cf [formerly 8cc9c1de59] [formerly 47011a70db] [formerly 47a0477587 [formerly 47011a70db [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]]
Former-commit-id: 47a0477587
Former-commit-id: 0f848918e8 [formerly 44cc3d8776] [formerly 33980f8e6df3009e6c047cfc2074778085a37612 [formerly b929b7aa02]]
Former-commit-id: 0ff9a554b33df76684f00b9934e1c4b55b0cb9f6 [formerly 5fdf101af6]
Former-commit-id: 769e81cd23
|
2013-11-14 17:07:54 -06:00 |
|
Nate Jensen
|
da110c93cc
|
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
Former-commit-id: 2d5752d3d6 [formerly 3b11ea8c5b] [formerly b4bcd14a85] [formerly 2d5752d3d6 [formerly 3b11ea8c5b] [formerly b4bcd14a85] [formerly c2aacfc437 [formerly b4bcd14a85 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]]]
Former-commit-id: c2aacfc437
Former-commit-id: 31392685aa [formerly f0a0287230] [formerly dcba58ed57cf3e8859d8471e47fda78c0e7ef984 [formerly a8a1e396fe]]
Former-commit-id: 92e37cdfb10a78fc44861b3461fac1e50f9a0b14 [formerly 7ec18ba0b1]
Former-commit-id: f6abd529f7
|
2013-11-14 16:34:28 -06:00 |
|
Bryan Kowal
|
14b78c5952
|
Issue #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring.
Amend: datadelivery jaxables are now injected
Amend: created a getInstance method for EbxmlJaxbManager
Amend: use value instead of bean in spring configuration
Change-Id: Ib6c11b03964fbaeee24db352a8f0acc1b43fa3c0
Former-commit-id: 8b274264c9 [formerly 782675951b] [formerly be78fab116] [formerly 8b274264c9 [formerly 782675951b] [formerly be78fab116] [formerly ce16efc9a1 [formerly be78fab116 [formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]]]
Former-commit-id: ce16efc9a1
Former-commit-id: e810496889 [formerly 512fc1a7c1] [formerly 5e386da33f46128ec2187010bd711c2f5ecf11d8 [formerly a6ea71d46f]]
Former-commit-id: a19458086623da11654c40c655f01519bd804871 [formerly 4275b195ce]
Former-commit-id: bc25cbe7ad
|
2013-11-14 15:17:28 -06:00 |
|
Richard Peter
|
170aeb49af
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 9bebb21be8 [formerly 800effdc5a] [formerly 8fb79e7b73] [formerly 9bebb21be8 [formerly 800effdc5a] [formerly 8fb79e7b73] [formerly c42f931118 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]]]
Former-commit-id: c42f931118
Former-commit-id: b9da33bcea [formerly e5dc8e2027] [formerly d0ba6f0b34d98e888dee8eca0e8a59d14ff6436f [formerly 2b95bcfb31]]
Former-commit-id: 6bd09bf526063f854e453bf474886432548c3c50 [formerly e7d8e5e560]
Former-commit-id: 2025e073ef
|
2013-11-14 14:56:59 -06:00 |
|
Lee Venable
|
71f7f7f52f
|
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
Former-commit-id: 2f134e6aa3 [formerly bd81ec8807] [formerly 834c2ac8da] [formerly 2f134e6aa3 [formerly bd81ec8807] [formerly 834c2ac8da] [formerly f0ebee3bb3 [formerly 834c2ac8da [formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]]]
Former-commit-id: f0ebee3bb3
Former-commit-id: 0e326c2a12 [formerly e9b8ee42c7] [formerly a74585351b2263565cb70d9d704cba8fb765886e [formerly 7d04b2e4ce]]
Former-commit-id: 649ceeb15e5073f34a435cdd6eb59756c9c5ec8a [formerly ad77be1b44]
Former-commit-id: 194a6760b7
|
2013-11-14 14:43:18 -06:00 |
|
Mike Duff
|
b4eaa45753
|
Issue #2538 - Check for existing adhoc queries in registry.
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: c3aee76403 [formerly f6c4ca2bc0] [formerly 87a4b1bec4] [formerly c3aee76403 [formerly f6c4ca2bc0] [formerly 87a4b1bec4] [formerly a80964bc7c [formerly 87a4b1bec4 [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]]
Former-commit-id: a80964bc7c
Former-commit-id: b27ee6803f [formerly 48093514a6] [formerly 0ded51344d49c52b18e3738df599260571f7155a [formerly 4557a06f42]]
Former-commit-id: 1f88021dcffff2375d1ca1a6dd6252ce277c8f2c [formerly cf077ed7f9]
Former-commit-id: 2b91b4b9ef
|
2013-11-14 14:40:33 -06:00 |
|
Richard Peter
|
d289419c40
|
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]]
Former-commit-id: 0074b774f0
Former-commit-id: 625647a717 [formerly b4aac09ff4] [formerly 9dbc5783e450aca6291faa5547b5b3369711eda7 [formerly 96b4944b41]]
Former-commit-id: 2067b058e879c394c330dccfc1994698c7f7cb05 [formerly e2a16fd876]
Former-commit-id: 705339a320
|
2013-11-14 14:40:23 -06:00 |
|
Lee Venable
|
686d984163
|
Merge "Issue #2540 - pure python module merge implementation" into development
Former-commit-id: d42589d14f [formerly 6086c06f66] [formerly d431f3c0f4] [formerly d42589d14f [formerly 6086c06f66] [formerly d431f3c0f4] [formerly bc7f5e556d [formerly d431f3c0f4 [formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]]
Former-commit-id: bc7f5e556d
Former-commit-id: b93b05165c [formerly 69934b9b32] [formerly 8b1c54f60a8cccda08a50dac70415ec886062e9b [formerly 17fef206fc]]
Former-commit-id: b05b8692e13600b879c8d4c9de8f0c9322ffe832 [formerly 84de0beae4]
Former-commit-id: ab512eaeb1
|
2013-11-14 14:33:18 -06:00 |
|
Richard Peter
|
24e58ea252
|
Merge "Issue #2505 removed recco from deployment" into development
Former-commit-id: 7c5e85a288 [formerly 5c5e71a01b] [formerly 4d18c7d493] [formerly 7c5e85a288 [formerly 5c5e71a01b] [formerly 4d18c7d493] [formerly 3f5c590c5f [formerly 4d18c7d493 [formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: df3e6735af [formerly 6af248f212] [formerly 493a9f0f3191b9c74a85050ff2e11f14b925c249 [formerly 3dc0ad184c]]
Former-commit-id: 90ff75232070f6fc3d10b664951a96a9876cc88b [formerly ace2a71092]
Former-commit-id: 7375a3b961
|
2013-11-14 13:30:09 -06:00 |
|
Nate Jensen
|
493fa54860
|
Issue #2361 remove StyleManager's use of SerializationUtil and
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9517c96d68 [formerly a4eb19fc79] [formerly 9acda0b9f2] [formerly 9517c96d68 [formerly a4eb19fc79] [formerly 9acda0b9f2] [formerly c5cf68cc45 [formerly 9acda0b9f2 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]]
Former-commit-id: c5cf68cc45
Former-commit-id: ddcca3463d [formerly e41f57da67] [formerly a2b53d6aca5047e5514931e92e017ed5771c890d [formerly a6be904c69]]
Former-commit-id: 6f2e3001c41627a8a93fc22d02074369aa136e2d [formerly e83a828209]
Former-commit-id: 6441290b40
|
2013-11-14 13:29:30 -06:00 |
|
Bryan Kowal
|
fde6569c34
|
Issue #2540 - pure python module merge implementation
Amend: remove dead LocalizationUtil.py file. Use os.path.join; catch Exception thrown by module merge
Amend: remove module merge exception catching
Change-Id: Idb9bc359d8b3dc1b6c4ccfd6247e02e2905bbea1
Former-commit-id: 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7b9c8a6174 [formerly 48cc679bce] [formerly 2029c34f24] [formerly 7e35ea310f [formerly 2029c34f24 [formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 8a0b0667de [formerly 4759e48c5c] [formerly 90670353179a78bde76d7ccb60b47f097fef7acd [formerly a2261b9ff3]]
Former-commit-id: 5339245b650c517d8012d02401b6076bf3cd1ed8 [formerly 79045d620b]
Former-commit-id: ae5e6b3927
|
2013-11-14 11:57:11 -06:00 |
|
Steve Harris
|
c214af60f6
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 361df767a8 [formerly 77ea1782c3] [formerly 473488f5b8] [formerly 361df767a8 [formerly 77ea1782c3] [formerly 473488f5b8] [formerly 4d25eb11c8 [formerly 473488f5b8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]]]
Former-commit-id: 4d25eb11c8
Former-commit-id: d6ef4ae259 [formerly a75acc5499] [formerly 282970560ec2ee6eee13b9272e753fbb7d551416 [formerly ef852ac125]]
Former-commit-id: 495f8b46971170beee79e3e200e5aea8c63cfc3b [formerly 39e8f5ecc1]
Former-commit-id: 8307fe3a9f
|
2013-11-13 23:20:18 -06:00 |
|
Richard Peter
|
0e6f70cb31
|
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
Former-commit-id: 9e4949eeb9 [formerly adc30e817e] [formerly 2f3eee1439] [formerly 9e4949eeb9 [formerly adc30e817e] [formerly 2f3eee1439] [formerly e88f5777a7 [formerly 2f3eee1439 [formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]]
Former-commit-id: e88f5777a7
Former-commit-id: 42ac155685 [formerly ed258e9421] [formerly 5c494cb47ccf4d7292296be310025fbd46ce817f [formerly 64afe42e74]]
Former-commit-id: ce9e0daca12be42a0eea37a51d5530a1d4b7f8d1 [formerly 58c8106da8]
Former-commit-id: 0581cc53e5
|
2013-11-13 16:43:26 -06:00 |
|
Greg Armendariz
|
13f777cc62
|
Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
Former-commit-id: a0b16bafee [formerly 06e3f849f0] [formerly 83ac36721b] [formerly a0b16bafee [formerly 06e3f849f0] [formerly 83ac36721b] [formerly 3f6281fdbe [formerly 83ac36721b [formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]]]
Former-commit-id: 3f6281fdbe
Former-commit-id: 2d92a5719c [formerly b7c3a7e850] [formerly a557332626ac393163cd374e7ee121dc81df86a4 [formerly ce0a05242f]]
Former-commit-id: 571affa63254c2077485a938f0d063bd2b14e213 [formerly 977e0fab0e]
Former-commit-id: 8809254168
|
2013-11-13 15:30:55 -06:00 |
|
Brian Clements
|
bdf611db27
|
Issue #2505 removed recco from deployment
added update script to drop recco from db
Former-commit-id: 3204a2f7b5 [formerly 3551b731e0] [formerly 95f1621d3e] [formerly 3204a2f7b5 [formerly 3551b731e0] [formerly 95f1621d3e] [formerly 8cbe2c06a8 [formerly 95f1621d3e [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: b5b94646cf [formerly d2f0b73626] [formerly 3b2b0c50ce7169049fcf9a2ade66e9157fc2cf81 [formerly 49c8bd5ee9]]
Former-commit-id: 7384c5efc3b7d3bed603cfe7ab8ff291ceab0e23 [formerly d94f44d406]
Former-commit-id: 09101ca5ac
|
2013-11-13 13:45:44 -06:00 |
|
Bryan Kowal
|
89b9e26156
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 1d519f9778 [formerly 178d95e59d] [formerly 86dd200844] [formerly 1d519f9778 [formerly 178d95e59d] [formerly 86dd200844] [formerly 0544b66f4e [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]]
Former-commit-id: 0544b66f4e
Former-commit-id: ce40d40304 [formerly a2b1211c52] [formerly 9fef8ee66c8d7456504fc2bc5dcebeba0b756974 [formerly 01735ca0c4]]
Former-commit-id: 52598106710ffd4583947f5428f98b7eb89170c3 [formerly 1a905e8a3c]
Former-commit-id: 97c0dff26a
|
2013-11-13 13:16:55 -06:00 |
|
Steve Harris
|
91027b38db
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 3e8014e9f8 [formerly eb470599f3] [formerly 0a37219d2a] [formerly 3e8014e9f8 [formerly eb470599f3] [formerly 0a37219d2a] [formerly 2e7a594d51 [formerly 0a37219d2a [formerly ebde6dc849a1ca9753f959423109186c836b4525]]]]
Former-commit-id: 2e7a594d51
Former-commit-id: 6af0dcf567 [formerly 80c709b3f4] [formerly 30e7b1a9427f9e36f5c8eb8e65eb8f79733ce8fb [formerly bc45f3668b]]
Former-commit-id: 0e519fa7a1edf2e5477d6d7126baa658bb25f2d1 [formerly 1fdc64c7e7]
Former-commit-id: 661dbe2860
|
2013-11-13 11:34:17 -06:00 |
|
Steve Harris
|
7facd4fe25
|
14.1.1-8 baseline
Former-commit-id: 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 1902ca9cfb [formerly b7ca6163e3] [formerly 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9]]
Former-commit-id: 299bb48cc93fac70de777c99a73fd516cc085238 [formerly 42ece4fb6a]
Former-commit-id: d2104614be
|
2013-11-13 12:32:17 -05:00 |
|
Benjamin Phillippe
|
516cb4648c
|
Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query
Change-Id: I2e9b2482e4db91e7f4ba642267e3aaf1c5df1279
Former-commit-id: 7b53fc40d4 [formerly c294d5d77a] [formerly 5cd030f096] [formerly 7b53fc40d4 [formerly c294d5d77a] [formerly 5cd030f096] [formerly 1c46226a11 [formerly 5cd030f096 [formerly ce2db6d930faf1166bec9956fb21ea51e2329d40]]]]
Former-commit-id: 1c46226a11
Former-commit-id: 7cbc9b4ef3 [formerly 1a19965daf] [formerly 02517e3b01d1874cc92736a35804499b6a45c0d6 [formerly fe7c6886c4]]
Former-commit-id: b488e8fc371f0360383d01dae50168e03ac18f75 [formerly 64a37e7672]
Former-commit-id: 7ae33612c5
|
2013-11-13 10:52:07 -06:00 |
|
Brian Clements
|
9d8010e1d8
|
Issue #1314 fixed WFS output problem found when testing KeyLocker
Stored query response objects needed to be wrapped in JAXB elements
Former-commit-id: 0991849617 [formerly 0d80fa7dc1] [formerly dfd88151e6] [formerly 0991849617 [formerly 0d80fa7dc1] [formerly dfd88151e6] [formerly 37f4f41d2d [formerly dfd88151e6 [formerly d8e8b2323da3444cbff8b625f6b5098850888ee2]]]]
Former-commit-id: 37f4f41d2d
Former-commit-id: c399d0394f [formerly c3a0ea3400] [formerly e50da8d67f3cc8f84bc4978a0aab417ea16a7c26 [formerly ef2acc6562]]
Former-commit-id: 43f5f85d2db77290d610b2bb501ffa92d7faa7cd [formerly ac221125f4]
Former-commit-id: eb9764b77b
|
2013-11-13 10:04:13 -06:00 |
|
Nate Jensen
|
d507cbd5dd
|
Merge "Issue #2546 added fix for TAFs that contain legacy valid times" into development
Former-commit-id: 47f8811992 [formerly 51ba5f770c] [formerly 85923b0f7f] [formerly 47f8811992 [formerly 51ba5f770c] [formerly 85923b0f7f] [formerly c0ed705daf [formerly 85923b0f7f [formerly 8769c4a0596ea2adcab58eb672985b8a1c50dd93]]]]
Former-commit-id: c0ed705daf
Former-commit-id: df8ddb3eac [formerly fad5c6d615] [formerly 8aeadacd76d9077469357c8afa7195a688cca933 [formerly a62e415724]]
Former-commit-id: 004d25305a2a74a752f4ba7a92f1b8bbb916144c [formerly b7085b0ed4]
Former-commit-id: 1c92fc757b
|
2013-11-13 09:01:09 -06:00 |
|
Brian Clements
|
2c76698c78
|
Issue #2546 added fix for TAFs that contain legacy valid times
added unit test
Former-commit-id: 04a9d3ae08 [formerly b0a5192dfa] [formerly 191ffc6e63] [formerly 04a9d3ae08 [formerly b0a5192dfa] [formerly 191ffc6e63] [formerly df1542a66c [formerly 191ffc6e63 [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]]]
Former-commit-id: df1542a66c
Former-commit-id: 381a274111 [formerly bca5149811] [formerly 3ac020de4f913cf98382a5249c8fda9e76a0edaa [formerly 0e5d3e9e69]]
Former-commit-id: 31f963a907811d6d1817831b842056f2d9e806f2 [formerly b511453153]
Former-commit-id: 1d41861c3c
|
2013-11-13 08:07:29 -06:00 |
|
Bryan Kowal
|
1134d55c7b
|
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: 8afbe25d22 [formerly b2272ad695] [formerly a51231058a] [formerly 8afbe25d22 [formerly b2272ad695] [formerly a51231058a] [formerly e3639da703 [formerly a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]]
Former-commit-id: e3639da703
Former-commit-id: ad1e4c66b8 [formerly b2c63727ba] [formerly 9b2674319137dc98ffe2e221d63d5f3dae8f1e22 [formerly 48d5d8c3a1]]
Former-commit-id: 05930d677355374fbcc6438692928f1740b35460 [formerly a575f41589]
Former-commit-id: cfb3717a61
|
2013-11-12 19:57:25 -06:00 |
|
Bryan Kowal
|
6b9cae71e2
|
Issue #2297 - update build scripts to complete the full delta build
Former-commit-id: 46264b5fcc [formerly 631c03601c] [formerly 7cac007ef1] [formerly 46264b5fcc [formerly 631c03601c] [formerly 7cac007ef1] [formerly d76033ff3d [formerly 7cac007ef1 [formerly b605c29ae839ca7950bc04426f09eb310587a18f]]]]
Former-commit-id: d76033ff3d
Former-commit-id: d8a1e15951 [formerly e9ff5e018b] [formerly 08a3d0dc0c028b514f152d7d2df94af1610acc50 [formerly 084d772588]]
Former-commit-id: 5a7b66c6f75c115cad84c4d0aaf076e8a21ad3a3 [formerly 8867114ff8]
Former-commit-id: d83504922b
|
2013-11-12 17:43:10 -06:00 |
|
Nate Jensen
|
ad4f555802
|
Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
Former-commit-id: b59a0230e5 [formerly f2f778c042] [formerly accfefae6d] [formerly b59a0230e5 [formerly f2f778c042] [formerly accfefae6d] [formerly f0b386b632 [formerly accfefae6d [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]]]
Former-commit-id: f0b386b632
Former-commit-id: 793a7f6544 [formerly ec073efd45] [formerly dfb26a2628a5b054a3463a05d41c518dd8e86068 [formerly 80227c4750]]
Former-commit-id: 73824090615da78d44f25ffa6e0796a9268ffcc8 [formerly 633faf692b]
Former-commit-id: 6b4284ec55
|
2013-11-12 16:55:31 -06:00 |
|
Nate Jensen
|
a9d73bb3fa
|
Merge "Issue #2361 better logging of viz spring initialization of bundles" into development
Former-commit-id: decad66d76 [formerly 8df2c48648] [formerly 8cf1b752e0] [formerly decad66d76 [formerly 8df2c48648] [formerly 8cf1b752e0] [formerly b1d376e238 [formerly 8cf1b752e0 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]]]
Former-commit-id: b1d376e238
Former-commit-id: ad6d935205 [formerly b0cfb6e836] [formerly 50151ea1ec6e4d1ca1d0f68de456f2de9ac40c8f [formerly 645e816d5d]]
Former-commit-id: 8056424dfb851f8b8deb8e86c061748dbf6ffbc1 [formerly 983afa0eea]
Former-commit-id: abf56dec05
|
2013-11-12 16:48:32 -06:00 |
|
Dave Hladky
|
6ee91eff8a
|
Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: 80ce7ec3e7 [formerly 5313c8b68d] [formerly 643a150777] [formerly 80ce7ec3e7 [formerly 5313c8b68d] [formerly 643a150777] [formerly e3a259182c [formerly 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]]
Former-commit-id: e3a259182c
Former-commit-id: b467763805 [formerly f2f670bc00] [formerly a4fec8aeeb03e65d82a83a1808e0fa6530ced21e [formerly 53866e481a]]
Former-commit-id: 454826e2ebc64df06b520cf75175b5fe9f328956 [formerly 86363574b3]
Former-commit-id: fa2238778d
|
2013-11-12 14:55:41 -06:00 |
|
Nate Jensen
|
03c16ff64b
|
Merge "Issue #2539 removed java 7 specific code from exception subclass" into development
Former-commit-id: 568e9dacba [formerly edb2b6d217] [formerly 5e02427d6e] [formerly 568e9dacba [formerly edb2b6d217] [formerly 5e02427d6e] [formerly c60228c854 [formerly 5e02427d6e [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]]]]
Former-commit-id: c60228c854
Former-commit-id: 8dacce7f9b [formerly c6e10ebdef] [formerly 5dddfaa7f46782e5270d7070d02a28f1d2f20a01 [formerly a1315f1072]]
Former-commit-id: 2e43027e215f7cefcc48aa4b0df6ded67da6bbd2 [formerly a53cf1a079]
Former-commit-id: 73d6499cc0
|
2013-11-12 14:41:34 -06:00 |
|
Greg Armendariz
|
df22d0db38
|
Issue #2512 - Remove dead code
Former-commit-id: b429bf2588 [formerly 59f8eb9341] [formerly 4f4d59aa52] [formerly b429bf2588 [formerly 59f8eb9341] [formerly 4f4d59aa52] [formerly 70c9a36826 [formerly 4f4d59aa52 [formerly c07118fed79b6e50694281e40b3fb3755484d911]]]]
Former-commit-id: 70c9a36826
Former-commit-id: 12dfecc863 [formerly f878a8e302] [formerly 1d7219743606de751141dfd69c8aab0a62160ea6 [formerly fbcb810ab3]]
Former-commit-id: c2036e42c06dfb0f3938cd763917db7377259c64 [formerly 3852935abf]
Former-commit-id: bbd6cd614b
|
2013-11-12 14:20:21 -06:00 |
|