Commit graph

2471 commits

Author SHA1 Message Date
Bryan Kowal
bdc76d27b2 Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 0f104b0365 [formerly 4f1c083032] [formerly 0f104b0365 [formerly 4f1c083032] [formerly bb15605aa2 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]]
Former-commit-id: bb15605aa2
Former-commit-id: 0b006511dc [formerly 0bc8cdc9be]
Former-commit-id: 46616c32eb
2013-11-06 15:57:14 -06:00
Lee Venable
3cc206a34f Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 326e4e31a7 [formerly 8585080cd1] [formerly 326e4e31a7 [formerly 8585080cd1] [formerly 20726d4e7c [formerly 13672783e6a5e452cb4105669a98708329b35541]]]
Former-commit-id: 20726d4e7c
Former-commit-id: 9a8a813cf8 [formerly 0c4566c411]
Former-commit-id: 5627ef0cc8
2013-11-06 15:42:40 -06:00
Max Schenkelberg
53363b9bf7 Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
Amend: Fixed precision issue with float comparison, made factory better synchronized.

Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2

Former-commit-id: d7c8b8f662 [formerly 3369fbec2d] [formerly d7c8b8f662 [formerly 3369fbec2d] [formerly c28fd2b38d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]
Former-commit-id: c28fd2b38d
Former-commit-id: e4b7f3618c [formerly d53db3ddb6]
Former-commit-id: 751b8f2315
2013-11-06 15:07:18 -06:00
Richard Peter
f39e0c68c0 Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: b4a0f11c66 [formerly 27aa0dd6ba] [formerly b4a0f11c66 [formerly 27aa0dd6ba] [formerly 6ccb444219 [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]]
Former-commit-id: 6ccb444219
Former-commit-id: 6b8bea4af5 [formerly f4bdb0caea]
Former-commit-id: b52c9482ea
2013-11-06 13:44:11 -06:00
Ben Steffensmeier
925d8bca38 Issue #2493 remove mesowest.
Former-commit-id: f761c701cf [formerly d0b7966458] [formerly f761c701cf [formerly d0b7966458] [formerly 36916fedcd [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]
Former-commit-id: 36916fedcd
Former-commit-id: 5d31aad5c2 [formerly baebe37ba6]
Former-commit-id: afe014af99
2013-11-06 13:42:38 -06:00
Slav Korolev
a2e60dbe60 Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: cc90a7af4b [formerly 076865bb61] [formerly cc90a7af4b [formerly 076865bb61] [formerly c25204d75b [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]]
Former-commit-id: c25204d75b
Former-commit-id: 8fbf625667 [formerly 3223cd19cd]
Former-commit-id: b8ebc9ac63
2013-11-06 14:38:55 -05:00
Steve Harris
cfb3194426 14.1.1-7 baseline
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653]
Former-commit-id: 647b908fed
2013-11-06 14:16:14 -05:00
Roger Ferrel
8533c6e67c Issue #2478 Add debug infromation.
Change-Id: I830a760e2505a744da4962299bf97f46462f4784

Former-commit-id: f198c27f3f [formerly 07a7dd63c3] [formerly f198c27f3f [formerly 07a7dd63c3] [formerly e01b524542 [formerly db0434a66ca415554d1ab0c90586dc7358fd730d]]]
Former-commit-id: e01b524542
Former-commit-id: d10ffdcca7 [formerly 274d52a694]
Former-commit-id: df1dc51d0d
2013-11-06 13:13:02 -06:00
Richard Peter
463f09984a Issue #2499: Fix build
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c

Former-commit-id: 15fd2f7a55 [formerly f3d8768b94] [formerly 15fd2f7a55 [formerly f3d8768b94] [formerly c09f68615c [formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]]
Former-commit-id: c09f68615c
Former-commit-id: 1b65a09a52 [formerly a653f9625a]
Former-commit-id: 3c129fb138
2013-11-06 13:09:32 -06:00
Steve Harris
0aa90a7855 14.1.1-6 baseline
Former-commit-id: 946a9be17e [formerly 0cb2978c13] [formerly 946a9be17e [formerly 0cb2978c13] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: e86a0aa489 [formerly 26da1ce793]
Former-commit-id: 270c5f1a2d
2013-11-06 14:08:33 -05:00
Mike Duff
4cede401ec Issue #2358 - Move config file management code to the subscription manager dialog.
Change-Id: I61b8093b1306404006c5d01b73874997054c4f2f

Former-commit-id: 65f9da04a9 [formerly e1180868e7] [formerly 65f9da04a9 [formerly e1180868e7] [formerly 35c4911e7e [formerly 100fe3e61e5156dba32419005da4473bcd6d1e8b]]]
Former-commit-id: 35c4911e7e
Former-commit-id: e1b9c9daa8 [formerly 7e28ffcaad]
Former-commit-id: 39dda9d18c
2013-11-06 12:00:04 -06:00
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
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
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
Ben Steffensmeier
dacf863d66 Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: d386c6bc76 [formerly ff5f08d23a] [formerly d386c6bc76 [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: d38879158d [formerly 08e73de883]
Former-commit-id: a0f4c08cfd
2013-11-04 13:01:49 -06:00
Lee Venable
ade7b14670 Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: bfc83fa74e [formerly 0b3346d699] [formerly bfc83fa74e [formerly 0b3346d699] [formerly 3e7b7cec8f [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: c7d03bf267 [formerly f6f1b16c0c]
Former-commit-id: 52da34fc55
2013-11-02 10:43:48 -05:00
Slav Korolev
e4a2b6d619 Issue #2431. Changed labels on the table.
Former-commit-id: 8874f76878 [formerly dd1ff63737] [formerly 8874f76878 [formerly dd1ff63737] [formerly 0801f8dedd [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]]
Former-commit-id: 0801f8dedd
Former-commit-id: 6b3481ca26 [formerly 7d0198b356]
Former-commit-id: f8e429a1b9
2013-11-01 15:06:19 -04:00
Steve Harris
90f27a16c9 13.5.3-4 baseline
Former-commit-id: 0ee69293ec [formerly 8aeae1c481] [formerly 0ee69293ec [formerly 8aeae1c481] [formerly da7d1ce05e [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]]
Former-commit-id: da7d1ce05e
Former-commit-id: 7454b37d59 [formerly b8d3fd62d0]
Former-commit-id: 8f9b121f90
2013-11-01 14:20:00 -04:00
Ron Anderson
638b57e188 Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: a15c620fc8 [formerly 9e9dd04bfd] [formerly a15c620fc8 [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]
Former-commit-id: cc991ed528
Former-commit-id: f453d92818 [formerly deb89a88f5]
Former-commit-id: 84adff8e96
2013-11-01 11:07:39 -05:00
Slav Korolev
884ca2167c Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: feb9d8db5a [formerly 7ca47690af] [formerly feb9d8db5a [formerly 7ca47690af] [formerly f7d1939b36 [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]]
Former-commit-id: f7d1939b36
Former-commit-id: fcbe5d09da [formerly 386db59985]
Former-commit-id: 57fc9a2183
2013-11-01 11:03:06 -04: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
David Gillingham
4862c1d171 Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af

Former-commit-id: f404f1560c [formerly 6e1cca2966] [formerly f404f1560c [formerly 6e1cca2966] [formerly c4f5cc53bb [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 3776f258a3 [formerly 3bac577a31]
Former-commit-id: 5df42898ad
2013-10-31 14:07:20 -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
Nate Jensen
3c1f343be5 Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: b17891ba0e [formerly ccf3d5b1e9] [formerly b17891ba0e [formerly ccf3d5b1e9] [formerly de50a9214b [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]
Former-commit-id: de50a9214b
Former-commit-id: c9d9070600 [formerly d6fcc98e76]
Former-commit-id: c24d8c63cd
2013-10-31 12:24:23 -05:00
Steve Harris
ef72863e6f 13.5.3-3 baseline
Former-commit-id: 883ad32443 [formerly baa036cd62] [formerly 883ad32443 [formerly baa036cd62] [formerly 1503847a4b [formerly c261e0753eb106a2912314056a1b4903695750c5]]]
Former-commit-id: 1503847a4b
Former-commit-id: a58b825dde [formerly 6b879b2465]
Former-commit-id: 5be6e21405
2013-10-31 12:52:07 -04: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
Steve Harris
e90722d781 13.5.3-2 baseline
Former-commit-id: c6d951b390 [formerly 055783655b] [formerly c6d951b390 [formerly 055783655b] [formerly 6d85d944a6 [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]
Former-commit-id: 6d85d944a6
Former-commit-id: 0c17777164 [formerly aef0e828d2]
Former-commit-id: 1cc13c9992
2013-10-30 12:53:25 -04: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
Ben Steffensmeier
02b9133d50 Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: e15fecc459 [formerly 5b395f7417] [formerly e15fecc459 [formerly 5b395f7417] [formerly 27a392f90e [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]
Former-commit-id: 27a392f90e
Former-commit-id: 78efdb7572 [formerly 418c259567]
Former-commit-id: 9d87eb50e2
2013-10-29 17:35:55 -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
Mike Duff
26941f1033 Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5

Former-commit-id: 2d7c38290e [formerly 6d5f697300] [formerly 2d7c38290e [formerly 6d5f697300] [formerly 25e4a4741c [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]]
Former-commit-id: 25e4a4741c
Former-commit-id: 4beb79d5a7 [formerly 73ecb9af6b]
Former-commit-id: 2c7dbda379
2013-10-29 13:49:47 -05:00
Ben Steffensmeier
c57dc46dfc Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: 9c62c3bae2 [formerly a4174430f7] [formerly 9c62c3bae2 [formerly a4174430f7] [formerly 204b47c67d [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]]
Former-commit-id: 204b47c67d
Former-commit-id: 09347cdd5a [formerly 9540b309b3]
Former-commit-id: fd931a3e64
2013-10-29 12:28:07 -05:00
Nate Jensen
b2072949f9 Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: 4cd0b3fed7 [formerly ac65672cb2] [formerly 4cd0b3fed7 [formerly ac65672cb2] [formerly f62f7dc851 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]
Former-commit-id: f62f7dc851
Former-commit-id: 9dc4378fc4 [formerly 87917f3548]
Former-commit-id: 98118ccced
2013-10-28 13:27:17 -05:00
Ben Steffensmeier
c0ba7d0acc Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07

Former-commit-id: 4e86bb8e5f [formerly 65522e83c9] [formerly 4e86bb8e5f [formerly 65522e83c9] [formerly 5b439696df [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]
Former-commit-id: 5b439696df
Former-commit-id: 54a39977f5 [formerly 6866344496]
Former-commit-id: e3e621660f
2013-10-28 13:16:23 -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
Ben Steffensmeier
47d3fb8249 Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: 0c66089721 [formerly 27165cea30] [formerly 0c66089721 [formerly 27165cea30] [formerly 44a6f05986 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 0e3cf8b47f [formerly 1f33a1997e]
Former-commit-id: 0c3bb6ef3e
2013-10-28 10:14:08 -05:00
Steve Harris
da4589ec2b 14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
2013-10-28 10:55:16 -04:00
Steve Harris
472c0a1a5e 14.1.1-3 baseline
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: aa59400b67 [formerly 4a6a209aea]
Former-commit-id: 8d67ffede4
2013-10-28 10:46:02 -04:00
Nate Jensen
5d8c27a87a Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: b8d194e4cd [formerly ca2e057635] [formerly b8d194e4cd [formerly ca2e057635] [formerly cda57ce742 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]]
Former-commit-id: cda57ce742
Former-commit-id: 4938d287fe [formerly fad56e0c5f]
Former-commit-id: b48d5d53c3
2013-10-28 09:31:28 -05:00
Steve Harris
0e99e713e6 13.5.3-1 baseline
Former-commit-id: 059083170d [formerly 1d8a2026f6] [formerly 059083170d [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]
Former-commit-id: 30f65c2858
Former-commit-id: 06f5dcf801 [formerly 9df3027bf0]
Former-commit-id: 43610e510c
2013-10-28 10:30:57 -04:00
Nate Jensen
8feeb6be16 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 13eafc05c2 [formerly 4b19d287ea] [formerly 13eafc05c2 [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: 8aa02150c4 [formerly aa0e2ca80a]
Former-commit-id: 2741cb4348
2013-10-28 09:07:04 -05:00
Nate Jensen
80e84760aa Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: f98764cfb6 [formerly 5840b34e67] [formerly f98764cfb6 [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 9d43ad381967fff847f33025461a31bb31816819]]]
Former-commit-id: 15fbcd6984
Former-commit-id: e46c285eed [formerly 68a8dbe064]
Former-commit-id: 6dcd593f32
2013-10-28 09:05:01 -05:00
Ben Steffensmeier
ddd58aa99c Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: 3b68ce8d72 [formerly 2a83b45f93] [formerly 3b68ce8d72 [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 4eea088717 [formerly fbdcadb456]
Former-commit-id: 5645da0b45
2013-10-25 15:50:10 -05:00
Ben Steffensmeier
5e0fc1b98a Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: a629f974a5 [formerly 88ad284e71] [formerly a629f974a5 [formerly 88ad284e71] [formerly 3150d960e8 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]
Former-commit-id: 3150d960e8
Former-commit-id: 237d947086 [formerly 4311d8ea4c]
Former-commit-id: 39768a50c1
2013-10-25 15:42:53 -05:00
Ben Steffensmeier
7f38aac48c Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: f34bfc1e5b [formerly c14cc609a8] [formerly f34bfc1e5b [formerly c14cc609a8] [formerly cac1f07cbb [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]
Former-commit-id: cac1f07cbb
Former-commit-id: ce9653ab15 [formerly a06bdc56d6]
Former-commit-id: 3955ac729f
2013-10-25 15:31:39 -05:00