Commit graph

1950 commits

Author SHA1 Message Date
Bryan Kowal
b85c53c8b0 Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
	rpms/awips2.core/Installer.tools/component.spec
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh

Former-commit-id: 7f9f20c8a8 [formerly d73aaf9753] [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4bad21e6cd [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]
Former-commit-id: 3255bf3861
Former-commit-id: fda65eb7f8713472578cb95e718895ab10e4b197 [formerly 76726372e5]
Former-commit-id: 400b4a1328
2013-11-05 19:03:22 -06:00
Ben Steffensmeier
41a54ad666 Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64

Former-commit-id: 3273b6fc5f [formerly 4639cd69f4] [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 5b53cb4c98 [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]
Former-commit-id: 1d35086e8d
Former-commit-id: 5548cad8f6d7873bdd2beafefec42e2d00821e99 [formerly 8aefe5ff02]
Former-commit-id: b64221f27b
2013-11-05 17:33:41 -06:00
Nate Jensen
56b76616a9 Merge "Issue #2521 DatasetMetaData URL update failure for point data. Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea" into development
Former-commit-id: 63d6c69d5e [formerly e9c2738ffd] [formerly 29293977f5] [formerly 0b5dfb8ecd [formerly 29293977f5 [formerly 56158b31325ccf0a06fe031790988eb8f39af7d9]]]
Former-commit-id: 0b5dfb8ecd
Former-commit-id: 6f41ca43b174e17527967bca7dd25d79c17bc3ca [formerly 5515ce94c7]
Former-commit-id: 6e228eca0f
2013-11-05 15:57:00 -06:00
Richard Peter
992690ef61 Issue #2499: Remove defaultArchiveConfig.xml
Former-commit-id: efcd3c6454 [formerly 6af3e69ec8] [formerly 7507ae3460] [formerly 055057ed60 [formerly 7507ae3460 [formerly affca91a2999675f1e91f2add7cb276ae90535af]]]
Former-commit-id: 055057ed60
Former-commit-id: 5ebb5a5308b8cf5aa6810663aaf886c73334b2ea [formerly 406687d67f]
Former-commit-id: bdce762633
2013-11-05 15:56:50 -06:00
Nate Jensen
599602729c Merge "Issue #2250 refactor JUtil to be less dependent on certain elements, make DAF easier to use" into development
Former-commit-id: 90c895ed1a [formerly 0251b0fc44] [formerly 02dad36407] [formerly 8c4d84c429 [formerly 02dad36407 [formerly 2192c52604b66e1a675c005c4bb9d972a166f5fb]]]
Former-commit-id: 8c4d84c429
Former-commit-id: f6fa5cb4e5df65c4b0fc7ad8a42711fff7f94d51 [formerly 59126bf527]
Former-commit-id: 90bc290c33
2013-11-05 15:56:13 -06:00
Nate Jensen
8035a69b64 Merge "Issue #2520 - Update rpm query calls" into development
Former-commit-id: c846df9697 [formerly f5440862f3] [formerly 183f46df4b] [formerly 76d21878e4 [formerly 183f46df4b [formerly d1234253ea620effba3f7bdb32f3e478562da92d]]]
Former-commit-id: 76d21878e4
Former-commit-id: 8737a75125579709844d32b9db60c1910275a9a1 [formerly e604ea08f6]
Former-commit-id: 131e6c803f
2013-11-05 15:55:57 -06:00
Richard Peter
d12258b80a Merge "Issue #1679 Minor changes to support custom registry query plugins" into development
Former-commit-id: 0bacb2f6c2 [formerly f3e6ed22b2] [formerly 2d68e321d38811901dbda59f823aca80dcbe57d8 [formerly 962b21efa1]] [formerly 82ad286653 [formerly 962b21efa1 [formerly 1c367816d3acbdbef01b4889a85e35abaf6623e4]]]
Former-commit-id: 82ad286653
Former-commit-id: 2bf8a5aa179a0c9478cbd7b84c4dbed94a3ca5c0 [formerly 48ccfe2cd8]
Former-commit-id: 6f24910797
2013-11-05 15:50:34 -06:00
Richard Peter
0f1d3e4e82 Merge "Issue #2494 Changed logging structure in DD" into development
Former-commit-id: 2f1d004e1e [formerly 14cd82a6b8] [formerly df4e003cf3] [formerly 462ed0141a [formerly df4e003cf3 [formerly fbf54761279f40b3553b1d5d1c77f6129de18cb4]]]
Former-commit-id: 462ed0141a
Former-commit-id: 1120192979610914230a38e6a1fc7f0dde2161b3 [formerly d787096ee8]
Former-commit-id: 888f3383e3
2013-11-05 15:50:17 -06:00
Dave Hladky
0b45a7a439 Issue #2521 DatasetMetaData URL update failure for point data.
Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea

Former-commit-id: 96ea2d36b6 [formerly bade1cd3bd] [formerly 0a331e84ed] [formerly ef1efac63c [formerly 0a331e84ed [formerly 4821b94172554f98496a59f0d688a3edb5a43a63]]]
Former-commit-id: ef1efac63c
Former-commit-id: 0f57eef863b63bcc36dd3d3eddc5e25a2e8ab3ac [formerly 100786338a]
Former-commit-id: 8f459c229f
2013-11-05 15:19:42 -06:00
Richard Peter
324b57d843 Issue #2499: Update Wes2Bridge Configuration and logging.
Change-Id: I95a530bc8b647c58cff36f449d55bff39943fbc9

Former-commit-id: d76bd3b8ae [formerly 0566c1976e] [formerly 73d0d1236c] [formerly 55b226e104 [formerly 73d0d1236c [formerly 9449bc5f562fd638e0a02ea6c2dc4c6828e73561]]]
Former-commit-id: 55b226e104
Former-commit-id: de953d3223b133cc7897e1be8e5c67e47a8bc0aa [formerly 0be00ed984]
Former-commit-id: 0a5323a740
2013-11-05 15:08:23 -06:00
Greg Armendariz
403fa63efd Issue #2520 - Update rpm query calls
Change-Id: I2fc1ac0fa8b9e199149fd2db3ab25bac9ba90024

Former-commit-id: 4bce15db12 [formerly 67ae7d2244] [formerly d40cde34a287648b618f42ce1a9512614e45d75d [formerly 62324b5194]] [formerly b078f57dc7 [formerly 62324b5194 [formerly 95c604d179e14d110e0782a5a911f8b6d5104941]]]
Former-commit-id: b078f57dc7
Former-commit-id: d4116fc6b4626874796f71816cf22b488b6628df [formerly f125f963b3]
Former-commit-id: 9959fe56ae
2013-11-05 13:30:01 -06:00
Roger Ferrel
31b3bb3645 Issue #2497 Change process root directory to /archive.
Change-Id: Ib5cecb7c0af0e844c4ee37b5dc7fb129023048dc

Former-commit-id: 0a1ed62dd1 [formerly 484549ce4a] [formerly acacd515a6] [formerly 2f8903478e [formerly acacd515a6 [formerly 6c932f08915704fcdf44b66ad396175ccd7f544f]]]
Former-commit-id: 2f8903478e
Former-commit-id: 72a1519ad0df774b7a58c9deccd83a584d643b55 [formerly 553e189b05]
Former-commit-id: aee4d90569
2013-11-05 12:45:37 -06:00
Matt Nash
d41115860f Issue #2250 refactor JUtil to be less dependent on certain elements, make DAF easier to use
Change-Id: Ic89f4669529ac13f3c69ede8553cf57bbfd73760

Former-commit-id: 312ec66384 [formerly dc160577cc] [formerly b3573e90c9] [formerly c2d6c2af41 [formerly b3573e90c9 [formerly 48c392d8000d8cc3a5c8371319fddd776566ef32]]]
Former-commit-id: c2d6c2af41
Former-commit-id: 53e526c2f13fdf394ffb581d1c56b5b036a55a63 [formerly a3ec6e58f5]
Former-commit-id: 8d3cf15469
2013-11-05 12:27:12 -06:00
Benjamin Phillippe
dfdbf93ab2 Issue #1679 Minor changes to support custom registry query plugins
Change-Id: I8ae98c80c243b710179e605a0ad1db302e86921b

Former-commit-id: bf7de26703 [formerly 0fa6977442] [formerly 08706e9a94] [formerly 6a3fc6c059 [formerly 08706e9a94 [formerly 85e2b4a7717e24983b417a930402a8095d0c6021]]]
Former-commit-id: 6a3fc6c059
Former-commit-id: 38f8b3c5acc50c9c911e49d2ae3305899cd7d612 [formerly 7f37efd83a]
Former-commit-id: cafe62bf4c
2013-11-05 10:50:47 -06:00
Dave Hladky
7f82567897 Issue #2516 Remove classes causing WCS to not compile.
Former-commit-id: 98dc28b271 [formerly f7a742dddf] [formerly 8245ffd968] [formerly 66085bc43b [formerly 8245ffd968 [formerly 66955c6af6c40067f4bf1fb7917ad59951f007e1]]]
Former-commit-id: 66085bc43b
Former-commit-id: 3ab4593c75697e2f1b883c9d016794aa80e06419 [formerly 5062e96e7c]
Former-commit-id: 5db75b194d
2013-11-05 10:25:53 -06:00
Richard Peter
c2a0e9f6b1 Merge "Issue #1538 Moved data delivery specific web services out of registry plugins -- Added registry federation admin page -- Made registry service clients non-static" into development
Former-commit-id: f2919db4e8 [formerly 311c749cb2] [formerly bed067dc4e] [formerly 3d293fce88 [formerly bed067dc4e [formerly 44665bcb3b4745532ce0febf26a6b5a000e1a0bc]]]
Former-commit-id: 3d293fce88
Former-commit-id: a6caa3d19afcbe528bd1125fdd02d97ed47dab15 [formerly c70e6f127b]
Former-commit-id: b442f6c3fa
2013-11-05 10:09:42 -06:00
Steve Harris
89bf1adcf5 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 354a736ed5 [formerly 1a9ff8df10] [formerly 2e0db025f3] [formerly a956fd7f4d [formerly 2e0db025f3 [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]]
Former-commit-id: a956fd7f4d
Former-commit-id: ab6310aa243dfb8185d05a0491fd0532879e343a [formerly 6d20cd89ff]
Former-commit-id: 02907147b6
2013-11-04 20:29:07 -06:00
Nate Jensen
df5e99425d Merge "Issue #2472 Replacing lost commit" into development
Former-commit-id: 0a64209482 [formerly ab969fde67] [formerly 68e60576dc] [formerly f595fc9bb3 [formerly 68e60576dc [formerly 82513b3d8d53a089f9884e0922de5e8ebdc26a37]]]
Former-commit-id: f595fc9bb3
Former-commit-id: 18e2570f35f96550538b024e247026d93639993d [formerly 6f29a5f7a0]
Former-commit-id: 7fb0844a84
2013-11-04 16:53:17 -06:00
Dave Hladky
daaea66bef Issue #2494 Changed logging structure in DD
Former-commit-id: 5887e2ae3c [formerly 042f5213f3] [formerly cbe4572b65] [formerly 180cf8b770 [formerly cbe4572b65 [formerly ddefe46379c9603bc4c8b603793c5053bce2b476]]]
Former-commit-id: 180cf8b770
Former-commit-id: a910fd84a65de0665ed7afd15e2f9c63f144e28a [formerly 32abcfccd2]
Former-commit-id: 5ae6480a78
2013-11-04 16:35:49 -06:00
Dave Hladky
aaa709a11d Issue #2472 Replacing lost commit
Former-commit-id: a6182c2af0 [formerly 62d08dbe93] [formerly 1f1469fe82] [formerly 9c6a430d40 [formerly 1f1469fe82 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]]]
Former-commit-id: 9c6a430d40
Former-commit-id: 5ba22e77f9a88fb32b78daae0e95bb5adceda6ea [formerly 47b946fc3b]
Former-commit-id: 2a2b35d62c
2013-11-04 16:24:14 -06:00
Ron Anderson
adbe3c511c Merge "Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization." into development
Former-commit-id: 0c45807d11 [formerly 196e2fc2d1] [formerly 8e1c3a80a7] [formerly 8ecd11fe71 [formerly 8e1c3a80a7 [formerly 1caad52e03dfddb4e3c64fff79d5b6aca9c73a6f]]]
Former-commit-id: 8ecd11fe71
Former-commit-id: cd7dd37b55235c539cc6af0609aee88341b550b7 [formerly 844146fcd7]
Former-commit-id: 20e455c431
2013-11-04 15:55:36 -06:00
Ron Anderson
e9771d375e Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization.
Change-Id: I0edcf4e113f7226650a8363a3d7f0225f482c8f8

Former-commit-id: 950fc4f17d [formerly a5820f8ddf] [formerly b6eb0df14c] [formerly 9a737b2d4a [formerly b6eb0df14c [formerly fe6f8beb1174e605a1935899eb2e5ad6d1babd57]]]
Former-commit-id: 9a737b2d4a
Former-commit-id: 7116ac3154251e73e3e8c936fce97daf3822c787 [formerly 833e84b5b8]
Former-commit-id: 99a63bc182
2013-11-04 15:22:32 -06:00
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