Bryan Kowal
|
6a0ddf11e4
|
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 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f [formerly f02d4b7a0b] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c]
Former-commit-id: f5bb76a01e
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
a7d9b9fc11
|
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: 2ebed2011f [formerly 4d7a4aefec] [formerly 665911b033] [formerly 2ebed2011f [formerly 4d7a4aefec] [formerly 665911b033] [formerly c76c856340 [formerly 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]]
Former-commit-id: c76c856340
Former-commit-id: f37abe3599 [formerly 7a83214b1c] [formerly a87ff201ab972ea4012700b7f82b08857452a1f6 [formerly 0954490a5a]]
Former-commit-id: da8082dd7ce7ed30ca84ffbe89c5465a9f2b305e [formerly 6e08dc72c0]
Former-commit-id: 731efe0fb6
|
2013-10-31 15:23:08 -05:00 |
|
Greg Armendariz
|
a7d7c6447f
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 795d6cf541 [formerly 0daf07742e] [formerly f6d98d6317] [formerly 795d6cf541 [formerly 0daf07742e] [formerly f6d98d6317] [formerly 64dd62005b [formerly f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]]
Former-commit-id: 64dd62005b
Former-commit-id: 83262b6cc4 [formerly 5cf091c499] [formerly 3a7bea98c42e7d77a7480bbc262fa233cb1f6a6b [formerly 4fb0e0bd2f]]
Former-commit-id: cc39f166545faa38560a0e3c8a7dafc13408d077 [formerly eefcbf7dcb]
Former-commit-id: c846280439
|
2013-10-30 14:52:16 -05:00 |
|
Nate Jensen
|
86eed97dac
|
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 79eb4d400a [formerly 411b909107] [formerly d92bd5b69a] [formerly 62a5739feb [formerly d92bd5b69a [formerly 05de1d88cdc4841483864a623346ad16b015d395]]]]
Former-commit-id: 62a5739feb
Former-commit-id: 937981d2f9 [formerly 90d99fe627] [formerly 9bd9983d48f00002ef7fd475ecf0bf5a3403c4c1 [formerly 5c4d8b4310]]
Former-commit-id: 5bb580041f80eda58be2a045874066d9241a9953 [formerly 68658bf885]
Former-commit-id: fdb54d5810
|
2013-10-30 11:28:58 -05:00 |
|
Bryan Kowal
|
eb907d00da
|
Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: d2bd276fee [formerly e4e2c8c796] [formerly eb4c27003f] [formerly d2bd276fee [formerly e4e2c8c796] [formerly eb4c27003f] [formerly b082ea89c5 [formerly eb4c27003f [formerly d6c5bd5476a039058d5251f4457119fb10806b2e]]]]
Former-commit-id: b082ea89c5
Former-commit-id: 2a36503bf0 [formerly 63324cda6a] [formerly 67b06516357f8371d7d025ab695b2a9be1b02fc1 [formerly 428dd993d9]]
Former-commit-id: 7f604c9d9dbf2ed9afef8c5efbddff94468a14f2 [formerly 4789797de5]
Former-commit-id: dbe9ed1433
|
2013-10-30 09:23:55 -05:00 |
|
Nate Jensen
|
05101dcbe4
|
Merge "Issue #2267 Removed java.nio.file dependencies from FilenameFilter." into development
Former-commit-id: 5531ba7fd8 [formerly e024af7e4f] [formerly 7a9fa0c5d3] [formerly 5531ba7fd8 [formerly e024af7e4f] [formerly 7a9fa0c5d3] [formerly c1fb07bc57 [formerly 7a9fa0c5d3 [formerly e7d71688c83961922b6089e719226fc631d65e9a]]]]
Former-commit-id: c1fb07bc57
Former-commit-id: 40243bbcc4 [formerly e7b26af054] [formerly 217ae9701811bd936b4275c58d21ee4bae50be5c [formerly 893e91d386]]
Former-commit-id: b53d0ac1061308f2097908508f3bb55eb8baa856 [formerly a5a0c5457c]
Former-commit-id: 7bf4f27a31
|
2013-10-29 17:11:15 -05:00 |
|
Brad Gonzales
|
5442f43210
|
Issue #2267 Removed java.nio.file dependencies from FilenameFilter.
Change-Id: I6af1cafe17609a6468a7805ccab61b28ecc0a733
Former-commit-id: 95afe3cd1e [formerly 433ee7d942] [formerly 011c42b806] [formerly 95afe3cd1e [formerly 433ee7d942] [formerly 011c42b806] [formerly 057ba113b5 [formerly 011c42b806 [formerly 36571478911119efe7195d51f6c820d6e745ccee]]]]
Former-commit-id: 057ba113b5
Former-commit-id: d1d0dc770e [formerly 3c0bd6db16] [formerly 65615958da30edfa31cf83debed3017ef1f056db [formerly 9325d477a9]]
Former-commit-id: 4c8ee2bdc7d28f6fb8e681a48e9619289c46c73b [formerly 759c3b2cef]
Former-commit-id: 7be6923520
|
2013-10-29 17:04:00 -05:00 |
|
Ben Steffensmeier
|
1430560357
|
Issue #2491 Clean resource datas out of ncep plugins.
Former-commit-id: 5bb82eb545 [formerly b713ae826d] [formerly e1180db74b] [formerly 5bb82eb545 [formerly b713ae826d] [formerly e1180db74b] [formerly 1ac69169fa [formerly e1180db74b [formerly e1259eb7fa31d3142ca9ce43bf46c52f00fb098e]]]]
Former-commit-id: 1ac69169fa
Former-commit-id: 7b540cb830 [formerly fe29ef1c58] [formerly 103ccd01e73879c3d8b3bd01b0c764cb47ddfafe [formerly e1054d923c]]
Former-commit-id: babcf70e4d62a3c89bab9088e0587a9ccceb1687 [formerly bec7eb3d7f]
Former-commit-id: ef52238100
|
2013-10-29 16:47:06 -05:00 |
|
Brad Gonzales
|
2c902ab8e7
|
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 250730c308 [formerly ac8136bd82] [formerly f1480cfc62] [formerly 6bc585aaf6 [formerly f1480cfc62 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]]]]
Former-commit-id: 6bc585aaf6
Former-commit-id: bf1d2cb85a [formerly 47690ea8d0] [formerly 3ebdb55d0083b9e2bf2524a8b3b7cd9acaf899a2 [formerly aeccaa2329]]
Former-commit-id: 9142f489480470f702fc2b3671eb72d8c6bfc6e1 [formerly 3b2127c103]
Former-commit-id: af7e9dd4ef
|
2013-10-29 15:10:20 -05:00 |
|
Nate Jensen
|
89b3b81ab3
|
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 a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: dced4c4d11 [formerly 19043faeaa] [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]]
Former-commit-id: 15fd50423e5c76bf2d7d7f54653759492ef97c8d [formerly e8c199f108]
Former-commit-id: f2184b9379
|
2013-10-29 14:33:53 -05:00 |
|
Nate Jensen
|
fce988f3a4
|
Merge "Issue #2361 Moved to private JAXB" into development
Former-commit-id: 20d0ba97f4 [formerly 8de69e035a] [formerly 11a5776652] [formerly 20d0ba97f4 [formerly 8de69e035a] [formerly 11a5776652] [formerly f9d9b0a1dc [formerly 11a5776652 [formerly c55568de340105c89b118ff3f719c7816dcb5e3b]]]]
Former-commit-id: f9d9b0a1dc
Former-commit-id: 5fe13ba2f8 [formerly 9fee5aedc7] [formerly a550df4093e56b611c726b3100d0e568e0dac1a2 [formerly 35209c8a5d]]
Former-commit-id: 6f8e0390cfea3f9531c9e170d1c1bc59ef50d594 [formerly 0fc40b4406]
Former-commit-id: 429b2bdfd5
|
2013-10-29 13:59:00 -05:00 |
|
Mike Duff
|
589da45d3f
|
Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5
Former-commit-id: cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly 25e4a4741c [formerly 6d5f697300 [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]]]
Former-commit-id: 25e4a4741c
Former-commit-id: 3f502364c9 [formerly 4beb79d5a7] [formerly 1328f5fc6ad281525c7abd057dcd30572f31ff3d [formerly 73ecb9af6b]]
Former-commit-id: ae4c63d618c1eb58242c2ffdaf294d319749571c [formerly 2c7dbda379]
Former-commit-id: 26941f1033
|
2013-10-29 13:49:47 -05:00 |
|
Dave Hladky
|
35b2feb1f3
|
Issue #2361 Moved to private JAXB
Former-commit-id: c863bb2c97 [formerly be351c82ed] [formerly 5b5e1ca293] [formerly c863bb2c97 [formerly be351c82ed] [formerly 5b5e1ca293] [formerly 33a0890d31 [formerly 5b5e1ca293 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]]]]
Former-commit-id: 33a0890d31
Former-commit-id: fab58a547c [formerly 3eff51897b] [formerly 6708b8f73ec0bd3504932f11002f618a7640713b [formerly b55b05fa8b]]
Former-commit-id: ba45b80971f8793e70e8c68f88baa52539e1a3e3 [formerly b5e892c16e]
Former-commit-id: cec7d35505
|
2013-10-29 13:45:05 -05:00 |
|
Dave Hladky
|
beee858d72
|
Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: 91e69b800d [formerly f5b9d3be39] [formerly 6cb541d1a1] [formerly 91e69b800d [formerly f5b9d3be39] [formerly 6cb541d1a1] [formerly 15aed68c02 [formerly 6cb541d1a1 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]]]]
Former-commit-id: 15aed68c02
Former-commit-id: ba1de528c3 [formerly b5e309f973] [formerly 0423445a8ccf01b94283305bba59e4481390d48e [formerly a8ab9072cc]]
Former-commit-id: 7ee18cf5142219fe531e31224b5735ba2e4b8bd8 [formerly 072fa5de62]
Former-commit-id: 90d3c540a6
|
2013-10-29 13:05:47 -05:00 |
|
Nate Jensen
|
e4530f8d27
|
Merge "Issue #2491 Move ncep bundles off od SerializationUtil." into development
Former-commit-id: a608282545 [formerly 484271d2a1] [formerly bfa5681bfc] [formerly a608282545 [formerly 484271d2a1] [formerly bfa5681bfc] [formerly cfd62f8693 [formerly bfa5681bfc [formerly 08f8e4274f547455e6a9fc09a3ab025a68f097a7]]]]
Former-commit-id: cfd62f8693
Former-commit-id: fea475b821 [formerly afe952cce9] [formerly c2f30c72fa99980c359172342d3a96d3a96a07d2 [formerly 84deb7d911]]
Former-commit-id: f6b7e0d43d7541ae538df4c537b864fd8ec93992 [formerly d0b49f4979]
Former-commit-id: b962c61c17
|
2013-10-29 12:31:40 -05:00 |
|
Nate Jensen
|
aa404f688d
|
Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: e38de1ea51 [formerly c45f619260] [formerly a5f2414070] [formerly e38de1ea51 [formerly c45f619260] [formerly a5f2414070] [formerly 4879c19e0b [formerly a5f2414070 [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]]]]
Former-commit-id: 4879c19e0b
Former-commit-id: 7ab5fe0249 [formerly 96c901b958] [formerly 78c6fcd26016e4e02e9043303063932ef64058c0 [formerly 4929a59b3e]]
Former-commit-id: b6bc982d0a5ee6e24e7db4cf785f029a2bcd0a04 [formerly cbe8c35605]
Former-commit-id: f377a942fa
|
2013-10-29 12:31:08 -05:00 |
|
Ben Steffensmeier
|
9c4692235f
|
Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly 204b47c67d [formerly a4174430f7 [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]]]
Former-commit-id: 204b47c67d
Former-commit-id: 7e0cb095c2 [formerly 09347cdd5a] [formerly 479b38fd22c3992c7e8afaec4ff032e7fa45f9d9 [formerly 9540b309b3]]
Former-commit-id: 4bf44aa82f7b082680aa650f926af4dfec1c5040 [formerly fd931a3e64]
Former-commit-id: c57dc46dfc
|
2013-10-29 12:28:07 -05:00 |
|
Dave Hladky
|
04f84889d0
|
Issue #2361 Harvester JAXB fixed up
Former-commit-id: daf770c215 [formerly 1deca13487] [formerly 70d2ad2cdc] [formerly daf770c215 [formerly 1deca13487] [formerly 70d2ad2cdc] [formerly bcfa7d7a8f [formerly 70d2ad2cdc [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]]]]
Former-commit-id: bcfa7d7a8f
Former-commit-id: 8e3023b575 [formerly 1a889e84b1] [formerly 4a4db7d882a3b343c5cb1266afa5a2391bddced2 [formerly c5137923c0]]
Former-commit-id: 274ae1d3799435ba4fd3f169d0b7cd96b97db8f6 [formerly 64a9973089]
Former-commit-id: 0d562b64fd
|
2013-10-29 12:20:53 -05:00 |
|
Richard Peter
|
e97a563366
|
Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: f5208d359a [formerly 6cdbad069a] [formerly 1d85220363] [formerly f5208d359a [formerly 6cdbad069a] [formerly 1d85220363] [formerly 1b7b6f0134 [formerly 1d85220363 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]]]]
Former-commit-id: 1b7b6f0134
Former-commit-id: e5ae2ac89f [formerly 4b612a3fa0] [formerly 0cd653cbbf4d6de4d91974c87380cb964aeb3f6f [formerly c27c764c61]]
Former-commit-id: 5434f1ea5812c8edd641cbe3b74d006b0a8ed158 [formerly 3d812fdeb9]
Former-commit-id: 6ba24ad909
|
2013-10-29 12:18:55 -05:00 |
|
Richard Peter
|
573ca1001f
|
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 767cbbf4f2 [formerly 5f1c6f5625] [formerly f75b431a40] [formerly 89b992c01c [formerly f75b431a40 [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]]]]
Former-commit-id: 89b992c01c
Former-commit-id: 4386e3b451 [formerly 66d7ccb859] [formerly e5e56997f9e05d9ac3a79690595406c220de7aa3 [formerly c56806b9b7]]
Former-commit-id: cb5d0cecaa758ef70657cd278220a27ea64c5e62 [formerly e4b3ff9029]
Former-commit-id: 74d2e4189c
|
2013-10-29 12:17:14 -05:00 |
|
Richard Peter
|
75ed6cd788
|
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 8b8f09f176 [formerly bfc87a0607] [formerly fe45d2b7e6] [formerly b6ffed0066 [formerly fe45d2b7e6 [formerly ef99656b07406288bf419037b05e85a5cf5771d6]]]]
Former-commit-id: b6ffed0066
Former-commit-id: b4c3c775f6 [formerly 5baa99e9c9] [formerly d90ab5bca99a3ce62195970bf8966d8c71b5ec87 [formerly 4765eaefad]]
Former-commit-id: a1d272f4a32086548120bb113252741efc701345 [formerly f1d5148c49]
Former-commit-id: 5ee9b1ce9d
|
2013-10-29 12:15:35 -05:00 |
|
Bryan Kowal
|
9d0f21ad44
|
Issue #2268 - fix CAVE installation error
Former-commit-id: 6cc545e8b6 [formerly 203c5d7288] [formerly 7772aca092] [formerly 6cc545e8b6 [formerly 203c5d7288] [formerly 7772aca092] [formerly 5bc115c56c [formerly 7772aca092 [formerly b36df9f89f1c58b1d1a14d05796d656bdeb2d20d]]]]
Former-commit-id: 5bc115c56c
Former-commit-id: 2c3b6c622d [formerly a89499f399] [formerly 43a2360244f03c9fa2d4d4bd82907faa7bb9c7f2 [formerly a34d7b254f]]
Former-commit-id: 82c464eb9285b8e1ee9cf196e42de986b7c808a5 [formerly 893a2cf334]
Former-commit-id: fba7e48970
|
2013-10-29 11:44:48 -05:00 |
|
Ben Steffensmeier
|
1270a5862d
|
Issue #2489 Fix SfcObs NPE.
Former-commit-id: 4f29903ddc [formerly 59d8afc639] [formerly f9ee49fac5] [formerly 4f29903ddc [formerly 59d8afc639] [formerly f9ee49fac5] [formerly ddf506ceac [formerly f9ee49fac5 [formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]]]]
Former-commit-id: ddf506ceac
Former-commit-id: 552f33af6e [formerly 32427d8b3d] [formerly d7e2058fb64a230ba953b4f8ca0bc8b0b881fbe4 [formerly ca5a125829]]
Former-commit-id: d6ba06d23f105cfc8f54f5aa5fa5ceda635d3600 [formerly bab495ab35]
Former-commit-id: f7f75c86da
|
2013-10-29 10:59:36 -05:00 |
|
Steve Harris
|
ba80e5f206
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: f25d638bc2 [formerly a103a0e8ac] [formerly 560b0075cd] [formerly f25d638bc2 [formerly a103a0e8ac] [formerly 560b0075cd] [formerly 6ea4ac62ed [formerly 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: 0be97d503a [formerly 3b29cf6790] [formerly c51eafcb852c1a8282b6694b8e25e7101b5a76bb [formerly eced243e6a]]
Former-commit-id: 23f5786872767a023465fd464ca03603e3e984fb [formerly 75cdf331b6]
Former-commit-id: 8982d892ba
|
2013-10-28 15:58:12 -05:00 |
|
Bryan Kowal
|
71a8ee5a68
|
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 90a54524c6 [formerly df575b7be1] [formerly a6d7822698] [formerly cda8d04831 [formerly a6d7822698 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]]]
Former-commit-id: cda8d04831
Former-commit-id: 3e68d9aaac [formerly 27d2e33769] [formerly 3fa0f0dac5587960c496629c316aa2a1a2f464bc [formerly cc0f6832c9]]
Former-commit-id: 822576469c2608f5a2fcb3645efe10ba1e12bfce [formerly 2615ad7324]
Former-commit-id: 819cb0bcb7
|
2013-10-28 14:50:28 -05:00 |
|
Nate Jensen
|
553475c0a2
|
Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly f62f7dc851 [formerly ac65672cb2 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]]
Former-commit-id: f62f7dc851
Former-commit-id: 7ac7a7ce3d [formerly 9dc4378fc4] [formerly 236fe4b18811523bce5e5090bd5f361fa56869a5 [formerly 87917f3548]]
Former-commit-id: 0e9c2c54cf24b0469949784c3ccb934967d72820 [formerly 98118ccced]
Former-commit-id: b2072949f9
|
2013-10-28 13:27:17 -05:00 |
|
Ben Steffensmeier
|
d74e82bcc5
|
Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07
Former-commit-id: 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 5b439696df [formerly 65522e83c9 [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]]
Former-commit-id: 5b439696df
Former-commit-id: 285a0af019 [formerly 54a39977f5] [formerly ae5d9cd5f9d93524f8b356e1b865d0b7966eab25 [formerly 6866344496]]
Former-commit-id: a70f5f2f9ec94543623b1366018f66b21d4873b5 [formerly e3e621660f]
Former-commit-id: c0ba7d0acc
|
2013-10-28 13:16:23 -05:00 |
|
Ron Anderson
|
b0f0709755
|
Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 306a5d72f4 [formerly 3575496955] [formerly 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]]
Former-commit-id: 53c38fe54d2869c9707556e4244b69af6f55a908 [formerly 1daa0f8649]
Former-commit-id: 643624f1a9
|
2013-10-28 12:59:44 -05:00 |
|
Steve Harris
|
6b1df92d87
|
14.1.1-5 baseline
Former-commit-id: 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly f4c53b02fa [formerly 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]]
Former-commit-id: f4c53b02fa
Former-commit-id: 7de3535d64 [formerly 3b738baba8] [formerly ba0194dff6dd3d0a89190211a15a136f32ca0270 [formerly af2707389c]]
Former-commit-id: 900d27f61f6ae40659280476bc184bfecf0849a7 [formerly 92851705fc]
Former-commit-id: 09eee9a31a
|
2013-10-28 12:14:27 -04:00 |
|
Ben Steffensmeier
|
5ac77f7f76
|
Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]]
Former-commit-id: 44a6f05986
Former-commit-id: 2400380daf [formerly 0e3cf8b47f] [formerly 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]]
Former-commit-id: d4c767bc5d9a92f47044beb03900b35fdf1a24a2 [formerly 0c3bb6ef3e]
Former-commit-id: 47d3fb8249
|
2013-10-28 10:14:08 -05:00 |
|
Steve Harris
|
cbf859daf6
|
14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
c784003711
|
14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
|
2013-10-28 10:46:02 -04:00 |
|
Nate Jensen
|
7068ef91de
|
Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly cda57ce742 [formerly ca2e057635 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]]]
Former-commit-id: cda57ce742
Former-commit-id: 91c89ad6e6 [formerly 4938d287fe] [formerly e024ea40dde60c244a0a5d34215ef2a3de55bd6d [formerly fad56e0c5f]]
Former-commit-id: 2afabcbb665bf52059f4323b46d5d543310c7c5f [formerly b48d5d53c3]
Former-commit-id: 5d8c27a87a
|
2013-10-28 09:31:28 -05:00 |
|
Nate Jensen
|
f13c5a2135
|
Issue #2359 fix for extra long messages
Former-commit-id: ea89d218a8 [formerly e7763c0864] [formerly 665e224c75] [formerly ea89d218a8 [formerly e7763c0864] [formerly 665e224c75] [formerly 3abe5b9f18 [formerly 665e224c75 [formerly 0abed910739dc824b174c8de5c4b155a1fd91803]]]]
Former-commit-id: 3abe5b9f18
Former-commit-id: 3cfbcbed91 [formerly 3d10b22fe1] [formerly e27bb5daa3af459b5fe7294e0931b9bea19a9c01 [formerly 8ad85c297c]]
Former-commit-id: 2a93a20eea98767d6799ee1c4a4d0667ae6f5c60 [formerly e96edbb80a]
Former-commit-id: 91cb555abd
|
2013-10-28 09:15:20 -05:00 |
|
Nate Jensen
|
f76f5e9257
|
Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: fa1bd6b2a4 [formerly 8aa02150c4] [formerly ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a]]
Former-commit-id: 0b16e90747665fb5bad2de4fb36673726f33e59a [formerly 2741cb4348]
Former-commit-id: 8feeb6be16
|
2013-10-28 09:07:04 -05:00 |
|
Nate Jensen
|
14125ffbc6
|
Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 5840b34e67 [formerly 9d43ad381967fff847f33025461a31bb31816819]]]]
Former-commit-id: 15fbcd6984
Former-commit-id: a2bf6fb3fb [formerly e46c285eed] [formerly a46bb24ed422dbd3fd41b66e023bd7c2d4fc36e7 [formerly 68a8dbe064]]
Former-commit-id: 574be25a0b8cf316624f8a62bcea2d308e351fac [formerly 6dcd593f32]
Former-commit-id: 80e84760aa
|
2013-10-28 09:05:01 -05:00 |
|
Nate Jensen
|
d33e2ba044
|
Merge "Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins." into development
Former-commit-id: 16ff44c65a [formerly 8ca435c9e7] [formerly 6dd1198fdf] [formerly 16ff44c65a [formerly 8ca435c9e7] [formerly 6dd1198fdf] [formerly 70421fd756 [formerly 6dd1198fdf [formerly d4adddcf9b5e860cb4976535a1b2309f8fd47783]]]]
Former-commit-id: 70421fd756
Former-commit-id: 9bad4b9171 [formerly 9e64c8d7a2] [formerly 34578e1df0a1aa074fbfd89223d4580c3105e7c9 [formerly 1ed235de97]]
Former-commit-id: ac3c53a21909944813abf42ea2ba6af311f8e9a0 [formerly b4ba3c1aa4]
Former-commit-id: f9f35fbc77
|
2013-10-28 09:04:12 -05:00 |
|
Ben Steffensmeier
|
20d9922f17
|
Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 694511af94 [formerly 4eea088717] [formerly ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]]
Former-commit-id: 122ec98ee5a18fcf8773f9c00abd54bcb37bbc42 [formerly 5645da0b45]
Former-commit-id: ddd58aa99c
|
2013-10-25 15:50:10 -05:00 |
|
Ben Steffensmeier
|
a81a780533
|
Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: 54130af4c9 [formerly a629f974a5] [formerly 88ad284e71] [formerly 54130af4c9 [formerly a629f974a5] [formerly 88ad284e71] [formerly 3150d960e8 [formerly 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]]
Former-commit-id: 3150d960e8
Former-commit-id: 13829ffd04 [formerly 237d947086] [formerly a38be6aaa816c5c84d60730b77824580d18d9898 [formerly 4311d8ea4c]]
Former-commit-id: d023f86bfbb89cb22f672fa575f06062ce7c63be [formerly 39768a50c1]
Former-commit-id: 5e0fc1b98a
|
2013-10-25 15:42:53 -05:00 |
|
Ben Steffensmeier
|
fed726dd48
|
Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]]
Former-commit-id: cac1f07cbb
Former-commit-id: e03a1c1202 [formerly ce9653ab15] [formerly cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9 [formerly a06bdc56d6]]
Former-commit-id: 65760735e4213dff6ee5ff8730b9a56f136c8d54 [formerly 3955ac729f]
Former-commit-id: 7f38aac48c
|
2013-10-25 15:31:39 -05:00 |
|
Ben Steffensmeier
|
91e76a843a
|
Issue #2491 fix d2d xy bundles.
Former-commit-id: bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly 86ba5b9f09 [formerly 5b6e32f47e [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]]]
Former-commit-id: 86ba5b9f09
Former-commit-id: ed7e75b748 [formerly 8248ea2b3b] [formerly abfcb4c0128db0fe3c621473959c887bb4552882 [formerly ddf45e1cf4]]
Former-commit-id: 3ccecf75b62e442a4753a4c621bced1a16209986 [formerly 7272087374]
Former-commit-id: 0fd0580788
|
2013-10-25 14:46:43 -05:00 |
|
Nate Jensen
|
8e6b5e9e9c
|
Issue #2361 remove ISerializableObject from harvester plugin
Former-commit-id: 2903ad6e2b [formerly 540d0ee576] [formerly 5f457fbad6] [formerly 2903ad6e2b [formerly 540d0ee576] [formerly 5f457fbad6] [formerly 68150f49ef [formerly 5f457fbad6 [formerly f80e24871b5fb2e6f990cc099532adfcb802ae13]]]]
Former-commit-id: 68150f49ef
Former-commit-id: 7b789fed6f [formerly 403ba0f9cb] [formerly 05df7516efbadb27700857f955931c8c7e2bf6fe [formerly 2002f94568]]
Former-commit-id: 0422f932ce46aaef20084e9af3ff45c5a690a599 [formerly c2f1e3f838]
Former-commit-id: 8cb574a419
|
2013-10-24 20:06:08 -05:00 |
|
Nate Jensen
|
e95a9d9144
|
Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]]
Former-commit-id: 5a99163569
Former-commit-id: 264555b5d7 [formerly b511177fa1] [formerly 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257]]
Former-commit-id: aa9fcf1acc90fd6b11cfb0a4d5eca4720d7a4f65 [formerly c4161d09ba]
Former-commit-id: 213478f84b
|
2013-10-24 20:02:18 -05:00 |
|
Nate Jensen
|
b9dcdb5c57
|
Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]]
Former-commit-id: b1244552e4
Former-commit-id: e6e0942d70 [formerly 3a1856b168] [formerly 7e842a91bf165a8db2e89fabd3906c256ec6db0e [formerly 803c9a8217]]
Former-commit-id: 644254ee88425258cfd9ef4563cdae5a400c8634 [formerly 9b582b0d83]
Former-commit-id: 9dc852ba9c
|
2013-10-24 19:52:13 -05:00 |
|
Nate Jensen
|
38b3b9aa7c
|
Merge "Issue #2454 Ice model, general ensemble model troubles, null cycle times" into development
Former-commit-id: 5e54da3258 [formerly b2cdbd6fc5] [formerly 5d96feb00e] [formerly 5e54da3258 [formerly b2cdbd6fc5] [formerly 5d96feb00e] [formerly 298114500c [formerly 5d96feb00e [formerly 58686a03e01b6d151b3774bd63ee55b0276b1880]]]]
Former-commit-id: 298114500c
Former-commit-id: d21d7c5283 [formerly 39e7b0fd95] [formerly 251c8ae97f34417aa2812c59e32158d427e4285e [formerly fc1898234d]]
Former-commit-id: 1132a61d15ce06b66c1ae9e4f6b2a86199c6bf77 [formerly 797002f959]
Former-commit-id: f73752af0e
|
2013-10-24 19:51:49 -05:00 |
|
Dave Hladky
|
dbdd2b4b2a
|
Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 36d7c60914 [formerly 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]]
Former-commit-id: 36d7c60914
Former-commit-id: e44f20606e [formerly db33e9cafa] [formerly 84058224c1b44f8002df97e875e14dd66e8446ce [formerly 2b5ffeab74]]
Former-commit-id: a1a65c2049f48990c7a3dd437ec75aeb77d12bc8 [formerly 916f035c87]
Former-commit-id: 7f8ff13d44
|
2013-10-24 13:52:45 -05:00 |
|
Jonathan Sanchez
|
0b1042c10b
|
Issue #2496 Updated gfe spring files to support GFE grids in hazard services.
Change-Id: Icd58f77266a9e6c67c001badcdd1f7590640b162
Former-commit-id: 2c38de5fc5 [formerly c289f77965] [formerly ec2f7c8ce7] [formerly 2c38de5fc5 [formerly c289f77965] [formerly ec2f7c8ce7] [formerly cb5ac5c835 [formerly ec2f7c8ce7 [formerly 0946721292171cc2d14b173a60c273731b73af12]]]]
Former-commit-id: cb5ac5c835
Former-commit-id: 7e7e0c1b27 [formerly d8e14ca6e9] [formerly 0d0f8c6a10f942e9061f2231cc9721b46526f419 [formerly 2420f1a231]]
Former-commit-id: 96f5e33b3fb1d88ffbc24f18e59a6dfd4b516fc5 [formerly 4586b85ef6]
Former-commit-id: 61af6aaa1d
|
2013-10-24 12:22:02 -05:00 |
|
Benjamin Phillippe
|
1ac4adb3f8
|
Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager
Change-Id: I7e0e98517ff7d2213957004c6a94e38cf7063cce
Former-commit-id: 9a8c43a777 [formerly 127b5a3b70] [formerly be09ba9fcf] [formerly 9a8c43a777 [formerly 127b5a3b70] [formerly be09ba9fcf] [formerly 0905d6ffdd [formerly be09ba9fcf [formerly 40fec1c49a0a4aa2ecb4afdf4cf225e6359efd28]]]]
Former-commit-id: 0905d6ffdd
Former-commit-id: 1664af6b9d [formerly a169585a0a] [formerly df866e1f5581eb7f04abe632e8f4bbc1bb498f33 [formerly 041ce07803]]
Former-commit-id: cd8ce79be8fa7373e019fcc9468a531ce8935c43 [formerly d938f48197]
Former-commit-id: 9cc9dc3e9c
|
2013-10-24 11:51:11 -05:00 |
|
Bryan Kowal
|
4a98efb7e0
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: e72cf1aa46 [formerly 6e0737e65f] [formerly a7b85498ef] [formerly e72cf1aa46 [formerly 6e0737e65f] [formerly a7b85498ef] [formerly 49eed21398 [formerly a7b85498ef [formerly 1bfc1a0c02691dfe620909a8c551fa2a79c5a484]]]]
Former-commit-id: 49eed21398
Former-commit-id: 1e76925994 [formerly e87a77d017] [formerly bb3214224b85612967ba09e2cd193a2dff2d5f0d [formerly 3c6f5cc08f]]
Former-commit-id: dd0660113da8e4b09f96de00e0cbe5cbdf1a45ca [formerly 6f5e6888cb]
Former-commit-id: 347c233443
|
2013-10-24 11:32:04 -05:00 |
|
Ben Steffensmeier
|
a14d315ae5
|
Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b
Former-commit-id: f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 3b4ae67ded [formerly 09a3276d51] [formerly 0c6ad2e7a6ad44d264169d56b0486e1f819a8499 [formerly d927e6b2d7]]
Former-commit-id: af4e8832b224839d1a54437070e9f5572038a410 [formerly 5971562d1a]
Former-commit-id: d1d057ae57
|
2013-10-24 11:28:06 -05:00 |
|