Commit graph

4377 commits

Author SHA1 Message Date
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
Bryan Kowal
8479f5a2a3 Re-enable the build of the awips2 rpm.
Former-commit-id: bf245a7f89 [formerly 16e83e3455] [formerly 40e8a94235] [formerly 326144970c [formerly 40e8a94235 [formerly 65ab48743eecfebde890b51a1c74f9a0d68506bf]]]
Former-commit-id: 326144970c
Former-commit-id: 1c783532062ff1679c7f78199095439201056d75 [formerly 1c0a469975]
Former-commit-id: 897b7fbd27
2013-10-30 15:24:01 -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
Bryan Kowal
2a36503bf0 Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: d2bd276fee [formerly e4e2c8c796] [formerly eb4c27003f] [formerly b082ea89c5 [formerly eb4c27003f [formerly d6c5bd5476a039058d5251f4457119fb10806b2e]]]
Former-commit-id: b082ea89c5
Former-commit-id: 67b06516357f8371d7d025ab695b2a9be1b02fc1 [formerly 428dd993d9]
Former-commit-id: 63324cda6a
2013-10-30 09:23:55 -05:00
Ben Steffensmeier
8ec09e8f61 Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly 27a392f90e [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]
Former-commit-id: 27a392f90e
Former-commit-id: 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567]
Former-commit-id: 78efdb7572
2013-10-29 17:35:55 -05:00
Nate Jensen
40243bbcc4 Merge "Issue #2267 Removed java.nio.file dependencies from FilenameFilter." into development
Former-commit-id: 5531ba7fd8 [formerly e024af7e4f] [formerly 7a9fa0c5d3] [formerly c1fb07bc57 [formerly 7a9fa0c5d3 [formerly e7d71688c83961922b6089e719226fc631d65e9a]]]
Former-commit-id: c1fb07bc57
Former-commit-id: 217ae9701811bd936b4275c58d21ee4bae50be5c [formerly 893e91d386]
Former-commit-id: e7b26af054
2013-10-29 17:11:15 -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
Ben Steffensmeier
7b540cb830 Issue #2491 Clean resource datas out of ncep plugins.
Former-commit-id: 5bb82eb545 [formerly b713ae826d] [formerly e1180db74b] [formerly 1ac69169fa [formerly e1180db74b [formerly e1259eb7fa31d3142ca9ce43bf46c52f00fb098e]]]
Former-commit-id: 1ac69169fa
Former-commit-id: 103ccd01e73879c3d8b3bd01b0c764cb47ddfafe [formerly e1054d923c]
Former-commit-id: fe29ef1c58
2013-10-29 16:47:06 -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
Nate Jensen
5fe13ba2f8 Merge "Issue #2361 Moved to private JAXB" into development
Former-commit-id: 20d0ba97f4 [formerly 8de69e035a] [formerly 11a5776652] [formerly f9d9b0a1dc [formerly 11a5776652 [formerly c55568de340105c89b118ff3f719c7816dcb5e3b]]]
Former-commit-id: f9d9b0a1dc
Former-commit-id: a550df4093e56b611c726b3100d0e568e0dac1a2 [formerly 35209c8a5d]
Former-commit-id: 9fee5aedc7
2013-10-29 13:59:00 -05:00
Mike Duff
3f502364c9 Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5

Former-commit-id: cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly 25e4a4741c [formerly 6d5f697300 [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]]
Former-commit-id: 25e4a4741c
Former-commit-id: 1328f5fc6ad281525c7abd057dcd30572f31ff3d [formerly 73ecb9af6b]
Former-commit-id: 4beb79d5a7
2013-10-29 13:49:47 -05:00
Dave Hladky
fab58a547c Issue #2361 Moved to private JAXB
Former-commit-id: c863bb2c97 [formerly be351c82ed] [formerly 5b5e1ca293] [formerly 33a0890d31 [formerly 5b5e1ca293 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]]]
Former-commit-id: 33a0890d31
Former-commit-id: 6708b8f73ec0bd3504932f11002f618a7640713b [formerly b55b05fa8b]
Former-commit-id: 3eff51897b
2013-10-29 13:45:05 -05:00
Dave Hladky
ba1de528c3 Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: 91e69b800d [formerly f5b9d3be39] [formerly 7d0bb5825fabe6056e054ebed4b8de6346b820b9 [formerly 6cb541d1a1]] [formerly 15aed68c02 [formerly 6cb541d1a1 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]]]
Former-commit-id: 15aed68c02
Former-commit-id: 0423445a8ccf01b94283305bba59e4481390d48e [formerly a8ab9072cc]
Former-commit-id: b5e309f973
2013-10-29 13:05:47 -05:00
Nate Jensen
fea475b821 Merge "Issue #2491 Move ncep bundles off od SerializationUtil." into development
Former-commit-id: a608282545 [formerly 484271d2a1] [formerly bfa5681bfc] [formerly cfd62f8693 [formerly bfa5681bfc [formerly 08f8e4274f547455e6a9fc09a3ab025a68f097a7]]]
Former-commit-id: cfd62f8693
Former-commit-id: c2f30c72fa99980c359172342d3a96d3a96a07d2 [formerly 84deb7d911]
Former-commit-id: afe952cce9
2013-10-29 12:31:40 -05:00
Nate Jensen
7ab5fe0249 Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: e38de1ea51 [formerly c45f619260] [formerly a5f2414070] [formerly 4879c19e0b [formerly a5f2414070 [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]]]
Former-commit-id: 4879c19e0b
Former-commit-id: 78c6fcd26016e4e02e9043303063932ef64058c0 [formerly 4929a59b3e]
Former-commit-id: 96c901b958
2013-10-29 12:31:08 -05:00
Ben Steffensmeier
7e0cb095c2 Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly 204b47c67d [formerly a4174430f7 [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]]
Former-commit-id: 204b47c67d
Former-commit-id: 479b38fd22c3992c7e8afaec4ff032e7fa45f9d9 [formerly 9540b309b3]
Former-commit-id: 09347cdd5a
2013-10-29 12:28:07 -05:00
Dave Hladky
8e3023b575 Issue #2361 Harvester JAXB fixed up
Former-commit-id: daf770c215 [formerly 1deca13487] [formerly 70d2ad2cdc] [formerly bcfa7d7a8f [formerly 70d2ad2cdc [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]]]
Former-commit-id: bcfa7d7a8f
Former-commit-id: 4a4db7d882a3b343c5cb1266afa5a2391bddced2 [formerly c5137923c0]
Former-commit-id: 1a889e84b1
2013-10-29 12:20:53 -05:00
Richard Peter
e5ae2ac89f Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: f5208d359a [formerly 6cdbad069a] [formerly 1d85220363] [formerly 1b7b6f0134 [formerly 1d85220363 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]]]
Former-commit-id: 1b7b6f0134
Former-commit-id: 0cd653cbbf4d6de4d91974c87380cb964aeb3f6f [formerly c27c764c61]
Former-commit-id: 4b612a3fa0
2013-10-29 12:18:55 -05:00
Richard Peter
4386e3b451 Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: 767cbbf4f2 [formerly 5f1c6f5625] [formerly f75b431a40] [formerly 89b992c01c [formerly f75b431a40 [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]]]
Former-commit-id: 89b992c01c
Former-commit-id: e5e56997f9e05d9ac3a79690595406c220de7aa3 [formerly c56806b9b7]
Former-commit-id: 66d7ccb859
2013-10-29 12:17:14 -05:00
Richard Peter
b4c3c775f6 Merge "Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box." into development
Former-commit-id: 8b8f09f176 [formerly bfc87a0607] [formerly fe45d2b7e6] [formerly b6ffed0066 [formerly fe45d2b7e6 [formerly ef99656b07406288bf419037b05e85a5cf5771d6]]]
Former-commit-id: b6ffed0066
Former-commit-id: d90ab5bca99a3ce62195970bf8966d8c71b5ec87 [formerly 4765eaefad]
Former-commit-id: 5baa99e9c9
2013-10-29 12:15:35 -05:00
Bryan Kowal
2c3b6c622d Issue #2268 - fix CAVE installation error
Former-commit-id: 6cc545e8b6 [formerly 203c5d7288] [formerly 7772aca092] [formerly 5bc115c56c [formerly 7772aca092 [formerly b36df9f89f1c58b1d1a14d05796d656bdeb2d20d]]]
Former-commit-id: 5bc115c56c
Former-commit-id: 43a2360244f03c9fa2d4d4bd82907faa7bb9c7f2 [formerly a34d7b254f]
Former-commit-id: a89499f399
2013-10-29 11:44:48 -05:00
Ben Steffensmeier
552f33af6e Issue #2489 Fix SfcObs NPE.
Former-commit-id: 4f29903ddc [formerly 59d8afc639] [formerly f9ee49fac5] [formerly ddf506ceac [formerly f9ee49fac5 [formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]]]
Former-commit-id: ddf506ceac
Former-commit-id: d7e2058fb64a230ba953b4f8ca0bc8b0b881fbe4 [formerly ca5a125829]
Former-commit-id: 32427d8b3d
2013-10-29 10:59:36 -05:00
Steve Harris
0be97d503a Merge branch 'development' into development_on_RHEL6
Former-commit-id: f25d638bc2 [formerly a103a0e8ac] [formerly 560b0075cd] [formerly 6ea4ac62ed [formerly 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: c51eafcb852c1a8282b6694b8e25e7101b5a76bb [formerly eced243e6a]
Former-commit-id: 3b29cf6790
2013-10-28 15:58:12 -05:00
Bryan Kowal
3e68d9aaac Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: 90a54524c6 [formerly df575b7be1] [formerly a6d7822698] [formerly cda8d04831 [formerly a6d7822698 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]]
Former-commit-id: cda8d04831
Former-commit-id: 3fa0f0dac5587960c496629c316aa2a1a2f464bc [formerly cc0f6832c9]
Former-commit-id: 27d2e33769
2013-10-28 14:50:28 -05:00
Steve Harris
dd533f0bce Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly 972339d60f [formerly 602f138493 [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]
Former-commit-id: 972339d60f
Former-commit-id: 9a8e1c383979dad1eabd28f3f1501bac50b45b28 [formerly 4c0599bae8]
Former-commit-id: a444c93ee7
2013-10-28 14:39:22 -05:00
Nate Jensen
7ac7a7ce3d 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 f62f7dc851 [formerly ac65672cb2 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]
Former-commit-id: f62f7dc851
Former-commit-id: 236fe4b18811523bce5e5090bd5f361fa56869a5 [formerly 87917f3548]
Former-commit-id: 9dc4378fc4
2013-10-28 13:27:17 -05:00
Ben Steffensmeier
285a0af019 Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07

Former-commit-id: 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 5b439696df [formerly 65522e83c9 [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]
Former-commit-id: 5b439696df
Former-commit-id: ae5d9cd5f9d93524f8b356e1b865d0b7966eab25 [formerly 6866344496]
Former-commit-id: 54a39977f5
2013-10-28 13:16:23 -05:00
Ron Anderson
306a5d72f4 Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]
Former-commit-id: 3575496955
2013-10-28 12:59:44 -05:00
Richard Peter
2fdae3f973 Merge "Issue #2249 availableTime now always return non-empty list." into omaha_13.5.3
Former-commit-id: 0473a8b587 [formerly 0c3de0a096] [formerly a6c98bc229] [formerly dbea005bd7 [formerly a6c98bc229 [formerly 67d7e4e67e0c9e00ca2a7492a1653e3777303a65]]]
Former-commit-id: dbea005bd7
Former-commit-id: cfe96e59828c3d24949f56a52e75fc956b05bca3 [formerly 4e4cbc2bfb]
Former-commit-id: 505ccfba12
2013-10-28 12:29:58 -05:00
Richard Peter
48267f510b Issue #2362: Fix merge issue
Former-commit-id: 89e5781b13 [formerly 6dba9925c3] [formerly 814b1878b2] [formerly 51bf66d456 [formerly 814b1878b2 [formerly 03fa4950011aaee4f4d7cfeda68fe8ad3359a138]]]
Former-commit-id: 51bf66d456
Former-commit-id: f75934ef7aeecb24bea0928dbfb67cd395fc700d [formerly 50bd787f24]
Former-commit-id: 4e5cd1b28b
2013-10-28 12:13:04 -05:00
Steve Harris
7de3535d64 14.1.1-5 baseline
Former-commit-id: 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly f4c53b02fa [formerly 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]
Former-commit-id: f4c53b02fa
Former-commit-id: ba0194dff6dd3d0a89190211a15a136f32ca0270 [formerly af2707389c]
Former-commit-id: 3b738baba8
2013-10-28 12:14:27 -04:00
Ben Steffensmeier
2400380daf Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]
Former-commit-id: 0e3cf8b47f
2013-10-28 10:14:08 -05:00
Steve Harris
2039d101ef 14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly 20443a5d933e8268c1fb3f455df197a71fca1203 [formerly bd95bb6a4e]] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]
Former-commit-id: b60635cd70
2013-10-28 10:55:16 -04:00
Steve Harris
2d30611c6d 14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]
Former-commit-id: aa59400b67
2013-10-28 10:46:02 -04:00
Nate Jensen
91c89ad6e6 Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly cda57ce742 [formerly ca2e057635 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]]
Former-commit-id: cda57ce742
Former-commit-id: e024ea40dde60c244a0a5d34215ef2a3de55bd6d [formerly fad56e0c5f]
Former-commit-id: 4938d287fe
2013-10-28 09:31:28 -05:00
Steve Harris
2fbc08d837 13.5.3-1 baseline
Former-commit-id: 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0]
Former-commit-id: 06f5dcf801
2013-10-28 10:30:57 -04:00
Nate Jensen
3cfbcbed91 Issue #2359 fix for extra long messages
Former-commit-id: ea89d218a8 [formerly e7763c0864] [formerly 665e224c75] [formerly 3abe5b9f18 [formerly 665e224c75 [formerly 0abed910739dc824b174c8de5c4b155a1fd91803]]]
Former-commit-id: 3abe5b9f18
Former-commit-id: e27bb5daa3af459b5fe7294e0931b9bea19a9c01 [formerly 8ad85c297c]
Former-commit-id: 3d10b22fe1
2013-10-28 09:15:20 -05:00
Nate Jensen
fa1bd6b2a4 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a]
Former-commit-id: 8aa02150c4
2013-10-28 09:07:04 -05:00
Nate Jensen
a2bf6fb3fb Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 5840b34e67 [formerly 9d43ad381967fff847f33025461a31bb31816819]]]
Former-commit-id: 15fbcd6984
Former-commit-id: a46bb24ed422dbd3fd41b66e023bd7c2d4fc36e7 [formerly 68a8dbe064]
Former-commit-id: e46c285eed
2013-10-28 09:05:01 -05:00
Nate Jensen
9bad4b9171 Merge "Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins." into development
Former-commit-id: 16ff44c65a [formerly 8ca435c9e7] [formerly 6dd1198fdf] [formerly 70421fd756 [formerly 6dd1198fdf [formerly d4adddcf9b5e860cb4976535a1b2309f8fd47783]]]
Former-commit-id: 70421fd756
Former-commit-id: 34578e1df0a1aa074fbfd89223d4580c3105e7c9 [formerly 1ed235de97]
Former-commit-id: 9e64c8d7a2
2013-10-28 09:04:12 -05:00
Ben Steffensmeier
694511af94 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]
Former-commit-id: 4eea088717
2013-10-25 15:50:10 -05:00
Ben Steffensmeier
13829ffd04 Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: 54130af4c9 [formerly a629f974a5] [formerly de02c88451a8ddfee21be1432313918cb2a173ac [formerly 88ad284e71]] [formerly 3150d960e8 [formerly 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]
Former-commit-id: 3150d960e8
Former-commit-id: a38be6aaa816c5c84d60730b77824580d18d9898 [formerly 4311d8ea4c]
Former-commit-id: 237d947086
2013-10-25 15:42:53 -05:00