Ben Steffensmeier
1b022bfd31
Issue #2528 Add brute force method of calculating geostationary envelope intersections.
...
Change-Id: Ie02ae1e493015dcca88468633db65c51cd701adf
Former-commit-id: 4d86af4f02
[formerly 9627cf0f6f
] [formerly 30d125f95a
] [formerly 00af766143
[formerly 30d125f95a
[formerly 393aba6883e536912f7b1e34bd922d53eaa63727]]]
Former-commit-id: 00af766143
Former-commit-id: cacb3acbd0ce426c88a1a423cb2359588872f550 [formerly 6faafa2dfc
]
Former-commit-id: abdb1c504c
2013-11-20 15:36:27 -06:00
Ron Anderson
bbb24dfdbd
Issue #2488 Change to use DejaVu fonts
...
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224
Former-commit-id: a83d214f40
[formerly 7a3c7d530e
] [formerly d72119409e
] [formerly 633137d8c0
[formerly d72119409e
[formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]]
Former-commit-id: 633137d8c0
Former-commit-id: ebfd4c9fd692514b821af5e75fe51a87a50ddecc [formerly f6b9e69738
]
Former-commit-id: 769df41dea
2013-11-20 13:43:25 -06:00
Greg Armendariz
73d62a6589
Merge "Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring. Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription handlers will be injected through spring. Removed the SBN route from wfo mode." into development
...
Former-commit-id: 04e24a343a
[formerly 6efadcdeed
] [formerly 93daf9aff4
] [formerly bc6c4e2b32
[formerly 93daf9aff4
[formerly 243e06d507ee85bfa7e30f5da41c146afa4d1043]]]
Former-commit-id: bc6c4e2b32
Former-commit-id: 14dad5a0dd830f24c2fd927b2961671ee2d5a727 [formerly ce2ef25207
]
Former-commit-id: dd31a09cf9
2013-11-20 12:26:30 -06:00
Brad Gonzales
3aa399c82e
Issue #2545 Renamed datadelivery edex impl files to facilitate modes exclusion. Added
...
monilithic impl config file for a registry that runs as an ncf and wfo for devRegistry mode. Added empty site and
shared and local subscription handlers to enable the FindSubscriptionHandler bean to be configured through spring.
Fix for re-routing Insert and Update registry events as data set metadata events which was lost when the registry
was configured to distinguish between insert and update events. Moved subscriptionRoutesToSchedule bean (and other
beans specific to an implementation) to the ncf, wfo, and monolithic edex impl spring files. Removed the wfo and
ncf specific code from HibernateBandwidthInitializer.executeAfterRegistryInit() since the customized subscription
handlers will be injected through spring. Removed the SBN route from wfo mode.
Amend: Comment updates from peer review.
Change-Id: Ic4c0dca8ebf1e86537e46a6231af58bb65c83cf8
Former-commit-id: 2f37534433
[formerly 5576ac6134
] [formerly 053f20c70b
] [formerly 95a1914c71
[formerly 053f20c70b
[formerly c245f741b9e78d8e4503698336d9929536e72e0d]]]
Former-commit-id: 95a1914c71
Former-commit-id: 19437f081eb72b80741e738e53af17b271610621 [formerly 04829d37e2
]
Former-commit-id: 3c86e33ea4
2013-11-20 11:58:33 -06:00
Ben Steffensmeier
7d6d765081
Issue #2532 Fix grid displays of grids larger than the world.
...
Former-commit-id: f98ccd8c97
[formerly 6d878e3361
] [formerly d3ed1ba356
] [formerly 41753c40b5
[formerly d3ed1ba356
[formerly e607da0bb204d61cbc998595f52406605c1953e0]]]
Former-commit-id: 41753c40b5
Former-commit-id: c329e9c74d28818f4e37e2c7f57e4357d5175a4a [formerly 07743c4369
]
Former-commit-id: 7f441392b8
2013-11-20 11:11:03 -06:00
Brian Clements
6c28068d21
Issue #2393 removed pypies interpolation
...
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code
Former-commit-id: 42f7214967
[formerly d35fc591d2
] [formerly fe58826a1e
] [formerly 0f40ae2b99
[formerly fe58826a1e
[formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]]
Former-commit-id: 0f40ae2b99
Former-commit-id: 2a623a799e9a08a389ada1365b70ef555ee0c5d1 [formerly b762864f88
]
Former-commit-id: 10e63616ff
2013-11-20 08:40:12 -06:00
Brian Clements
b7a10192f4
Issue #2495 changed gridslice to use correct dimension datatype
...
Former-commit-id: dc7ad4d465
[formerly 4c3453a657
] [formerly aa24bc6fce
] [formerly 5e7f2f0bdf
[formerly aa24bc6fce
[formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]]
Former-commit-id: 5e7f2f0bdf
Former-commit-id: a6c84a48a463eebfa267a1df2818691820f5dc81 [formerly 05b2a015cb
]
Former-commit-id: 90601f6ff8
2013-11-19 17:53:39 -06:00
Bryan Kowal
6fd3e0873b
Issue #2552 - replace Logger with UFStatus
...
Former-commit-id: 9ac4bb7691
[formerly c938d03deb
] [formerly ff968c9884
] [formerly 0bdb25bf43
[formerly ff968c9884
[formerly 10971eca8d10817c97073c6142ea7cf08b28fa27]]]
Former-commit-id: 0bdb25bf43
Former-commit-id: bced7499ad52dec9e2951c50088549321f9c192b [formerly da148196ac
]
Former-commit-id: be5b0b83c9
2013-11-19 17:11:36 -06:00
Steve Harris
2ed2e93b03
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: 70c79bb7e6
[formerly d1b2cdd566
] [formerly 65ebfc1a18
] [formerly c0bb3a1102
[formerly 65ebfc1a18
[formerly c333fe23736110bcb273aafd90ee6551ff7e921d]]]
Former-commit-id: c0bb3a1102
Former-commit-id: 44a31523c0eab129c3c048ad551394d20361765b [formerly e8c6af3060
]
Former-commit-id: eff32cfbf3
2013-11-19 15:45:06 -06:00
Steve Harris
2c49ed51ac
14.1.1-10 baseline
...
Former-commit-id: 69cef95302
[formerly 8251107646
] [formerly ca0f65bd9a
] [formerly 9248695a1f
[formerly ca0f65bd9a
[formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304
]
Former-commit-id: e35ec60f7e
2013-11-19 16:40:25 -05:00
Lee Venable
1468a92082
Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
...
Former-commit-id: 389f8c5e13
[formerly b6321334e6
] [formerly f8f0a0e41e
] [formerly d42c36f365
[formerly f8f0a0e41e
[formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]]
Former-commit-id: d42c36f365
Former-commit-id: 84cbbb40a445a2c0f18f57bc065371cfaef10f48 [formerly da5cfb3d8e
]
Former-commit-id: c680cc3ea9
2013-11-19 15:12:38 -06:00
Nate Jensen
37f4ecfe9e
Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
...
Former-commit-id: 87a792417c
[formerly f7034f933e
] [formerly c6d6b07e3f
] [formerly a610825ef9
[formerly c6d6b07e3f
[formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]]
Former-commit-id: a610825ef9
Former-commit-id: 4beedd31ac277b5c01f8da9cd36f06a6acf40875 [formerly 04de350ae7
]
Former-commit-id: 789f050b27
2013-11-19 14:11:01 -06:00
Richard Peter
69d4c311b9
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 b0ea563ed196fcd033caf7b14297142a0c4e798f [formerly 4c9bcf718a
]] [formerly b296fd1d02
[formerly 4c9bcf718a
[formerly d3559746302f09db933f9b8deecfe410e63d8430]]]
Former-commit-id: b296fd1d02
Former-commit-id: 33f10b64c5308c0a5cabdcdc5cc87d9788e85a25 [formerly ba8fae576c
]
Former-commit-id: 93dbc58a93
2013-11-19 13:18:05 -06:00
Nate Jensen
cee86da089
Issue #2361 don't initialize derived parameters on shutdown
...
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583
Former-commit-id: cd44881c08
[formerly 83c28fd04b
] [formerly f0d6be27f5ee82f002ddbe68846abd862e00dee1 [formerly c90a7d7b3c
]] [formerly 5aee685557
[formerly c90a7d7b3c
[formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]]]
Former-commit-id: 5aee685557
Former-commit-id: 28a62e8d27dd2659e289060d6d67eda25d130e3e [formerly e9adf706ba
]
Former-commit-id: 48632a81b3
2013-11-19 12:59:10 -06:00
Mike Duff
4d18da0420
Issue #1531 - Made bandwidth utilization graph resizable.
...
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475
Former-commit-id: 31964ce934
[formerly c7c20c6ce8
] [formerly ed73a7e55a
] [formerly 71093a685e
[formerly ed73a7e55a
[formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]]]
Former-commit-id: 71093a685e
Former-commit-id: 12ad71e7abd9db2b712a0ed6f4e8a8e81bf4cc49 [formerly 437df90354
]
Former-commit-id: 8f9b847eff
2013-11-19 12:51:06 -06:00
Nate Jensen
2cc539c3d3
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 5885d8027b
[formerly 6927e960b2
[formerly 59c62c673625d7e87b3b86575b8ebfb9e328ff28]]]
Former-commit-id: 5885d8027b
Former-commit-id: a8aba4eda4a927d292566c88bac7dcffae609ef3 [formerly be3d016f93
]
Former-commit-id: aba433c4bb
2013-11-19 11:25:19 -06:00
Steve Harris
69710c8f63
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 39ab54c912
[formerly c37908caa8
[formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]]]
Former-commit-id: 39ab54c912
Former-commit-id: f2b3feeb03238e38bba68b87041e15e6592d811b [formerly 94a60728ca
]
Former-commit-id: 7b9bc1ae90
2013-11-19 10:08:45 -06:00
Mike Duff
fd5a8b283d
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 665d9e7651
[formerly c908647259
[formerly cacc7a8560c589b24ea98191f152c31479c5631e]]]
Former-commit-id: 665d9e7651
Former-commit-id: fa1699e3e40e15a4fba251ecf2b68f464c00c042 [formerly 5afa90b967
]
Former-commit-id: 8221f50e8a
2013-11-19 08:55:27 -06:00
Nate Jensen
32737415fc
Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
...
Former-commit-id: 629d611145
[formerly accbd46ad6
] [formerly edf51dffc9
] [formerly 3d51d80170
[formerly edf51dffc9
[formerly b6420738e49d37840789c88089ecc8bab1103284]]]
Former-commit-id: 3d51d80170
Former-commit-id: d7ac7a454945a6f649dfab52f167467ddb507d1e [formerly f07f543cd3
]
Former-commit-id: 7da95f7b57
2013-11-18 12:50:38 -06:00
Nate Jensen
f640ecf96e
Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
...
Former-commit-id: b64c20e99c
[formerly 493cdb287c
] [formerly 0dbe79344a
] [formerly 827b7f5a93
[formerly 0dbe79344a
[formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]]
Former-commit-id: 827b7f5a93
Former-commit-id: ab02400e12a733ec9507e8ac73837821fa31df90 [formerly 6900d4e47f
]
Former-commit-id: 3de7e3576b
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
8e2b4353cc
Issue #2543 fix gl buffer formating problems
...
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc
Former-commit-id: 830a28498b
[formerly 6b6c46afa8
] [formerly 105e3e359a
] [formerly e7a068e595
[formerly 105e3e359a
[formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]]
Former-commit-id: e7a068e595
Former-commit-id: ae49586b08f646c42f059223597489c739f0cdce [formerly e605758e57
]
Former-commit-id: 51c04680e2
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
00088654a0
Issue #2544 Fix recycling issues with Satellite resources.
...
Former-commit-id: 0a3d78555e
[formerly 15ae95075d
] [formerly e392185d78
] [formerly 9ff1751f4e
[formerly e392185d78
[formerly 166957a22c3447fa2407b13362eece24943675c9]]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 775873b42354a16c60bda95506731f0ccdc6e548 [formerly 1875f56695
]
Former-commit-id: 0788a82a99
2013-11-18 11:44:56 -06:00
Nate Jensen
f9cdff25f0
Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
...
Former-commit-id: 9740e25c5e
[formerly 93e93de742
] [formerly 4f47800cae
] [formerly 0146ae59df
[formerly 4f47800cae
[formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]]
Former-commit-id: 0146ae59df
Former-commit-id: d73c34612b91ec5b6776253d400f6c0d34b344e2 [formerly a238ba2ba3
]
Former-commit-id: d9d0eb7354
2013-11-18 11:39:12 -06:00
Steve Harris
582813fab6
Merge branch 'master_13.5.3' into development_on_RHEL5
...
Former-commit-id: 5ef89f10a1
[formerly 58325f2c17
] [formerly 47874034f5c951c29f2a6366891ede0a7d699ed0 [formerly be0f3bf912
]] [formerly d810aacaaa
[formerly be0f3bf912
[formerly 648659c6a364b85a8531f24910ab535c9bcf73ce]]]
Former-commit-id: d810aacaaa
Former-commit-id: 91838a405f0441744a78ba5ded1f77d0c0ed5f87 [formerly 8ca6f8d14b
]
Former-commit-id: c86e70be8c
2013-11-15 13:19:01 -06:00
Steve Harris
3b074763ab
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 6d9efac6ef
[formerly 0a36987a01
[formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 1978596c628755147b84f2d7e363ca602a98cedf [formerly 869b505f80
]
Former-commit-id: 3f9df61017
2013-11-15 13:15:25 -06:00
Steve Harris
b1d82b9c2c
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 2f0d53c9b2
[formerly 1015e180f1
[formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: 72d35279c7375fe7db3bdc163cd5fbd4a655ec1d [formerly d97edb20d1
]
Former-commit-id: 156395b85b
2013-11-15 13:05:40 -06:00
Steve Harris
7977f24d77
14.1.1-9 baseline
...
Former-commit-id: ba884f2a27
[formerly a32eadf384
] [formerly f8f995b697
] [formerly 5a0a40e67c
[formerly f8f995b697
[formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d
]
Former-commit-id: eab5bb1147
2013-11-15 12:47:49 -05:00
Steve Harris
c52a724799
13.5.3-8 baseline
...
Former-commit-id: ed8ef11cb8
[formerly e644eb9219
] [formerly 4029c51fbf
] [formerly b05ffb2108
[formerly 4029c51fbf
[formerly 5623700c1cde2020ca0a8322edbfcf56afacb604]]]
Former-commit-id: b05ffb2108
Former-commit-id: fecf6ab52aeb75463fdc9128c8ec88a97cf188f0 [formerly e86f211430
]
Former-commit-id: 28e5c8f540
2013-11-15 09:28:00 -05:00
Brad Gonzales
66a8a30092
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 53d4de12d9
[formerly aa8fb36fc1
[formerly f570f6fcd64a96b7c61eecdfae6a765ec643e718]]]
Former-commit-id: 53d4de12d9
Former-commit-id: e3193236411f9e577590904b1ee3e08e4ab9ffd5 [formerly 490c95d010
]
Former-commit-id: 4ec5ee7f74
2013-11-15 08:00:47 -06:00
Nate Jensen
d8f4ecc2d7
Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
...
startup
Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700
Former-commit-id: 462878bf86
[formerly 757ca42a5f
] [formerly dd99aa3f47
] [formerly 78b01f61c4
[formerly dd99aa3f47
[formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 78b01f61c4
Former-commit-id: dc8aea52f7c970fb95e7d9d99a858f44faa15501 [formerly d96cdbe761
]
Former-commit-id: d0d712ec6f
2013-11-14 17:41:24 -06:00
Mike Duff
bc96849913
Issue #2548 - fix malformed comment
...
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034
Former-commit-id: 24dc37f03b
[formerly 0d83797a4e
] [formerly 414cb1cf68
] [formerly 95fda38cc5
[formerly 414cb1cf68
[formerly 52462f299735aacee3db09faa6db9f28ba91f552]]]
Former-commit-id: 95fda38cc5
Former-commit-id: 041b2afc87e9fd510c3e653e8424f02271121cc3 [formerly 7be43c4a52
]
Former-commit-id: a13aa64b65
2013-11-14 17:30:55 -06:00
Richard Peter
586b11c80d
Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
...
Former-commit-id: 979fa16d04
[formerly 157e739623
] [formerly 14b1e924a1
] [formerly 0bb5e2a61e
[formerly 14b1e924a1
[formerly dba301df2f593baa951c14b684e7ce4794e32019]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 29857e1e475c9363f0f62efb31ac6cf02ee6e84f [formerly 1a7dd7723b
]
Former-commit-id: 65e8ad1a62
2013-11-14 17:21:48 -06:00
Brian Clements
7625e0ef16
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 a741cec01e3c674aef92a9cc8641d62be829d023 [formerly cacdf313c5
]] [formerly 00490c2db2
[formerly cacdf313c5
[formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]
Former-commit-id: 00490c2db2
Former-commit-id: 8742dd3b5b719d9daf15294c04f9699017a3a49b [formerly ab24330f23
]
Former-commit-id: 878a677d18
2013-11-14 17:12:02 -06:00
Mike Duff
0f848918e8
Issue #2548 - Add a subscription type slot for uniqueness.
...
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa
Former-commit-id: 223901d9cf
[formerly 8cc9c1de59
] [formerly 47011a70db
] [formerly 47a0477587
[formerly 47011a70db
[formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]
Former-commit-id: 47a0477587
Former-commit-id: 33980f8e6df3009e6c047cfc2074778085a37612 [formerly b929b7aa02
]
Former-commit-id: 44cc3d8776
2013-11-14 17:07:54 -06:00
Nate Jensen
31392685aa
Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development
...
Former-commit-id: 2d5752d3d6
[formerly 3b11ea8c5b
] [formerly b4bcd14a85
] [formerly c2aacfc437
[formerly b4bcd14a85
[formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]]
Former-commit-id: c2aacfc437
Former-commit-id: dcba58ed57cf3e8859d8471e47fda78c0e7ef984 [formerly a8a1e396fe
]
Former-commit-id: f0a0287230
2013-11-14 16:34:28 -06:00
Bryan Kowal
e810496889
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 ce16efc9a1
[formerly be78fab116
[formerly 283853ead3588ef8ea296507b11a9ee9a23e9236]]]
Former-commit-id: ce16efc9a1
Former-commit-id: 5e386da33f46128ec2187010bd711c2f5ecf11d8 [formerly a6ea71d46f
]
Former-commit-id: 512fc1a7c1
2013-11-14 15:17:28 -06:00
Richard Peter
b9da33bcea
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 9bebb21be8
[formerly 800effdc5a
] [formerly 8fb79e7b73
] [formerly c42f931118
[formerly 8fb79e7b73
[formerly 13d284277bed2f0f731547ec443a262556df997c]]]
Former-commit-id: c42f931118
Former-commit-id: d0ba6f0b34d98e888dee8eca0e8a59d14ff6436f [formerly 2b95bcfb31
]
Former-commit-id: e5dc8e2027
2013-11-14 14:56:59 -06:00
Lee Venable
0e326c2a12
Merge "Issue #2538 - Check for existing adhoc queries in registry. Peer review comments" into development
...
Former-commit-id: 2f134e6aa3
[formerly bd81ec8807
] [formerly 834c2ac8da
] [formerly f0ebee3bb3
[formerly 834c2ac8da
[formerly 83b799d6d2475898a547fa7763c5613bd1c163d9]]]
Former-commit-id: f0ebee3bb3
Former-commit-id: a74585351b2263565cb70d9d704cba8fb765886e [formerly 7d04b2e4ce
]
Former-commit-id: e9b8ee42c7
2013-11-14 14:43:18 -06:00
Mike Duff
b27ee6803f
Issue #2538 - Check for existing adhoc queries in registry.
...
Peer review comments
Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0
Former-commit-id: c3aee76403
[formerly f6c4ca2bc0
] [formerly 87a4b1bec4
] [formerly a80964bc7c
[formerly 87a4b1bec4
[formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]
Former-commit-id: a80964bc7c
Former-commit-id: 0ded51344d49c52b18e3738df599260571f7155a [formerly 4557a06f42
]
Former-commit-id: 48093514a6
2013-11-14 14:40:33 -06:00
Richard Peter
625647a717
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 0074b774f0
[formerly 79bdd34f4f
[formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]
Former-commit-id: 0074b774f0
Former-commit-id: 9dbc5783e450aca6291faa5547b5b3369711eda7 [formerly 96b4944b41
]
Former-commit-id: b4aac09ff4
2013-11-14 14:40:23 -06:00
Lee Venable
b93b05165c
Merge "Issue #2540 - pure python module merge implementation" into development
...
Former-commit-id: d42589d14f
[formerly 6086c06f66
] [formerly d431f3c0f4
] [formerly bc7f5e556d
[formerly d431f3c0f4
[formerly dbb67d3e8dd56c057626f499b2e3aa6b06eac41f]]]
Former-commit-id: bc7f5e556d
Former-commit-id: 8b1c54f60a8cccda08a50dac70415ec886062e9b [formerly 17fef206fc
]
Former-commit-id: 69934b9b32
2013-11-14 14:33:18 -06:00
Richard Peter
df3e6735af
Merge "Issue #2505 removed recco from deployment" into development
...
Former-commit-id: 7c5e85a288
[formerly 5c5e71a01b
] [formerly 4d18c7d493
] [formerly 3f5c590c5f
[formerly 4d18c7d493
[formerly 3e92bb969aef3508f08eb55a2ef1903030abc525]]]
Former-commit-id: 3f5c590c5f
Former-commit-id: 493a9f0f3191b9c74a85050ff2e11f14b925c249 [formerly 3dc0ad184c
]
Former-commit-id: 6af248f212
2013-11-14 13:30:09 -06:00
Nate Jensen
ddcca3463d
Issue #2361 remove StyleManager's use of SerializationUtil and
...
ISerializableObject
Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a
Former-commit-id: 9517c96d68
[formerly a4eb19fc79
] [formerly b7f992b9856796b232897d2f5aa72126f4eed83b [formerly 9acda0b9f2
]] [formerly c5cf68cc45
[formerly 9acda0b9f2
[formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]
Former-commit-id: c5cf68cc45
Former-commit-id: a2b53d6aca5047e5514931e92e017ed5771c890d [formerly a6be904c69
]
Former-commit-id: e41f57da67
2013-11-14 13:29:30 -06:00
Bryan Kowal
8a0b0667de
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 7e35ea310f
[formerly 2029c34f24
[formerly c0595b49cab0d0ef636427ed3b31ea805f8adb43]]]
Former-commit-id: 7e35ea310f
Former-commit-id: 90670353179a78bde76d7ccb60b47f097fef7acd [formerly a2261b9ff3
]
Former-commit-id: 4759e48c5c
2013-11-14 11:57:11 -06:00
Steve Harris
d6ef4ae259
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 361df767a8
[formerly 77ea1782c3
] [formerly 473488f5b8
] [formerly 4d25eb11c8
[formerly 473488f5b8
[formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]]
Former-commit-id: 4d25eb11c8
Former-commit-id: 282970560ec2ee6eee13b9272e753fbb7d551416 [formerly ef852ac125
]
Former-commit-id: a75acc5499
2013-11-13 23:20:18 -06:00
Richard Peter
42ac155685
Merge "Issue #1686 Fixed GetAuditTrailByTimeInterval registry canonical query" into development
...
Former-commit-id: 9e4949eeb9
[formerly adc30e817e
] [formerly 2f3eee1439
] [formerly e88f5777a7
[formerly 2f3eee1439
[formerly aa4b24c6ec834a3a33dcdb4a1b04645d17f2511f]]]
Former-commit-id: e88f5777a7
Former-commit-id: 5c494cb47ccf4d7292296be310025fbd46ce817f [formerly 64afe42e74
]
Former-commit-id: ed258e9421
2013-11-13 16:43:26 -06:00
Greg Armendariz
2d92a5719c
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 3f6281fdbe
[formerly 83ac36721b
[formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]]]
Former-commit-id: 3f6281fdbe
Former-commit-id: a557332626ac393163cd374e7ee121dc81df86a4 [formerly ce0a05242f
]
Former-commit-id: b7c3a7e850
2013-11-13 15:30:55 -06:00
Brian Clements
b5b94646cf
Issue #2505 removed recco from deployment
...
added update script to drop recco from db
Former-commit-id: 3204a2f7b5
[formerly 3551b731e0
] [formerly 95f1621d3e
] [formerly 8cbe2c06a8
[formerly 95f1621d3e
[formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: 3b2b0c50ce7169049fcf9a2ade66e9157fc2cf81 [formerly 49c8bd5ee9
]
Former-commit-id: d2f0b73626
2013-11-13 13:45:44 -06:00
Bryan Kowal
ce40d40304
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 0544b66f4e
[formerly 86dd200844
[formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]
Former-commit-id: 0544b66f4e
Former-commit-id: 9fef8ee66c8d7456504fc2bc5dcebeba0b756974 [formerly 01735ca0c4
]
Former-commit-id: a2b1211c52
2013-11-13 13:16:55 -06:00
Steve Harris
6af0dcf567
Merge branch 'master_14.1.1' into omaha_14.1.1
...
Former-commit-id: 3e8014e9f8
[formerly eb470599f3
] [formerly 0a37219d2a
] [formerly 2e7a594d51
[formerly 0a37219d2a
[formerly ebde6dc849a1ca9753f959423109186c836b4525]]]
Former-commit-id: 2e7a594d51
Former-commit-id: 30e7b1a9427f9e36f5c8eb8e65eb8f79733ce8fb [formerly bc45f3668b
]
Former-commit-id: 80c709b3f4
2013-11-13 11:34:17 -06:00