Bryan Kowal
|
2c31c6f4ab
|
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: d73aaf9753 [formerly 4bad21e6cd] [formerly d73aaf9753 [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]
Former-commit-id: 3255bf3861
Former-commit-id: 400b4a1328 [formerly 76726372e5]
Former-commit-id: 748ab480fb
|
2013-11-05 19:03:22 -06:00 |
|
Ben Steffensmeier
|
5cf9a6ed01
|
Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64
Former-commit-id: 4639cd69f4 [formerly 5b53cb4c98] [formerly 4639cd69f4 [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]
Former-commit-id: 1d35086e8d
Former-commit-id: b64221f27b [formerly 8aefe5ff02]
Former-commit-id: a97ec9b8e5
|
2013-11-05 17:33:41 -06:00 |
|
Nate Jensen
|
c84829347f
|
Merge "Issue #2521 DatasetMetaData URL update failure for point data. Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea" into development
Former-commit-id: e9c2738ffd [formerly 29293977f5] [formerly e9c2738ffd [formerly 29293977f5] [formerly 0b5dfb8ecd [formerly 56158b31325ccf0a06fe031790988eb8f39af7d9]]]
Former-commit-id: 0b5dfb8ecd
Former-commit-id: 6e228eca0f [formerly 5515ce94c7]
Former-commit-id: 154c132ae4
|
2013-11-05 15:57:00 -06:00 |
|
Nate Jensen
|
cb282cc273
|
Merge "Issue #2250 refactor JUtil to be less dependent on certain elements, make DAF easier to use" into development
Former-commit-id: 0251b0fc44 [formerly 02dad36407] [formerly 0251b0fc44 [formerly 02dad36407] [formerly 8c4d84c429 [formerly 2192c52604b66e1a675c005c4bb9d972a166f5fb]]]
Former-commit-id: 8c4d84c429
Former-commit-id: 90bc290c33 [formerly 59126bf527]
Former-commit-id: 68d0c9e726
|
2013-11-05 15:56:13 -06:00 |
|
Nate Jensen
|
10e392a7e3
|
Merge "Issue #2520 - Update rpm query calls" into development
Former-commit-id: f5440862f3 [formerly 183f46df4b] [formerly f5440862f3 [formerly 183f46df4b] [formerly 76d21878e4 [formerly d1234253ea620effba3f7bdb32f3e478562da92d]]]
Former-commit-id: 76d21878e4
Former-commit-id: 131e6c803f [formerly e604ea08f6]
Former-commit-id: 701fd08dd1
|
2013-11-05 15:55:57 -06:00 |
|
Richard Peter
|
ab072bf5f0
|
Merge "Issue #1679 Minor changes to support custom registry query plugins" into development
Former-commit-id: f3e6ed22b2 [formerly 962b21efa1] [formerly f3e6ed22b2 [formerly 962b21efa1] [formerly 82ad286653 [formerly 1c367816d3acbdbef01b4889a85e35abaf6623e4]]]
Former-commit-id: 82ad286653
Former-commit-id: 6f24910797 [formerly 48ccfe2cd8]
Former-commit-id: 69dccad4be
|
2013-11-05 15:50:34 -06:00 |
|
Richard Peter
|
0c7859f720
|
Merge "Issue #2494 Changed logging structure in DD" into development
Former-commit-id: 14cd82a6b8 [formerly df4e003cf3] [formerly 14cd82a6b8 [formerly df4e003cf3] [formerly 462ed0141a [formerly fbf54761279f40b3553b1d5d1c77f6129de18cb4]]]
Former-commit-id: 462ed0141a
Former-commit-id: 888f3383e3 [formerly d787096ee8]
Former-commit-id: 0888991d6c
|
2013-11-05 15:50:17 -06:00 |
|
Dave Hladky
|
d41abda3c8
|
Issue #2521 DatasetMetaData URL update failure for point data.
Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea
Former-commit-id: bade1cd3bd [formerly 0a331e84ed] [formerly bade1cd3bd [formerly 0a331e84ed] [formerly ef1efac63c [formerly 4821b94172554f98496a59f0d688a3edb5a43a63]]]
Former-commit-id: ef1efac63c
Former-commit-id: 8f459c229f [formerly 100786338a]
Former-commit-id: dc4e4ac4d0
|
2013-11-05 15:19:42 -06:00 |
|
Greg Armendariz
|
bb2f387371
|
Issue #2520 - Update rpm query calls
Change-Id: I2fc1ac0fa8b9e199149fd2db3ab25bac9ba90024
Former-commit-id: 67ae7d2244 [formerly 62324b5194] [formerly 67ae7d2244 [formerly 62324b5194] [formerly b078f57dc7 [formerly 95c604d179e14d110e0782a5a911f8b6d5104941]]]
Former-commit-id: b078f57dc7
Former-commit-id: 9959fe56ae [formerly f125f963b3]
Former-commit-id: 2c581c0c73
|
2013-11-05 13:30:01 -06:00 |
|
Matt Nash
|
054cf29e4b
|
Issue #2250 refactor JUtil to be less dependent on certain elements, make DAF easier to use
Change-Id: Ic89f4669529ac13f3c69ede8553cf57bbfd73760
Former-commit-id: dc160577cc [formerly b3573e90c9] [formerly dc160577cc [formerly b3573e90c9] [formerly c2d6c2af41 [formerly 48c392d8000d8cc3a5c8371319fddd776566ef32]]]
Former-commit-id: c2d6c2af41
Former-commit-id: 8d3cf15469 [formerly a3ec6e58f5]
Former-commit-id: ca4f824b37
|
2013-11-05 12:27:12 -06:00 |
|
Benjamin Phillippe
|
7db190aca8
|
Issue #1679 Minor changes to support custom registry query plugins
Change-Id: I8ae98c80c243b710179e605a0ad1db302e86921b
Former-commit-id: 0fa6977442 [formerly 08706e9a94] [formerly 0fa6977442 [formerly 08706e9a94] [formerly 6a3fc6c059 [formerly 85e2b4a7717e24983b417a930402a8095d0c6021]]]
Former-commit-id: 6a3fc6c059
Former-commit-id: cafe62bf4c [formerly 7f37efd83a]
Former-commit-id: a87445ba09
|
2013-11-05 10:50:47 -06:00 |
|
Richard Peter
|
07500c21d8
|
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: 311c749cb2 [formerly bed067dc4e] [formerly 311c749cb2 [formerly bed067dc4e] [formerly 3d293fce88 [formerly 44665bcb3b4745532ce0febf26a6b5a000e1a0bc]]]
Former-commit-id: 3d293fce88
Former-commit-id: b442f6c3fa [formerly c70e6f127b]
Former-commit-id: 25ffcdf751
|
2013-11-05 10:09:42 -06:00 |
|
Steve Harris
|
280de5fb9e
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 1a9ff8df10 [formerly 2e0db025f3] [formerly 1a9ff8df10 [formerly 2e0db025f3] [formerly a956fd7f4d [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]]
Former-commit-id: a956fd7f4d
Former-commit-id: 02907147b6 [formerly 6d20cd89ff]
Former-commit-id: 999fd5433c
|
2013-11-04 20:29:07 -06:00 |
|
Nate Jensen
|
60d1b1e3e5
|
Merge "Issue #2472 Replacing lost commit" into development
Former-commit-id: ab969fde67 [formerly 68e60576dc] [formerly ab969fde67 [formerly 68e60576dc] [formerly f595fc9bb3 [formerly 82513b3d8d53a089f9884e0922de5e8ebdc26a37]]]
Former-commit-id: f595fc9bb3
Former-commit-id: 7fb0844a84 [formerly 6f29a5f7a0]
Former-commit-id: 4be0b1a196
|
2013-11-04 16:53:17 -06:00 |
|
Dave Hladky
|
061594260a
|
Issue #2494 Changed logging structure in DD
Former-commit-id: 042f5213f3 [formerly cbe4572b65] [formerly 042f5213f3 [formerly cbe4572b65] [formerly 180cf8b770 [formerly ddefe46379c9603bc4c8b603793c5053bce2b476]]]
Former-commit-id: 180cf8b770
Former-commit-id: 5ae6480a78 [formerly 32abcfccd2]
Former-commit-id: f94d3eafd3
|
2013-11-04 16:35:49 -06:00 |
|
Dave Hladky
|
5eefed071f
|
Issue #2472 Replacing lost commit
Former-commit-id: 62d08dbe93 [formerly 1f1469fe82] [formerly 62d08dbe93 [formerly 1f1469fe82] [formerly 9c6a430d40 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]]]
Former-commit-id: 9c6a430d40
Former-commit-id: 2a2b35d62c [formerly 47b946fc3b]
Former-commit-id: d5a1042ba3
|
2013-11-04 16:24:14 -06:00 |
|
Ron Anderson
|
d01be57d35
|
Merge "Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization." into development
Former-commit-id: 196e2fc2d1 [formerly 8e1c3a80a7] [formerly 196e2fc2d1 [formerly 8e1c3a80a7] [formerly 8ecd11fe71 [formerly 1caad52e03dfddb4e3c64fff79d5b6aca9c73a6f]]]
Former-commit-id: 8ecd11fe71
Former-commit-id: 20e455c431 [formerly 844146fcd7]
Former-commit-id: a04c8c3536
|
2013-11-04 15:55:36 -06:00 |
|
Ron Anderson
|
846d4001b4
|
Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization.
Change-Id: I0edcf4e113f7226650a8363a3d7f0225f482c8f8
Former-commit-id: a5820f8ddf [formerly b6eb0df14c] [formerly a5820f8ddf [formerly b6eb0df14c] [formerly 9a737b2d4a [formerly fe6f8beb1174e605a1935899eb2e5ad6d1babd57]]]
Former-commit-id: 9a737b2d4a
Former-commit-id: 99a63bc182 [formerly 833e84b5b8]
Former-commit-id: 559f1e56f7
|
2013-11-04 15:22:32 -06:00 |
|
Nate Jensen
|
f15331607d
|
Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141
Former-commit-id: 27f09b8096 [formerly 6064000389] [formerly 27f09b8096 [formerly 6064000389] [formerly b36d28c9fd [formerly 2626a79c976ac016352a091bdf66890e929edc85]]]
Former-commit-id: b36d28c9fd
Former-commit-id: 5d2ec98600 [formerly 3e3400dc7c]
Former-commit-id: 27b1f123f0
|
2013-11-04 14:30:00 -06:00 |
|
Nate Jensen
|
7f50ec893e
|
Issue #2361 remove XML annotations from bufrmos
Former-commit-id: b1409d4002 [formerly 9b9d57bc94] [formerly b1409d4002 [formerly 9b9d57bc94] [formerly 1a25186415 [formerly f6a873e20e4cb7ce6fb47654ce3292b4f3bab99e]]]
Former-commit-id: 1a25186415
Former-commit-id: 173bff3eb8 [formerly b2847dd446]
Former-commit-id: e1ecfb468a
|
2013-11-04 13:34:01 -06:00 |
|
Nate Jensen
|
1d8522d45d
|
Issue #2361 remove XML annotations from TAF and CCFP
Former-commit-id: c52c207c80 [formerly 942936e815] [formerly c52c207c80 [formerly 942936e815] [formerly cd49daccf9 [formerly 2587a9b13ec6576007081a165f6042dd5a82b7eb]]]
Former-commit-id: cd49daccf9
Former-commit-id: a6cfeb5626 [formerly d935c4f547]
Former-commit-id: 6dafd588d0
|
2013-11-01 13:19:28 -05:00 |
|
Nate Jensen
|
2ee7f2e275
|
Issue #2361 move ebxml away from using SerializationUtil for XML processing
Change-Id: I04decec05b44a9c1881963f1a902adf6742aafa9
Former-commit-id: 2e28d72fb7 [formerly 2413c854c0] [formerly 2e28d72fb7 [formerly 2413c854c0] [formerly 5efd1b7218 [formerly ebf2c3c32945fefe8fd8c054b163fba238ac0ee5]]]
Former-commit-id: 5efd1b7218
Former-commit-id: 3753b45c0c [formerly f4cdcb2fae]
Former-commit-id: 96cd52250a
|
2013-11-01 12:09:43 -05:00 |
|
Greg Armendariz
|
3061eb1bc0
|
Issue #2509 - Fix merge issue
Former-commit-id: a281147055 [formerly b4c3337ffd] [formerly a281147055 [formerly b4c3337ffd] [formerly fadf9346d2 [formerly d742b452ab114935b76cb9097db7d6a08651bb2e]]]
Former-commit-id: fadf9346d2
Former-commit-id: 1561f091e3 [formerly d530a65ee3]
Former-commit-id: c90f8115f3
|
2013-11-01 10:31:08 -05:00 |
|
Dave Hladky
|
b8b78939e3
|
Issue #2292 Stopped subscriptions from checking against themselves. This prevented subscriptions from being updatable.
Former-commit-id: 1594cc6a72 [formerly e5896397f6] [formerly 1594cc6a72 [formerly e5896397f6] [formerly 422dabf3eb [formerly 6edfeb94cfb14785d68d90b41fc636faa2ece074]]]
Former-commit-id: 422dabf3eb
Former-commit-id: d589bced40 [formerly ca1f2fc340]
Former-commit-id: 448d13c266
|
2013-11-01 10:23:56 -05:00 |
|
Benjamin Phillippe
|
c3f684e7fb
|
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: 98b56cf02a [formerly a7e53870fb] [formerly 98b56cf02a [formerly a7e53870fb] [formerly d8de923f8b [formerly 0a67c8d68548ed8daa76d782ca3213956b984795]]]
Former-commit-id: d8de923f8b
Former-commit-id: 7cb19682c1 [formerly 221d197c01]
Former-commit-id: 73c53ed846
|
2013-11-01 09:20:00 -05:00 |
|
Dave Hladky
|
e30272c56b
|
Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
Change-Id: I75269bad24731990720d30683ebf5f27344661f3
Former-commit-id: 0eba787d3e [formerly 4227f3a59f] [formerly 0eba787d3e [formerly 4227f3a59f] [formerly 9161962813 [formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]]]
Former-commit-id: 9161962813
Former-commit-id: ba31efaf03 [formerly d55d68fe5a]
Former-commit-id: 85003bf022
|
2013-11-01 08:23:16 -05:00 |
|
Nate Jensen
|
3858434dc3
|
Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: b986638bc5 [formerly 43b2f50a0a] [formerly b986638bc5 [formerly 43b2f50a0a] [formerly 0270e6bde3 [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 6ed6df6ed0 [formerly 47fc100053]
Former-commit-id: 6164feb2da
|
2013-10-31 18:11:13 -05:00 |
|
Bryan Kowal
|
0d8ab84604
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Former-commit-id: 04bcd7e6dc [formerly 49422aea62] [formerly 04bcd7e6dc [formerly 49422aea62] [formerly d08a652e23 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]
Former-commit-id: d08a652e23
Former-commit-id: d53ec9c750 [formerly adb62df96a]
Former-commit-id: 70d4374ce8
|
2013-10-31 15:43:29 -05:00 |
|
Bryan Kowal
|
f5bb76a01e
|
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: 38464427d3 [formerly feaacd9356] [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: f02d4b7a0b [formerly d366e70934]
Former-commit-id: eaaa3d022c
|
2013-10-31 15:34:46 -05:00 |
|
Ben Steffensmeier
|
a92af46f59
|
Issue #2491 Fix collaboration Xml.
Former-commit-id: a5f970e238 [formerly 3d36cec7be] [formerly a5f970e238 [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]
Former-commit-id: fdeff81da2
Former-commit-id: 89c999410e [formerly 49ffb7e92c]
Former-commit-id: a0e805ded6
|
2013-10-31 14:06:37 -05:00 |
|
Ron Anderson
|
49ea9c0444
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: b61ccc1609 [formerly 38e33092a2] [formerly b61ccc1609 [formerly 38e33092a2] [formerly 42e924e021 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]
Former-commit-id: 42e924e021
Former-commit-id: 2f23072e41 [formerly eef9d2dfb0]
Former-commit-id: e3a0440825
|
2013-10-31 14:04:55 -05:00 |
|
Richard Peter
|
ab890140fb
|
Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 5048d010f5 [formerly 3139055873] [formerly 5048d010f5 [formerly 3139055873] [formerly b482eb2b48 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]
Former-commit-id: b482eb2b48
Former-commit-id: fca3d73aa7 [formerly 73462fa134]
Former-commit-id: 300f907c46
|
2013-10-31 11:46:25 -05:00 |
|
Mike Duff
|
5ff3fe2791
|
Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: c1bd170f8a [formerly f123fa11f5] [formerly c1bd170f8a [formerly f123fa11f5] [formerly 3fc811102e [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]
Former-commit-id: 3fc811102e
Former-commit-id: b0c54d7c17 [formerly 4da0648461]
Former-commit-id: 26ca1b4d72
|
2013-10-31 09:22:50 -05:00 |
|
Greg Armendariz
|
c846280439
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 0daf07742e [formerly f6d98d6317] [formerly 0daf07742e [formerly f6d98d6317] [formerly 64dd62005b [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]
Former-commit-id: 64dd62005b
Former-commit-id: 5cf091c499 [formerly 4fb0e0bd2f]
Former-commit-id: eefcbf7dcb
|
2013-10-30 14:52:16 -05:00 |
|
David Gillingham
|
75acd532a1
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: c58160c9a9 [formerly 297fd6c3d4] [formerly c58160c9a9 [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 68b0b2e3db [formerly 996817f124]
Former-commit-id: eef2c93d6c
|
2013-10-30 11:34:46 -05:00 |
|
Nate Jensen
|
fdb54d5810
|
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: 411b909107 [formerly d92bd5b69a] [formerly 411b909107 [formerly d92bd5b69a] [formerly 62a5739feb [formerly 05de1d88cdc4841483864a623346ad16b015d395]]]
Former-commit-id: 62a5739feb
Former-commit-id: 90d99fe627 [formerly 5c4d8b4310]
Former-commit-id: 68658bf885
|
2013-10-30 11:28:58 -05:00 |
|
Brad Gonzales
|
7be6923520
|
Issue #2267 Removed java.nio.file dependencies from FilenameFilter.
Change-Id: I6af1cafe17609a6468a7805ccab61b28ecc0a733
Former-commit-id: 433ee7d942 [formerly 011c42b806] [formerly 433ee7d942 [formerly 011c42b806] [formerly 057ba113b5 [formerly 36571478911119efe7195d51f6c820d6e745ccee]]]
Former-commit-id: 057ba113b5
Former-commit-id: 3c0bd6db16 [formerly 9325d477a9]
Former-commit-id: 759c3b2cef
|
2013-10-29 17:04:00 -05:00 |
|
Brad Gonzales
|
af7e9dd4ef
|
Issue #2267 Remove java.nio.file dependencies from the SbnSimulator. Fixed handler setting for UFStatus in test env.
Change-Id: I8245eef53573b6596546e17a7900a1538455cee2
Former-commit-id: ac8136bd82 [formerly f1480cfc62] [formerly ac8136bd82 [formerly f1480cfc62] [formerly 6bc585aaf6 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]]]
Former-commit-id: 6bc585aaf6
Former-commit-id: 47690ea8d0 [formerly aeccaa2329]
Former-commit-id: 3b2127c103
|
2013-10-29 15:10:20 -05:00 |
|
Nate Jensen
|
f2184b9379
|
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: 554a9cddf3 [formerly f3143ba7b4] [formerly 554a9cddf3 [formerly f3143ba7b4] [formerly 6880a18f1a [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]
Former-commit-id: 6880a18f1a
Former-commit-id: 19043faeaa [formerly f2751f017e]
Former-commit-id: e8c199f108
|
2013-10-29 14:33:53 -05:00 |
|
Dave Hladky
|
cec7d35505
|
Issue #2361 Moved to private JAXB
Former-commit-id: be351c82ed [formerly 5b5e1ca293] [formerly be351c82ed [formerly 5b5e1ca293] [formerly 33a0890d31 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]]]
Former-commit-id: 33a0890d31
Former-commit-id: 3eff51897b [formerly b55b05fa8b]
Former-commit-id: b5e892c16e
|
2013-10-29 13:45:05 -05:00 |
|
Dave Hladky
|
90d3c540a6
|
Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: f5b9d3be39 [formerly 6cb541d1a1] [formerly f5b9d3be39 [formerly 6cb541d1a1] [formerly 15aed68c02 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]]]
Former-commit-id: 15aed68c02
Former-commit-id: b5e309f973 [formerly a8ab9072cc]
Former-commit-id: 072fa5de62
|
2013-10-29 13:05:47 -05:00 |
|
Nate Jensen
|
f377a942fa
|
Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: c45f619260 [formerly a5f2414070] [formerly c45f619260 [formerly a5f2414070] [formerly 4879c19e0b [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]]]
Former-commit-id: 4879c19e0b
Former-commit-id: 96c901b958 [formerly 4929a59b3e]
Former-commit-id: cbe8c35605
|
2013-10-29 12:31:08 -05:00 |
|
Dave Hladky
|
0d562b64fd
|
Issue #2361 Harvester JAXB fixed up
Former-commit-id: 1deca13487 [formerly 70d2ad2cdc] [formerly 1deca13487 [formerly 70d2ad2cdc] [formerly bcfa7d7a8f [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]]]
Former-commit-id: bcfa7d7a8f
Former-commit-id: 1a889e84b1 [formerly c5137923c0]
Former-commit-id: 64a9973089
|
2013-10-29 12:20:53 -05:00 |
|
Richard Peter
|
6ba24ad909
|
Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: 6cdbad069a [formerly 1d85220363] [formerly 6cdbad069a [formerly 1d85220363] [formerly 1b7b6f0134 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]]]
Former-commit-id: 1b7b6f0134
Former-commit-id: 4b612a3fa0 [formerly c27c764c61]
Former-commit-id: 3d812fdeb9
|
2013-10-29 12:18:55 -05:00 |
|
Richard Peter
|
74d2e4189c
|
Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: 5f1c6f5625 [formerly f75b431a40] [formerly 5f1c6f5625 [formerly f75b431a40] [formerly 89b992c01c [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]]]
Former-commit-id: 89b992c01c
Former-commit-id: 66d7ccb859 [formerly c56806b9b7]
Former-commit-id: e4b3ff9029
|
2013-10-29 12:17:14 -05:00 |
|
Richard Peter
|
5ee9b1ce9d
|
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: bfc87a0607 [formerly fe45d2b7e6] [formerly bfc87a0607 [formerly fe45d2b7e6] [formerly b6ffed0066 [formerly ef99656b07406288bf419037b05e85a5cf5771d6]]]
Former-commit-id: b6ffed0066
Former-commit-id: 5baa99e9c9 [formerly 4765eaefad]
Former-commit-id: f1d5148c49
|
2013-10-29 12:15:35 -05:00 |
|
Ben Steffensmeier
|
f7f75c86da
|
Issue #2489 Fix SfcObs NPE.
Former-commit-id: 59d8afc639 [formerly f9ee49fac5] [formerly 59d8afc639 [formerly f9ee49fac5] [formerly ddf506ceac [formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]]]
Former-commit-id: ddf506ceac
Former-commit-id: 32427d8b3d [formerly ca5a125829]
Former-commit-id: bab495ab35
|
2013-10-29 10:59:36 -05:00 |
|
Steve Harris
|
8982d892ba
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: a103a0e8ac [formerly 560b0075cd] [formerly a103a0e8ac [formerly 560b0075cd] [formerly 6ea4ac62ed [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: 3b29cf6790 [formerly eced243e6a]
Former-commit-id: 75cdf331b6
|
2013-10-28 15:58:12 -05:00 |
|
Bryan Kowal
|
819cb0bcb7
|
Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: df575b7be1 [formerly a6d7822698] [formerly df575b7be1 [formerly a6d7822698] [formerly cda8d04831 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]]
Former-commit-id: cda8d04831
Former-commit-id: 27d2e33769 [formerly cc0f6832c9]
Former-commit-id: 2615ad7324
|
2013-10-28 14:50:28 -05:00 |
|
Ron Anderson
|
643624f1a9
|
Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: dd3ef2844c [formerly fa5b6dce02] [formerly dd3ef2844c [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 3575496955 [formerly dda2eb89c1]
Former-commit-id: 1daa0f8649
|
2013-10-28 12:59:44 -05:00 |
|