Steve Harris
|
999fd5433c
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 2e0db025f3 [formerly 2e0db025f3 [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]
Former-commit-id: a956fd7f4d
Former-commit-id: 6d20cd89ff
|
2013-11-04 20:29:07 -06:00 |
|
Nate Jensen
|
4be0b1a196
|
Merge "Issue #2472 Replacing lost commit" into development
Former-commit-id: 68e60576dc [formerly 68e60576dc [formerly 82513b3d8d53a089f9884e0922de5e8ebdc26a37]]
Former-commit-id: f595fc9bb3
Former-commit-id: 6f29a5f7a0
|
2013-11-04 16:53:17 -06:00 |
|
Dave Hladky
|
d5a1042ba3
|
Issue #2472 Replacing lost commit
Former-commit-id: 1f1469fe82 [formerly 1f1469fe82 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]]
Former-commit-id: 9c6a430d40
Former-commit-id: 47b946fc3b
|
2013-11-04 16:24:14 -06:00 |
|
Ron Anderson
|
a04c8c3536
|
Merge "Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization." into development
Former-commit-id: 8e1c3a80a7 [formerly 8e1c3a80a7 [formerly 1caad52e03dfddb4e3c64fff79d5b6aca9c73a6f]]
Former-commit-id: 8ecd11fe71
Former-commit-id: 844146fcd7
|
2013-11-04 15:55:36 -06:00 |
|
Ron Anderson
|
559f1e56f7
|
Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization.
Change-Id: I0edcf4e113f7226650a8363a3d7f0225f482c8f8
Former-commit-id: b6eb0df14c [formerly b6eb0df14c [formerly fe6f8beb1174e605a1935899eb2e5ad6d1babd57]]
Former-commit-id: 9a737b2d4a
Former-commit-id: 833e84b5b8
|
2013-11-04 15:22:32 -06:00 |
|
Nate Jensen
|
27b1f123f0
|
Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141
Former-commit-id: 6064000389 [formerly 6064000389 [formerly 2626a79c976ac016352a091bdf66890e929edc85]]
Former-commit-id: b36d28c9fd
Former-commit-id: 3e3400dc7c
|
2013-11-04 14:30:00 -06:00 |
|
Nate Jensen
|
e1ecfb468a
|
Issue #2361 remove XML annotations from bufrmos
Former-commit-id: 9b9d57bc94 [formerly 9b9d57bc94 [formerly f6a873e20e4cb7ce6fb47654ce3292b4f3bab99e]]
Former-commit-id: 1a25186415
Former-commit-id: b2847dd446
|
2013-11-04 13:34:01 -06:00 |
|
Ben Steffensmeier
|
a0f4c08cfd
|
Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: ff5f08d23a [formerly ff5f08d23a [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]
Former-commit-id: 5a928e6ad5
Former-commit-id: 08e73de883
|
2013-11-04 13:01:49 -06:00 |
|
Nate Jensen
|
bdadadec83
|
Merge "Issue #2361 remove XML annotations from TAF and CCFP" into development
Former-commit-id: a72197e828 [formerly a72197e828 [formerly 0a74b17463864bb9fb50b4e9450592b04a4dd481]]
Former-commit-id: 3ef349882c
Former-commit-id: 6bab0640a7
|
2013-11-04 11:48:04 -06:00 |
|
Lee Venable
|
52da34fc55
|
Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: 0b3346d699 [formerly 0b3346d699 [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: f6f1b16c0c
|
2013-11-02 10:43:48 -05:00 |
|
Slav Korolev
|
f8e429a1b9
|
Issue #2431. Changed labels on the table.
Former-commit-id: dd1ff63737 [formerly dd1ff63737 [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]
Former-commit-id: 0801f8dedd
Former-commit-id: 7d0198b356
|
2013-11-01 15:06:19 -04:00 |
|
Nate Jensen
|
6dafd588d0
|
Issue #2361 remove XML annotations from TAF and CCFP
Former-commit-id: 942936e815 [formerly 942936e815 [formerly 2587a9b13ec6576007081a165f6042dd5a82b7eb]]
Former-commit-id: cd49daccf9
Former-commit-id: d935c4f547
|
2013-11-01 13:19:28 -05:00 |
|
Nate Jensen
|
7691a13fec
|
Merge "Issue #2361 move ebxml away from using SerializationUtil for XML processing" into development
Former-commit-id: 7156ac5d4f [formerly 7156ac5d4f [formerly 84226cbd63d12c6c1624dfc1dd72b42360d0e54d]]
Former-commit-id: 6fac918395
Former-commit-id: b5d457f566
|
2013-11-01 12:27:21 -05:00 |
|
Nate Jensen
|
96cd52250a
|
Issue #2361 move ebxml away from using SerializationUtil for XML processing
Change-Id: I04decec05b44a9c1881963f1a902adf6742aafa9
Former-commit-id: 2413c854c0 [formerly 2413c854c0 [formerly ebf2c3c32945fefe8fd8c054b163fba238ac0ee5]]
Former-commit-id: 5efd1b7218
Former-commit-id: f4cdcb2fae
|
2013-11-01 12:09:43 -05:00 |
|
Ron Anderson
|
84adff8e96
|
Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: 9e9dd04bfd [formerly 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]]
Former-commit-id: cc991ed528
Former-commit-id: deb89a88f5
|
2013-11-01 11:07:39 -05:00 |
|
Greg Armendariz
|
c90f8115f3
|
Issue #2509 - Fix merge issue
Former-commit-id: b4c3337ffd [formerly b4c3337ffd [formerly d742b452ab114935b76cb9097db7d6a08651bb2e]]
Former-commit-id: fadf9346d2
Former-commit-id: d530a65ee3
|
2013-11-01 10:31:08 -05:00 |
|
Dave Hladky
|
448d13c266
|
Issue #2292 Stopped subscriptions from checking against themselves. This prevented subscriptions from being updatable.
Former-commit-id: e5896397f6 [formerly e5896397f6 [formerly 6edfeb94cfb14785d68d90b41fc636faa2ece074]]
Former-commit-id: 422dabf3eb
Former-commit-id: ca1f2fc340
|
2013-11-01 10:23:56 -05:00 |
|
Slav Korolev
|
57fc9a2183
|
Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: 7ca47690af [formerly 7ca47690af [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]
Former-commit-id: f7d1939b36
Former-commit-id: 386db59985
|
2013-11-01 11:03:06 -04:00 |
|
Dave Hladky
|
85003bf022
|
Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
Change-Id: I75269bad24731990720d30683ebf5f27344661f3
Former-commit-id: 4227f3a59f [formerly 4227f3a59f [formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]]
Former-commit-id: 9161962813
Former-commit-id: d55d68fe5a
|
2013-11-01 08:23:16 -05:00 |
|
Nate Jensen
|
6164feb2da
|
Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: 43b2f50a0a [formerly 43b2f50a0a [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]
Former-commit-id: 0270e6bde3
Former-commit-id: 47fc100053
|
2013-10-31 18:11:13 -05:00 |
|
Bryan Kowal
|
4006fd8f54
|
Issue #2476 - re-compile jep for RHEL6 64-bit
Former-commit-id: 5b99b99d3c [formerly 5b99b99d3c [formerly 39a2c09fe71d3fbafa1a10dc08e7348f7710579c]]
Former-commit-id: d034d82744
Former-commit-id: 7e94e4cd78
|
2013-10-31 15:56:34 -05:00 |
|
Bryan Kowal
|
70d4374ce8
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Former-commit-id: 49422aea62 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]
Former-commit-id: d08a652e23
Former-commit-id: adb62df96a
|
2013-10-31 15:43:29 -05:00 |
|
Bryan Kowal
|
eaaa3d022c
|
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: feaacd9356 [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d366e70934
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
6e08dc72c0
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
nativeLib/files.native/files.native.ecl
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.cots.g2clib/.project
nativeLib/rary.cots.g2clib/g2_unpack3.c
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
Former-commit-id: 665911b033 [formerly 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]
Former-commit-id: c76c856340
Former-commit-id: 0954490a5a
|
2013-10-31 15:23:08 -05:00 |
|
Bryan Kowal
|
71b5ef4733
|
Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit
Former-commit-id: c74123f5a8 [formerly c74123f5a8 [formerly be179f2809180da7812a9f4b53b48870b13191ae]]
Former-commit-id: e9b76cf185
Former-commit-id: d08a1af457
|
2013-10-31 14:53:27 -05:00 |
|
David Gillingham
|
5df42898ad
|
Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af
Former-commit-id: 6e1cca2966 [formerly 6e1cca2966 [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 3bac577a31
|
2013-10-31 14:07:20 -05:00 |
|
Ben Steffensmeier
|
a0e805ded6
|
Issue #2491 Fix collaboration Xml.
Former-commit-id: 3d36cec7be [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]
Former-commit-id: fdeff81da2
Former-commit-id: 49ffb7e92c
|
2013-10-31 14:06:37 -05:00 |
|
Ron Anderson
|
e3a0440825
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: 38e33092a2 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]
Former-commit-id: 42e924e021
Former-commit-id: eef9d2dfb0
|
2013-10-31 14:04:55 -05:00 |
|
Nate Jensen
|
c24d8c63cd
|
Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: ccf3d5b1e9 [formerly ccf3d5b1e9 [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]
Former-commit-id: de50a9214b
Former-commit-id: d6fcc98e76
|
2013-10-31 12:24:23 -05:00 |
|
Richard Peter
|
300f907c46
|
Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 3139055873 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]
Former-commit-id: b482eb2b48
Former-commit-id: 73462fa134
|
2013-10-31 11:46:25 -05:00 |
|
Mike Duff
|
26ca1b4d72
|
Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: f123fa11f5 [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]
Former-commit-id: 3fc811102e
Former-commit-id: 4da0648461
|
2013-10-31 09:22:50 -05:00 |
|
Greg Armendariz
|
eefcbf7dcb
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: f6d98d6317 [formerly f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]
Former-commit-id: 64dd62005b
Former-commit-id: 4fb0e0bd2f
|
2013-10-30 14:52:16 -05:00 |
|
David Gillingham
|
eef2c93d6c
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: 297fd6c3d4 [formerly 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 996817f124
|
2013-10-30 11:34:46 -05:00 |
|
Nate Jensen
|
68658bf885
|
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: d92bd5b69a [formerly d92bd5b69a [formerly 05de1d88cdc4841483864a623346ad16b015d395]]
Former-commit-id: 62a5739feb
Former-commit-id: 5c4d8b4310
|
2013-10-30 11:28:58 -05:00 |
|
Bryan Kowal
|
4789797de5
|
Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: eb4c27003f [formerly eb4c27003f [formerly d6c5bd5476a039058d5251f4457119fb10806b2e]]
Former-commit-id: b082ea89c5
Former-commit-id: 428dd993d9
|
2013-10-30 09:23:55 -05:00 |
|
Ben Steffensmeier
|
9d87eb50e2
|
Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6
Former-commit-id: 5b395f7417 [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]
Former-commit-id: 27a392f90e
Former-commit-id: 418c259567
|
2013-10-29 17:35:55 -05:00 |
|
Nate Jensen
|
a5a0c5457c
|
Merge "Issue #2267 Removed java.nio.file dependencies from FilenameFilter." into development
Former-commit-id: 7a9fa0c5d3 [formerly 7a9fa0c5d3 [formerly e7d71688c83961922b6089e719226fc631d65e9a]]
Former-commit-id: c1fb07bc57
Former-commit-id: 893e91d386
|
2013-10-29 17:11:15 -05:00 |
|
Brad Gonzales
|
759c3b2cef
|
Issue #2267 Removed java.nio.file dependencies from FilenameFilter.
Change-Id: I6af1cafe17609a6468a7805ccab61b28ecc0a733
Former-commit-id: 011c42b806 [formerly 011c42b806 [formerly 36571478911119efe7195d51f6c820d6e745ccee]]
Former-commit-id: 057ba113b5
Former-commit-id: 9325d477a9
|
2013-10-29 17:04:00 -05:00 |
|
Ben Steffensmeier
|
bec7eb3d7f
|
Issue #2491 Clean resource datas out of ncep plugins.
Former-commit-id: e1180db74b [formerly e1180db74b [formerly e1259eb7fa31d3142ca9ce43bf46c52f00fb098e]]
Former-commit-id: 1ac69169fa
Former-commit-id: e1054d923c
|
2013-10-29 16:47:06 -05:00 |
|
Brad Gonzales
|
3b2127c103
|
Issue #2267 Remove java.nio.file dependencies from the SbnSimulator. Fixed handler setting for UFStatus in test env.
Change-Id: I8245eef53573b6596546e17a7900a1538455cee2
Former-commit-id: f1480cfc62 [formerly f1480cfc62 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]]
Former-commit-id: 6bc585aaf6
Former-commit-id: aeccaa2329
|
2013-10-29 15:10:20 -05:00 |
|
Nate Jensen
|
e8c199f108
|
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: f3143ba7b4 [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]
Former-commit-id: 6880a18f1a
Former-commit-id: f2751f017e
|
2013-10-29 14:33:53 -05:00 |
|
Nate Jensen
|
0fc40b4406
|
Merge "Issue #2361 Moved to private JAXB" into development
Former-commit-id: 11a5776652 [formerly 11a5776652 [formerly c55568de340105c89b118ff3f719c7816dcb5e3b]]
Former-commit-id: f9d9b0a1dc
Former-commit-id: 35209c8a5d
|
2013-10-29 13:59:00 -05:00 |
|
Mike Duff
|
2c7dbda379
|
Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5
Former-commit-id: 6d5f697300 [formerly 6d5f697300 [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]
Former-commit-id: 25e4a4741c
Former-commit-id: 73ecb9af6b
|
2013-10-29 13:49:47 -05:00 |
|
Dave Hladky
|
b5e892c16e
|
Issue #2361 Moved to private JAXB
Former-commit-id: 5b5e1ca293 [formerly 5b5e1ca293 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]]
Former-commit-id: 33a0890d31
Former-commit-id: b55b05fa8b
|
2013-10-29 13:45:05 -05:00 |
|
Dave Hladky
|
072fa5de62
|
Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: 6cb541d1a1 [formerly 6cb541d1a1 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]]
Former-commit-id: 15aed68c02
Former-commit-id: a8ab9072cc
|
2013-10-29 13:05:47 -05:00 |
|
Nate Jensen
|
d0b49f4979
|
Merge "Issue #2491 Move ncep bundles off od SerializationUtil." into development
Former-commit-id: bfa5681bfc [formerly bfa5681bfc [formerly 08f8e4274f547455e6a9fc09a3ab025a68f097a7]]
Former-commit-id: cfd62f8693
Former-commit-id: 84deb7d911
|
2013-10-29 12:31:40 -05:00 |
|
Nate Jensen
|
cbe8c35605
|
Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: a5f2414070 [formerly a5f2414070 [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]]
Former-commit-id: 4879c19e0b
Former-commit-id: 4929a59b3e
|
2013-10-29 12:31:08 -05:00 |
|
Ben Steffensmeier
|
fd931a3e64
|
Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: a4174430f7 [formerly a4174430f7 [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]
Former-commit-id: 204b47c67d
Former-commit-id: 9540b309b3
|
2013-10-29 12:28:07 -05:00 |
|
Dave Hladky
|
64a9973089
|
Issue #2361 Harvester JAXB fixed up
Former-commit-id: 70d2ad2cdc [formerly 70d2ad2cdc [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]]
Former-commit-id: bcfa7d7a8f
Former-commit-id: c5137923c0
|
2013-10-29 12:20:53 -05:00 |
|
Richard Peter
|
3d812fdeb9
|
Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: 1d85220363 [formerly 1d85220363 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]]
Former-commit-id: 1b7b6f0134
Former-commit-id: c27c764c61
|
2013-10-29 12:18:55 -05:00 |
|