Nate Jensen
|
3cfb49215f
|
Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141
Former-commit-id: 16074e6a14 [formerly 27f09b8096 ] [formerly 6064000389 ] [formerly b36d28c9fd [formerly 6064000389 [formerly 2626a79c976ac016352a091bdf66890e929edc85]]]
Former-commit-id: b36d28c9fd
Former-commit-id: e86e430428d15356370e7a0929a62a10de34aaa1 [formerly 3e3400dc7c ]
Former-commit-id: 5d2ec98600
|
2013-11-04 14:30:00 -06:00 |
|
Nate Jensen
|
73117fd1ce
|
Issue #2361 remove XML annotations from bufrmos
Former-commit-id: e7f7b77e3c [formerly b1409d4002 ] [formerly 9b9d57bc94 ] [formerly 1a25186415 [formerly 9b9d57bc94 [formerly f6a873e20e4cb7ce6fb47654ce3292b4f3bab99e]]]
Former-commit-id: 1a25186415
Former-commit-id: 5eae392eb0ff88203cd5c173328a6f33e1e2156c [formerly b2847dd446 ]
Former-commit-id: 173bff3eb8
|
2013-11-04 13:34:01 -06:00 |
|
Ben Steffensmeier
|
1fc23c3992
|
Issue #2502 Add data access factory for model sounding.
Former-commit-id: 5d1fb6d4e4 [formerly bebfcc7555 ] [formerly e02ace2809 ] [formerly c2b14489bc [formerly e02ace2809 [formerly 65758112879a9007adb5c83721e47217b5eb1cd6]]]
Former-commit-id: c2b14489bc
Former-commit-id: fbc1abf40a555c45b4f470dadf70c9fbe6ef8af3 [formerly bf3bed979f ]
Former-commit-id: 226e5b2261
|
2013-11-04 11:42:26 -06:00 |
|
Steve Harris
|
29b6991e03
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 0dd6732b0e [formerly 569ecb35d5 ] [formerly 3c862170db ] [formerly 18609de83d [formerly 3c862170db [formerly dbbf326f4fbfb3e07c97f6a7c380fa7e37544b72]]]
Former-commit-id: 18609de83d
Former-commit-id: 5a251bd0f0dbb41c6b3c857dc4057527e0a819bf [formerly 5f71d7795f ]
Former-commit-id: 7031baf4ef
|
2013-11-01 13:23:28 -05:00 |
|
Steve Harris
|
a4cc3f0bf6
|
13.5.3-4 baseline
Former-commit-id: 667ec69fbc [formerly 0ee69293ec ] [formerly 8aeae1c481 ] [formerly da7d1ce05e [formerly 8aeae1c481 [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]]
Former-commit-id: da7d1ce05e
Former-commit-id: 7369078223f22949c985fdf82f677dcb829640f5 [formerly b8d3fd62d0 ]
Former-commit-id: 7454b37d59
|
2013-11-01 14:20:00 -04:00 |
|
Nate Jensen
|
97ddb715af
|
Issue #2361 remove XML annotations from TAF and CCFP
Former-commit-id: bc61b966b0 [formerly c52c207c80 ] [formerly 942936e815 ] [formerly cd49daccf9 [formerly 942936e815 [formerly 2587a9b13ec6576007081a165f6042dd5a82b7eb]]]
Former-commit-id: cd49daccf9
Former-commit-id: 88bb0c0a4afa8b6b966ef66dfd8c75302ba2c2cb [formerly d935c4f547 ]
Former-commit-id: a6cfeb5626
|
2013-11-01 13:19:28 -05:00 |
|
Nate Jensen
|
a9a4963f09
|
Issue #2361 move ebxml away from using SerializationUtil for XML processing
Change-Id: I04decec05b44a9c1881963f1a902adf6742aafa9
Former-commit-id: 37eaab4490 [formerly 2e28d72fb7 ] [formerly 2413c854c0 ] [formerly 5efd1b7218 [formerly 2413c854c0 [formerly ebf2c3c32945fefe8fd8c054b163fba238ac0ee5]]]
Former-commit-id: 5efd1b7218
Former-commit-id: c4286e81e6c3ef5daac753ed4597591ab4297c22 [formerly f4cdcb2fae ]
Former-commit-id: 3753b45c0c
|
2013-11-01 12:09:43 -05:00 |
|
Greg Armendariz
|
cbf9f6fe6b
|
Issue #2509 - Fix merge issue
Former-commit-id: 7ab7156b61 [formerly a281147055 ] [formerly b4c3337ffd ] [formerly fadf9346d2 [formerly b4c3337ffd [formerly d742b452ab114935b76cb9097db7d6a08651bb2e]]]
Former-commit-id: fadf9346d2
Former-commit-id: 4f461d5d2d81a6c8c37fb34ea3a2a847bafb9adc [formerly d530a65ee3 ]
Former-commit-id: 1561f091e3
|
2013-11-01 10:31:08 -05:00 |
|
Dave Hladky
|
fd96474a8b
|
Issue #2292 Stopped subscriptions from checking against themselves. This prevented subscriptions from being updatable.
Former-commit-id: 07c70d72cc [formerly 1594cc6a72 ] [formerly e5896397f6 ] [formerly 422dabf3eb [formerly e5896397f6 [formerly 6edfeb94cfb14785d68d90b41fc636faa2ece074]]]
Former-commit-id: 422dabf3eb
Former-commit-id: c56edc32fb745fdee96b63e71aaf76cca3d28fa8 [formerly ca1f2fc340 ]
Former-commit-id: d589bced40
|
2013-11-01 10:23:56 -05:00 |
|
Benjamin Phillippe
|
e9b49b288f
|
Issue #1538 Moved data delivery specific web services out of registry plugins
-- Added registry federation admin page
-- Made registry service clients non-static
Change-Id: I9672f11b4886019dcd8834b4bae417a0aa4809ad
Former-commit-id: 311fa32377 [formerly 98b56cf02a ] [formerly a7e53870fb ] [formerly d8de923f8b [formerly a7e53870fb [formerly 0a67c8d68548ed8daa76d782ca3213956b984795]]]
Former-commit-id: d8de923f8b
Former-commit-id: 628fd3115dbabe88f9d202b5257352679e5c521b [formerly 221d197c01 ]
Former-commit-id: 7cb19682c1
|
2013-11-01 09:20:00 -05:00 |
|
Dave Hladky
|
ea17726866
|
Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
Change-Id: I75269bad24731990720d30683ebf5f27344661f3
Former-commit-id: f79ba58a3a [formerly 0eba787d3e ] [formerly 4227f3a59f ] [formerly 9161962813 [formerly 4227f3a59f [formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]]]
Former-commit-id: 9161962813
Former-commit-id: cc3ebf4fc7bd5a908a51ab6d7ccbfde59ee5656b [formerly d55d68fe5a ]
Former-commit-id: ba31efaf03
|
2013-11-01 08:23:16 -05:00 |
|
Nate Jensen
|
685c6034b2
|
Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: caa08095d8 [formerly b986638bc5 ] [formerly 43b2f50a0a ] [formerly 0270e6bde3 [formerly 43b2f50a0a [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 1d11102b6e40b4f27646f1cf7aba32281be912e3 [formerly 47fc100053 ]
Former-commit-id: 6ed6df6ed0
|
2013-10-31 18:11:13 -05:00 |
|
Bryan Kowal
|
874bd8aa36
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Former-commit-id: fd5a5096de [formerly 04bcd7e6dc ] [formerly 49422aea62 ] [formerly d08a652e23 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]
Former-commit-id: d08a652e23
Former-commit-id: 2f7241bd44af27a962760419963b91198396fa99 [formerly adb62df96a ]
Former-commit-id: d53ec9c750
|
2013-10-31 15:43:29 -05:00 |
|
Bryan Kowal
|
d3062ea58f
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 5164a7c0b1 [formerly 38464427d3 ] [formerly feaacd9356 ] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934 ]
Former-commit-id: f02d4b7a0b
|
2013-10-31 15:34:46 -05:00 |
|
Ben Steffensmeier
|
d27369f59b
|
Issue #2491 Fix collaboration Xml.
Former-commit-id: 0bcf7f77c0 [formerly a5f970e238 ] [formerly 76b03c41b24dd6bcae696afd2a7ee339f6c0f727 [formerly 3d36cec7be ]] [formerly fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]
Former-commit-id: fdeff81da2
Former-commit-id: 6d36de8b83b8bd6d75e28507dfdb4314d2a89f81 [formerly 49ffb7e92c ]
Former-commit-id: 89c999410e
|
2013-10-31 14:06:37 -05:00 |
|
Ron Anderson
|
dd1b50d116
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: f0529e0eee [formerly b61ccc1609 ] [formerly 38e33092a2 ] [formerly 42e924e021 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]
Former-commit-id: 42e924e021
Former-commit-id: e573e83de25a263065e03ab739ab5d58c0ca7fb1 [formerly eef9d2dfb0 ]
Former-commit-id: 2f23072e41
|
2013-10-31 14:04:55 -05:00 |
|
Steve Harris
|
23a1f33d89
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 056b2fa457 [formerly 7768ee1c36 ] [formerly 2257eb5ddd ] [formerly 855b444073 [formerly 2257eb5ddd [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]]]
Former-commit-id: 855b444073
Former-commit-id: 2c8c708ed1c375e99805b56ce3ded641d901d6ca [formerly 83dc6d8e2a ]
Former-commit-id: c953a6574d
|
2013-10-31 11:58:04 -05:00 |
|
Steve Harris
|
3a5911368f
|
13.5.3-3 baseline
Former-commit-id: 8df88e1b77 [formerly 883ad32443 ] [formerly 7262d8048f574b9f53c07b9d52160b617af83270 [formerly baa036cd62 ]] [formerly 1503847a4b [formerly baa036cd62 [formerly c261e0753eb106a2912314056a1b4903695750c5]]]
Former-commit-id: 1503847a4b
Former-commit-id: e27f6359a046d1d0047ec0fc1c24c9d171c5bf82 [formerly 6b879b2465 ]
Former-commit-id: a58b825dde
|
2013-10-31 12:52:07 -04:00 |
|
Richard Peter
|
7b0ad6bacc
|
Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 2b9cf07bfe [formerly 5048d010f5 ] [formerly 3139055873 ] [formerly b482eb2b48 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]
Former-commit-id: b482eb2b48
Former-commit-id: f7dbb5f3661236898b603e2fdf7604e44f42274a [formerly 73462fa134 ]
Former-commit-id: fca3d73aa7
|
2013-10-31 11:46:25 -05:00 |
|
Mike Duff
|
ce2afdf1b3
|
Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: fbcf271899 [formerly c1bd170f8a ] [formerly f123fa11f5 ] [formerly 3fc811102e [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]
Former-commit-id: 3fc811102e
Former-commit-id: ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461 ]
Former-commit-id: b0c54d7c17
|
2013-10-31 09:22:50 -05:00 |
|
Greg Armendariz
|
83262b6cc4
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 795d6cf541 [formerly 0daf07742e ] [formerly f6d98d6317 ] [formerly 64dd62005b [formerly f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]
Former-commit-id: 64dd62005b
Former-commit-id: 3a7bea98c42e7d77a7480bbc262fa233cb1f6a6b [formerly 4fb0e0bd2f ]
Former-commit-id: 5cf091c499
|
2013-10-30 14:52:16 -05:00 |
|
Steve Harris
|
eff76c3566
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 67ab6c135e [formerly 5aac54b9f9 ] [formerly 0ab03f2796 ] [formerly 83d2194a5a [formerly 0ab03f2796 [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]
Former-commit-id: 83d2194a5a
Former-commit-id: f7cdd9e73c5d19a1d50e670a5eeceaa5bc626e90 [formerly 0efff318b8 ]
Former-commit-id: 771be074c0
|
2013-10-30 12:36:53 -05:00 |
|
Steve Harris
|
fef629ce26
|
13.5.3-2 baseline
Former-commit-id: 235d1f8583 [formerly c6d951b390 ] [formerly 055783655b ] [formerly 6d85d944a6 [formerly 055783655b [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]
Former-commit-id: 6d85d944a6
Former-commit-id: 08cfc6740d0a1f987b0743cf3f07ab435cbb6ddc [formerly aef0e828d2 ]
Former-commit-id: 0c17777164
|
2013-10-30 12:53:25 -04:00 |
|
David Gillingham
|
2ddacaea30
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: ab3b629a6b [formerly c58160c9a9 ] [formerly 297fd6c3d4 ] [formerly b7b29a1fdb [formerly 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 0f0aefb2c1b9d5dfbee8cd33020b863e61f2b01f [formerly 996817f124 ]
Former-commit-id: 68b0b2e3db
|
2013-10-30 11:34:46 -05:00 |
|
Nate Jensen
|
937981d2f9
|
Merge "Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code" into development
Former-commit-id: 79eb4d400a [formerly 411b909107 ] [formerly d92bd5b69a ] [formerly 62a5739feb [formerly d92bd5b69a [formerly 05de1d88cdc4841483864a623346ad16b015d395]]]
Former-commit-id: 62a5739feb
Former-commit-id: 9bd9983d48f00002ef7fd475ecf0bf5a3403c4c1 [formerly 5c4d8b4310 ]
Former-commit-id: 90d99fe627
|
2013-10-30 11:28:58 -05:00 |
|
Brad Gonzales
|
d1d0dc770e
|
Issue #2267 Removed java.nio.file dependencies from FilenameFilter.
Change-Id: I6af1cafe17609a6468a7805ccab61b28ecc0a733
Former-commit-id: 95afe3cd1e [formerly 433ee7d942 ] [formerly 011c42b806 ] [formerly 057ba113b5 [formerly 011c42b806 [formerly 36571478911119efe7195d51f6c820d6e745ccee]]]
Former-commit-id: 057ba113b5
Former-commit-id: 65615958da30edfa31cf83debed3017ef1f056db [formerly 9325d477a9 ]
Former-commit-id: 3c0bd6db16
|
2013-10-29 17:04:00 -05:00 |
|
Brad Gonzales
|
bf1d2cb85a
|
Issue #2267 Remove java.nio.file dependencies from the SbnSimulator. Fixed handler setting for UFStatus in test env.
Change-Id: I8245eef53573b6596546e17a7900a1538455cee2
Former-commit-id: 250730c308 [formerly ac8136bd82 ] [formerly f1480cfc62 ] [formerly 6bc585aaf6 [formerly f1480cfc62 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]]]
Former-commit-id: 6bc585aaf6
Former-commit-id: 3ebdb55d0083b9e2bf2524a8b3b7cd9acaf899a2 [formerly aeccaa2329 ]
Former-commit-id: 47690ea8d0
|
2013-10-29 15:10:20 -05:00 |
|
Nate Jensen
|
dced4c4d11
|
Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: a18df07586 [formerly 554a9cddf3 ] [formerly f3143ba7b4 ] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]
Former-commit-id: 6880a18f1a
Former-commit-id: df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e ]
Former-commit-id: 19043faeaa
|
2013-10-29 14:33:53 -05:00 |
|
Dave Hladky
|
fab58a547c
|
Issue #2361 Moved to private JAXB
Former-commit-id: c863bb2c97 [formerly be351c82ed ] [formerly 5b5e1ca293 ] [formerly 33a0890d31 [formerly 5b5e1ca293 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]]]
Former-commit-id: 33a0890d31
Former-commit-id: 6708b8f73ec0bd3504932f11002f618a7640713b [formerly b55b05fa8b ]
Former-commit-id: 3eff51897b
|
2013-10-29 13:45:05 -05:00 |
|
Dave Hladky
|
ba1de528c3
|
Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: 91e69b800d [formerly f5b9d3be39 ] [formerly 7d0bb5825fabe6056e054ebed4b8de6346b820b9 [formerly 6cb541d1a1 ]] [formerly 15aed68c02 [formerly 6cb541d1a1 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]]]
Former-commit-id: 15aed68c02
Former-commit-id: 0423445a8ccf01b94283305bba59e4481390d48e [formerly a8ab9072cc ]
Former-commit-id: b5e309f973
|
2013-10-29 13:05:47 -05:00 |
|
Nate Jensen
|
7ab5fe0249
|
Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: e38de1ea51 [formerly c45f619260 ] [formerly a5f2414070 ] [formerly 4879c19e0b [formerly a5f2414070 [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]]]
Former-commit-id: 4879c19e0b
Former-commit-id: 78c6fcd26016e4e02e9043303063932ef64058c0 [formerly 4929a59b3e ]
Former-commit-id: 96c901b958
|
2013-10-29 12:31:08 -05:00 |
|
Dave Hladky
|
8e3023b575
|
Issue #2361 Harvester JAXB fixed up
Former-commit-id: daf770c215 [formerly 1deca13487 ] [formerly 70d2ad2cdc ] [formerly bcfa7d7a8f [formerly 70d2ad2cdc [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]]]
Former-commit-id: bcfa7d7a8f
Former-commit-id: 4a4db7d882a3b343c5cb1266afa5a2391bddced2 [formerly c5137923c0 ]
Former-commit-id: 1a889e84b1
|
2013-10-29 12:20:53 -05:00 |
|
Richard Peter
|
e5ae2ac89f
|
Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: f5208d359a [formerly 6cdbad069a ] [formerly 1d85220363 ] [formerly 1b7b6f0134 [formerly 1d85220363 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]]]
Former-commit-id: 1b7b6f0134
Former-commit-id: 0cd653cbbf4d6de4d91974c87380cb964aeb3f6f [formerly c27c764c61 ]
Former-commit-id: 4b612a3fa0
|
2013-10-29 12:18:55 -05:00 |
|
Richard Peter
|
4386e3b451
|
Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: 767cbbf4f2 [formerly 5f1c6f5625 ] [formerly f75b431a40 ] [formerly 89b992c01c [formerly f75b431a40 [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]]]
Former-commit-id: 89b992c01c
Former-commit-id: e5e56997f9e05d9ac3a79690595406c220de7aa3 [formerly c56806b9b7 ]
Former-commit-id: 66d7ccb859
|
2013-10-29 12:17:14 -05:00 |
|
Richard Peter
|
b4c3c775f6
|
Merge "Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box." into development
Former-commit-id: 8b8f09f176 [formerly bfc87a0607 ] [formerly fe45d2b7e6 ] [formerly b6ffed0066 [formerly fe45d2b7e6 [formerly ef99656b07406288bf419037b05e85a5cf5771d6]]]
Former-commit-id: b6ffed0066
Former-commit-id: d90ab5bca99a3ce62195970bf8966d8c71b5ec87 [formerly 4765eaefad ]
Former-commit-id: 5baa99e9c9
|
2013-10-29 12:15:35 -05:00 |
|
Ben Steffensmeier
|
552f33af6e
|
Issue #2489 Fix SfcObs NPE.
Former-commit-id: 4f29903ddc [formerly 59d8afc639 ] [formerly f9ee49fac5 ] [formerly ddf506ceac [formerly f9ee49fac5 [formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]]]
Former-commit-id: ddf506ceac
Former-commit-id: d7e2058fb64a230ba953b4f8ca0bc8b0b881fbe4 [formerly ca5a125829 ]
Former-commit-id: 32427d8b3d
|
2013-10-29 10:59:36 -05:00 |
|
Steve Harris
|
0be97d503a
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: f25d638bc2 [formerly a103a0e8ac ] [formerly 560b0075cd ] [formerly 6ea4ac62ed [formerly 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: c51eafcb852c1a8282b6694b8e25e7101b5a76bb [formerly eced243e6a ]
Former-commit-id: 3b29cf6790
|
2013-10-28 15:58:12 -05:00 |
|
Bryan Kowal
|
3e68d9aaac
|
Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: 90a54524c6 [formerly df575b7be1 ] [formerly a6d7822698 ] [formerly cda8d04831 [formerly a6d7822698 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]]
Former-commit-id: cda8d04831
Former-commit-id: 3fa0f0dac5587960c496629c316aa2a1a2f464bc [formerly cc0f6832c9 ]
Former-commit-id: 27d2e33769
|
2013-10-28 14:50:28 -05:00 |
|
Steve Harris
|
dd533f0bce
|
Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: a474e60927 [formerly f04be86698 ] [formerly 602f138493 ] [formerly 972339d60f [formerly 602f138493 [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]
Former-commit-id: 972339d60f
Former-commit-id: 9a8e1c383979dad1eabd28f3f1501bac50b45b28 [formerly 4c0599bae8 ]
Former-commit-id: a444c93ee7
|
2013-10-28 14:39:22 -05:00 |
|
Ron Anderson
|
306a5d72f4
|
Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c ] [formerly fa5b6dce02 ] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1 ]
Former-commit-id: 3575496955
|
2013-10-28 12:59:44 -05:00 |
|
Ben Steffensmeier
|
2400380daf
|
Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721 ] [formerly 27165cea30 ] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e ]
Former-commit-id: 0e3cf8b47f
|
2013-10-28 10:14:08 -05:00 |
|
Steve Harris
|
2039d101ef
|
14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a ] [formerly 20443a5d933e8268c1fb3f455df197a71fca1203 [formerly bd95bb6a4e ]] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e ]
Former-commit-id: b60635cd70
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
2d30611c6d
|
14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229 ] [formerly 94f24e0d8a ] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea ]
Former-commit-id: aa59400b67
|
2013-10-28 10:46:02 -04:00 |
|
Steve Harris
|
2fbc08d837
|
13.5.3-1 baseline
Former-commit-id: 9577afee9e [formerly 059083170d ] [formerly 1d8a2026f6 ] [formerly 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0 ]
Former-commit-id: 06f5dcf801
|
2013-10-28 10:30:57 -04:00 |
|
Nate Jensen
|
fa1bd6b2a4
|
Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2 ] [formerly 4b19d287ea ] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a ]
Former-commit-id: 8aa02150c4
|
2013-10-28 09:07:04 -05:00 |
|
Ben Steffensmeier
|
694511af94
|
Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72 ] [formerly 2a83b45f93 ] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456 ]
Former-commit-id: 4eea088717
|
2013-10-25 15:50:10 -05:00 |
|
Steve Harris
|
426b0662dc
|
Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
Former-commit-id: 116d3822ac [formerly 64062fa355 ] [formerly 702b66ee52 ] [formerly ca54ffaad1 [formerly 702b66ee52 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 01e9c332c0bd50e8e46a912a79993920979d2cd9 [formerly 38e4e0c572 ]
Former-commit-id: 6aab62b7b9
|
2013-10-25 10:51:42 -05:00 |
|
Steve Harris
|
a2442a8e39
|
13.5.2-13 baseline
Former-commit-id: e755dbb114 [formerly ba50a26e70 ] [formerly 2100a15013 ] [formerly e7b1702032 [formerly 2100a15013 [formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]
Former-commit-id: e7b1702032
Former-commit-id: 96aa43a7d3c8df257077a396b7cc0804a594105a [formerly bc3eff506b ]
Former-commit-id: 96c50ba394
|
2013-10-25 10:06:56 -04:00 |
|
Steve Harris
|
2e6e031198
|
13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed ] [formerly a532896473 ] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]
Former-commit-id: bcb531e671
Former-commit-id: 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d ]
Former-commit-id: 15d9848170
|
2013-10-25 09:59:15 -04:00 |
|
Steve Harris
|
a18eb8fe83
|
13.5.2-11 baseline
Former-commit-id: e67aaa07b7 [formerly 9215a213a1 ] [formerly b820a28276 ] [formerly cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]
Former-commit-id: cbfde2f52a
Former-commit-id: 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72 ]
Former-commit-id: ecad06c80d
|
2013-10-25 09:45:58 -04:00 |
|