Commit graph

4406 commits

Author SHA1 Message Date
Nate Jensen
ee8d223346 Merge "Issue #2620 Fixed viz base feature dependency issues." into development
Former-commit-id: 3c728333b7 [formerly c4c61022b9] [formerly 4c90d4c5f6] [formerly cd58066889 [formerly 4c90d4c5f6 [formerly e41526263edecf1e867c27ccb89b6326f9675a85]]]
Former-commit-id: cd58066889
Former-commit-id: 823402ec5485e61576f944862a7a0a2a71242200 [formerly 8194559a6e]
Former-commit-id: 9a03bf5943
2013-12-10 10:24:25 -06:00
Max Schenkelberg
774859fcb9 Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]
Former-commit-id: 987d4b3a30
Former-commit-id: f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e]
Former-commit-id: e86e477165
2013-12-09 15:14:01 -06:00
Brian Clements
4d04f6edbf Issue #2561 removed ECF from collaboration
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]
Former-commit-id: e6c4b39aca
Former-commit-id: ea97705eee929964d9b775519d5de735e490a0d4 [formerly b8df043202]
Former-commit-id: 5a7fca6352
2013-12-06 17:07:16 -06:00
Ben Steffensmeier
57de1adb55 Issue #2537 Fix feature for poitndata dependency on dataaccess.
Former-commit-id: 258988c269 [formerly 067c510315] [formerly 59c6a24b68] [formerly d883f8dbb1 [formerly 59c6a24b68 [formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 0119ce6ac19df37c80d8dfefa6dbbff1e8a7d526 [formerly 99afa17fd2]
Former-commit-id: 899cb2628c
2013-12-06 09:14:01 -06:00
Bryan Kowal
0c43ddc19a Issue #2509 - re-compile grib2.so for RHEL6 64-bit
Former-commit-id: e907393567 [formerly 8f053f9fcd] [formerly 187759698b] [formerly 5b8a8ddbeb [formerly 187759698b [formerly 90958e13e98147130848aad26d077e7a040ddb51]]]
Former-commit-id: 5b8a8ddbeb
Former-commit-id: ce6e7989617ea657c038124ee01c2907330c0e40 [formerly eceffc3880]
Former-commit-id: ea0243e5da
2013-12-05 15:53:51 -06:00
Brad Gonzales
fa097589d0 Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
       the edex.core.modes package.  Move EdexMode, DefaultEdexMode, and EdexModesContainer
       to the same package.

Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb

Former-commit-id: 310597d856 [formerly 3d34764022] [formerly 410a00c72a] [formerly 72df38075f [formerly 410a00c72a [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]
Former-commit-id: 72df38075f
Former-commit-id: d6d85c281b70c2e07827f44bc42368ab797e8062 [formerly c54fe467a3]
Former-commit-id: e18f7b2380
2013-12-05 15:17:14 -06:00
Richard Peter
3088533103 Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: da82396995 [formerly df4a4c5121] [formerly d0b50eee3c] [formerly 6fde307f0a [formerly d0b50eee3c [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]
Former-commit-id: 6fde307f0a
Former-commit-id: ab63c3e242c8f489c2b55d427b4ca49dfd7b4657 [formerly 9f4dfc9051]
Former-commit-id: 45889cb80f
2013-12-05 14:54:46 -06:00
Richard Peter
af583069c4 Issue #2509: Fix bad merge of DupElimSrv
Change-Id: I72702e9943016cd6e00ecc8755222d8de31ee322

Former-commit-id: 3dd79852c5 [formerly 02f48f898f] [formerly 5286ef0efa] [formerly 01a8461ec9 [formerly 5286ef0efa [formerly a266d4007bdb58525942ef406d6fd7a4d269bb8c]]]
Former-commit-id: 01a8461ec9
Former-commit-id: b77fed65aafbc3c1525e24ed1b2eabe0af90b127 [formerly 407fd38c5f]
Former-commit-id: b91b4913c6
2013-12-05 14:22:25 -06:00
Mike Duff
802e0d360c Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly 0c452e2434 [formerly 4796f43495 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]
Former-commit-id: 0c452e2434
Former-commit-id: 0a68403f743b2b5033d96fa1433b811164defb55 [formerly 7f2ddb1360]
Former-commit-id: 45cf9384d8
2013-12-05 13:35:31 -06:00
Richard Peter
7b222f8982 Merge "Issue #1829 Refactored EBXML registry objects" into development
Former-commit-id: bf845a6f50 [formerly 0cfe359507] [formerly bacfa33301] [formerly 88c866256e [formerly bacfa33301 [formerly 5f1736746f7594ba0bda3a48083a78ff5ec8d2c9]]]
Former-commit-id: 88c866256e
Former-commit-id: d13b14c1956ab859e5db6a8f3904659a9ce48a78 [formerly 9e64f22e8b]
Former-commit-id: ba1bd01bca
2013-12-05 13:01:02 -06:00
Nate Jensen
b838267dfc Merge "Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator." into development
Former-commit-id: 70667c9edc [formerly 178b2bc3fa] [formerly 34205de815] [formerly db25d00dc5 [formerly 34205de815 [formerly 18437fb36f9fff510f526ba40b52c4ec4793e18b]]]
Former-commit-id: db25d00dc5
Former-commit-id: 75746ca49730ca540e2a30e1645ceb7d3dc5b58b [formerly 280325460f]
Former-commit-id: 8b4f6873a0
2013-12-05 13:00:06 -06:00
Nate Jensen
ad2b7df40b Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly ae0bd2a86f [formerly c47f6546dd [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: e0720d869c55d2c9da519b9b077f3fd06f02207e [formerly 7163e28d35]
Former-commit-id: 15fee953f5
2013-12-05 12:59:58 -06:00
Richard Peter
405274c409 Issue #2509: Fix IFPWE merge issue
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75

Former-commit-id: 98d1934501 [formerly 5ad19e32a9] [formerly de24b8f3df2df8d4f5e956eb80e2cfbe5f61edc6 [formerly 73960ce29a]] [formerly a8b251223a [formerly 73960ce29a [formerly 9450ca459d6b2efdea0d0124a6f9e7100eb5472a]]]
Former-commit-id: a8b251223a
Former-commit-id: 353ea204d786797b9a8d11a6fa8df1eaa4fe8faa [formerly 7bcdabd8dd]
Former-commit-id: f473851db8
2013-12-05 12:33:51 -06:00
Richard Peter
530b3bd588 Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]
Former-commit-id: 60679a818a
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
8ca3c352c6 Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator.
Former-commit-id: 8746c75023 [formerly 9036774493] [formerly a567f2af89] [formerly 3d2439dc31 [formerly a567f2af89 [formerly fb354f5242a3eac4bf3d3c35efef78ed7a7e01f4]]]
Former-commit-id: 3d2439dc31
Former-commit-id: 10d58850c6a7d67b077c8a2f260784bc567fdc56 [formerly a5001016c9]
Former-commit-id: d1cfb7f9d5
2013-12-05 11:27:29 -06:00
Ben Steffensmeier
6ebc4e5fbc Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 318e48c945 [formerly 7c2a4ef72c] [formerly 9df4f83a0cf5042c67bf0eccc5635e37d1e149a8 [formerly f682e66e9b]] [formerly 46a466497c [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]
Former-commit-id: 46a466497c
Former-commit-id: a3846ce22f8e198d3cc7cd225b88e3fcecf8d9a7 [formerly ad9fee446d]
Former-commit-id: fde968a834
2013-12-05 10:54:28 -06:00
Benjamin Phillippe
2165a9059a Issue #1829 Refactored EBXML registry objects
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d

Former-commit-id: da4f658b7a [formerly ed890ce9d9] [formerly 0b0e70b667] [formerly ed77440c28 [formerly 0b0e70b667 [formerly 6eb387e69c2fc4837b58f99e4343a745162fb384]]]
Former-commit-id: ed77440c28
Former-commit-id: 30d36d7bd29ad367d12eab6b8c4f863628e42d08 [formerly 7ed6195536]
Former-commit-id: 7051d10140
2013-12-05 10:20:24 -06:00
Lee Venable
0a9dcb2cc4 Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
Former-commit-id: 93a5c3f746 [formerly 67accdb7e3] [formerly 4f1b663b37] [formerly b7be687903 [formerly 4f1b663b37 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]]
Former-commit-id: b7be687903
Former-commit-id: 7f9e4e582c0c271e96b06859da97ccb310d3b7f3 [formerly 3a3333e4ec]
Former-commit-id: 40dc07e0ff
2013-12-05 08:30:28 -06:00
Lee Venable
35352350b7 Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b

Former-commit-id: d420f11832 [formerly 9c64148733] [formerly 266d4884da] [formerly a385ec612c [formerly 266d4884da [formerly a1624e9bcf8677d6edd76a68122aa07690383b34]]]
Former-commit-id: a385ec612c
Former-commit-id: a8a45bbbf444fd2b11c872dd17abd893d3419ecd [formerly d433717c8c]
Former-commit-id: cddca699c6
2013-12-05 08:25:46 -06:00
Ron Anderson
fb3b7b0a9f Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 20eeb2796e [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 20eeb2796e
Former-commit-id: 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f]
Former-commit-id: e30d6041ee
2013-12-04 17:10:48 -06:00
Steve Harris
445b20ba2e Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/gridslice.so (took the master_14.1.1 version)

Former-commit-id: 655c9931e4 [formerly a5f141a2cc] [formerly cc79281795] [formerly ce7808a309 [formerly cc79281795 [formerly bf9379caa6a1f156997e21a271f27b86d7689ef0]]]
Former-commit-id: ce7808a309
Former-commit-id: d1b039aab850486af92fdbc8361d52b37403588f [formerly 7611759aaa]
Former-commit-id: d67709483a
2013-12-04 16:48:47 -06:00
Steve Harris
1e4b2bac7b 14.1.1-12 baseline
Former-commit-id: f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af]
Former-commit-id: 4e6f319422
2013-12-04 16:47:59 -05:00
Ron Anderson
21f431f203 Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 7459d65134 [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: 5277e256cdac93c4f9b0fa236643a91c2e6af6d3 [formerly 75d2dd7a29]
Former-commit-id: a99197c5c2
2013-12-04 15:29:28 -06:00
Richard Peter
8f9b6fa07c Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: 2a2473f3bb [formerly ff44393e90] [formerly ea7dac5993] [formerly 0281447166 [formerly ea7dac5993 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]]
Former-commit-id: 0281447166
Former-commit-id: f8b518f19e6bc75858971de994088a9caa63f0de [formerly f6808e6623]
Former-commit-id: d937861d05
2013-12-04 12:00:40 -06:00
Dave Hladky
36f601253e Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: bce11dec14 [formerly 6607e5fe30] [formerly 483ec5d22f] [formerly 593f24023d [formerly 483ec5d22f [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]]
Former-commit-id: 593f24023d
Former-commit-id: 035f4702c002daa8199c28c0d3ad1c8b496bd6ab [formerly 4060748634]
Former-commit-id: 09aa3a6c62
2013-12-04 11:58:49 -06:00
Nate Jensen
3c8d882681 Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 5294fbe981 [formerly 286539f323] [formerly 020c4de47d] [formerly 0ead2a03ea [formerly 020c4de47d [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 18066d784d37837fbb075e69dd1c460fc818ba15 [formerly 78629260d9]
Former-commit-id: 331df460ff
2013-12-04 11:54:11 -06:00
Dave Hladky
085b6124b9 Issue #2607 Fixed Nullpointer
Former-commit-id: 2184ded94c [formerly 4b81f76ce3] [formerly 25ce37d2d8] [formerly 25f745bc12 [formerly 25ce37d2d8 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]]
Former-commit-id: 25f745bc12
Former-commit-id: 49cf33fb3030ab031805f86093adaaab234f3b6d [formerly b0f12b6613]
Former-commit-id: c93d7b57a1
2013-12-04 11:36:23 -06:00
Ben Steffensmeier
76c989a47d Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: ff5267fc07 [formerly 80a98a3d7e] [formerly 3c8962fb96] [formerly 0b4eaac59e [formerly 3c8962fb96 [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]]
Former-commit-id: 0b4eaac59e
Former-commit-id: a01200be83dcf0244764eae09c7c177e81901fa3 [formerly d1b4fdd9c8]
Former-commit-id: d6640590e9
2013-12-04 11:22:47 -06:00
Nate Jensen
e3c371f17e Merge "Issue #2170: Fix DataUriRouter Java 1.6 compliance" into development
Former-commit-id: 5445c1a958 [formerly d593a3248c] [formerly ca02d9c7e0] [formerly 6f5ce44016 [formerly ca02d9c7e0 [formerly c269247a19c35b4e7f641d30ceb601f07cd9eb65]]]
Former-commit-id: 6f5ce44016
Former-commit-id: 972ff4be59c2a0341f67d0fcfaae44f29eb6f7e0 [formerly 30fcbc323a]
Former-commit-id: 2005435560
2013-12-04 10:00:06 -06:00
Nate Jensen
6293458bcd Merge "Issue #2551: Update NCEP objects to extend PersistablePluginDataObject. Amend: Remove IDecoderGettable." into development
Former-commit-id: 454488ed7d [formerly fd361d7d5c] [formerly 419c690953] [formerly 92262afcfd [formerly 419c690953 [formerly e85be3dba88f7f02564e583b360a5f40a90f95b6]]]
Former-commit-id: 92262afcfd
Former-commit-id: cb8966343fc0b332e805a55e26d86889504d5bc3 [formerly 2c45adcd0b]
Former-commit-id: d8f5b9b7ca
2013-12-04 09:54:13 -06:00
Richard Peter
5df468bf42 Issue #2170: Fix DataUriRouter Java 1.6 compliance
Change-Id: Iae25b28498f8fec8c76b764c3214f494acdde992

Former-commit-id: 8de680ac47 [formerly 987b86734f] [formerly b02490146a] [formerly 623fb3b71a [formerly b02490146a [formerly 6f38a006d33217389975a3cfeeda9c1bed928c13]]]
Former-commit-id: 623fb3b71a
Former-commit-id: cd13fd0803ec14ea5f01e028adf952d3cc210785 [formerly b627f93141]
Former-commit-id: 8b221db32d
2013-12-04 09:53:00 -06:00
Nate Jensen
f2a827f884 Merge "Issue #2576 Increased the font size of EMER." into development
Former-commit-id: 7045c11eee [formerly ee18295efe] [formerly cc53373478] [formerly c29836abd7 [formerly cc53373478 [formerly 947196e8ac4bb82536102bb56413d94589569599]]]
Former-commit-id: c29836abd7
Former-commit-id: 14135ca8d7f458242a1ad82bca5ddb70fc04057c [formerly bad9e2ab44]
Former-commit-id: cb3d6e2de3
2013-12-03 17:44:55 -06:00
Richard Peter
73ead1f113 Issue #2551: Update NCEP objects to extend PersistablePluginDataObject.
Amend: Remove IDecoderGettable.

Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b

Former-commit-id: 7a6363a221 [formerly 796293c036] [formerly 98117b4093] [formerly f8f3ebc6e9 [formerly 98117b4093 [formerly 0778a7f0123dd150894458fef6958fcdd9da39b6]]]
Former-commit-id: f8f3ebc6e9
Former-commit-id: 44511bfc2e531ad41861e79e71e290ead558ef3f [formerly 1a554d9632]
Former-commit-id: 00c44b3a08
2013-12-03 17:24:01 -06:00
Richard Peter
2cafd3a81b Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
	nativeLib/edexBridge/edexBridge.cpp
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 7969ef9648 [formerly 760f215e8c] [formerly f6787c0b9f2cb0cae1c07a2111e91ecfc12f31f5 [formerly f5f75ec629]] [formerly e82e1137f9 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]
Former-commit-id: e82e1137f9
Former-commit-id: cecc12c190bbaa908cbfe835a5a9a64a5ba96dba [formerly 94994868fa]
Former-commit-id: ee03dcf505
2013-12-03 16:25:31 -06:00
Jonathan Sanchez
1e475d6b33 Issue #2576 Increased the font size of EMER.
Change-Id: Ic6994ce60611b2af76bdee153daffe328e556ef1

Former-commit-id: 7d9f3d9372 [formerly b8fd84509d] [formerly 88f7b75df4] [formerly eeb3b0173b [formerly 88f7b75df4 [formerly 15cdd4c1fdb336416a4cc320731d5ecbbb0db6f6]]]
Former-commit-id: eeb3b0173b
Former-commit-id: cd3195def23d760eed1c4717d9bf0fee8c3ced2a [formerly dc4b8ec40f]
Former-commit-id: 641673e1d5
2013-12-03 13:00:47 -06:00
Richard Peter
c809c1d4de Merge "Issue #2537 Serialize empty enum sets. Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2" into development
Former-commit-id: 27802b5c05 [formerly 2ffe348d85] [formerly ce4a95a082] [formerly 37c08d3e82 [formerly ce4a95a082 [formerly ba1eadae31abadb655d3752a06c726aaf8f9adc5]]]
Former-commit-id: 37c08d3e82
Former-commit-id: 2ea31c1eecb49d380da4ab9010c20541fc000514 [formerly 8a301388e1]
Former-commit-id: 686de8b760
2013-12-03 12:53:26 -06:00
Ben Steffensmeier
225ab6a985 Issue #2537 Serialize empty enum sets.
Change-Id: Iff5aec625ddb03a069fb3a31fe1ff961e027d6f2

Former-commit-id: a7b0bf7f5d [formerly 90950af8a2] [formerly f460896552] [formerly f7be93daa7 [formerly f460896552 [formerly 0dabccd03145857b75fe90260b4d52e1541c5591]]]
Former-commit-id: f7be93daa7
Former-commit-id: f6f3d8e3cf59df4cee317ea30921cc5eccf19bca [formerly 74e182ad5e]
Former-commit-id: 0ac69e2bda
2013-12-03 12:17:01 -06:00
Richard Peter
753bb7d8ba Issue #2051: Fix Shef PurgeText
Change-Id: I7c72b69c9e0088943c279c824dfc5784d0f9baac

Former-commit-id: ad487befc7 [formerly c0c4dad633] [formerly 97fe8bd24b] [formerly a2028de5bc [formerly 97fe8bd24b [formerly f6d47991f62e99fa72ffafc2b6175eff8a0a83ac]]]
Former-commit-id: a2028de5bc
Former-commit-id: f6c2eea47423468305e8de35fb818c7b24ded26e [formerly 86d08ef574]
Former-commit-id: f75acec79c
2013-12-03 11:41:22 -06:00
Richard Peter
14ed9331d3 Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277

Former-commit-id: f2d99af20e [formerly 5905c5d08d] [formerly 2085a9cd33] [formerly fbda83aeb9 [formerly 2085a9cd33 [formerly 081a19d5cfca3d717a332357dbaead199767e0b8]]]
Former-commit-id: fbda83aeb9
Former-commit-id: 92cc0eed5d5ca22d3b43329858c1619c9363e66a [formerly f7f9a4e57c]
Former-commit-id: 670e63d0dd
2013-12-03 11:41:21 -06:00
Nate Jensen
38c40514e6 Merge "Issue #2573 safer and faster progressive disclosure" into development
Former-commit-id: cc32c128f2 [formerly b8116e6724] [formerly ece38c85c0] [formerly 2daf0f2691 [formerly ece38c85c0 [formerly 2be1427cdcd61d47a5463f6e4e85910200fda931]]]
Former-commit-id: 2daf0f2691
Former-commit-id: 7e05c5f491df89f47bf393e694a7be30c7d2023e [formerly a5cf904e1f]
Former-commit-id: b6e54e2709
2013-12-03 09:41:02 -06:00
Lee Venable
2ad5976b0b Merge "Issue #2387. Added system status refresh." into development
Former-commit-id: 9ddd43be62 [formerly 8de2238748] [formerly deb003184f] [formerly 7109e994da [formerly deb003184f [formerly 3bb2756cd854c029d0656803efdcc686ccbae01f]]]
Former-commit-id: 7109e994da
Former-commit-id: a85eade7e9608af89c4b4f1956ac0d384b52c311 [formerly 883b960f48]
Former-commit-id: 3335ef660c
2013-12-03 09:05:04 -06:00
Nate Jensen
d035dbc831 Issue #2573 safer and faster progressive disclosure
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: ccf897af6f [formerly 5c80b34e16] [formerly c0140fa0d91182080c96b83ad820144fcddbba66 [formerly 622cc1b223]] [formerly 90d6b5bd74 [formerly 622cc1b223 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]]
Former-commit-id: 90d6b5bd74
Former-commit-id: dd9050e05479911da92df93995a1c5e0aaf757e8 [formerly e40c71acd1]
Former-commit-id: e5cfe76cac
2013-12-02 17:28:09 -06:00
Richard Peter
212fccb765 Merge "Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup VAA and remove dataURI" into development
Former-commit-id: daab4cdf27 [formerly 829744ced9] [formerly 10f32b5fc7] [formerly 02b11b3509 [formerly 10f32b5fc7 [formerly 62a6bb9b7fcf05701a26553a502cc33fc28a5c6b]]]
Former-commit-id: 02b11b3509
Former-commit-id: 2cafe53ae959bca215aefcacc88290c16da44bc2 [formerly 3113fe26cd]
Former-commit-id: 35d4e7239f
2013-12-02 16:52:40 -06:00
Steve Harris
b455a385e9 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: b210ab8842ebdea3014e30e92d627d7f9a1742d7 [formerly 6539b80ded]
Former-commit-id: 1195e95c8b
2013-12-02 16:17:38 -06:00
Nate Jensen
a25621ae6d Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup
VAA and remove dataURI

Change-Id: I984173a6e85eb7dc269fb98964af4915a9b5105e

Former-commit-id: 77c23c6d0e [formerly 9b3f871c21] [formerly 6bf1fd8d3c] [formerly 72c322c667 [formerly 6bf1fd8d3c [formerly 148e7113abefd684dcacb5ccc28bb77192ff45c8]]]
Former-commit-id: 72c322c667
Former-commit-id: 58b83a2d53b306277cdc9a0820852147a2519f74 [formerly 2831ceb356]
Former-commit-id: 476f9da5ad
2013-12-02 16:10:26 -06:00
Steve Harris
41a54a5ca6 14.1.1-11 baseline
Former-commit-id: 401ee156b8 [formerly 337b138200] [formerly bcc2fb56db7acfd2f7ecd928f118488dc7beb36e [formerly 70a6f1936e]] [formerly 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d]
Former-commit-id: 8bd818de09
2013-12-02 17:10:10 -05:00
Steve Harris
12fdbf66fa Issue #2422 - Fix edexBridge like in RHEL6
Former-commit-id: 2214ab8e80 [formerly 927b509334] [formerly a58f1f8d76] [formerly d6242c20a4 [formerly a58f1f8d76 [formerly de5cf0cd69ddcd92bcb1e1ff9ea2c2b0253b36bd]]]
Former-commit-id: d6242c20a4
Former-commit-id: 874a6fc5a7ef30f4765c328ae6fa870a0561027c [formerly 67217a7fc3]
Former-commit-id: 75d68f80d0
2013-12-02 15:16:42 -06:00
Slav Korolev
4a2e195ea2 Issue #2387. Added system status refresh.
Former-commit-id: b9fa6d3622 [formerly b6a1724218] [formerly 1be43bc76c] [formerly f7f00b77d0 [formerly 1be43bc76c [formerly f3530467b1845a488fa0996ee7100a2dc145394a]]]
Former-commit-id: f7f00b77d0
Former-commit-id: 7af8f0fd5e64f264ed562426f6db9723c7967a2d [formerly 5e225387fd]
Former-commit-id: 3dc318418e
2013-12-02 16:14:45 -05:00
Steve Harris
1ea87a31c1 Issue #2297 - fixing build scripts
Former-commit-id: 35d141a1ce [formerly f5a4aa3fd8] [formerly 193f06f545] [formerly 94cd37acf6 [formerly 193f06f545 [formerly 3725a48cbdec19842d7c4e3facf737fc507e69dc]]]
Former-commit-id: 94cd37acf6
Former-commit-id: 6f8066380ee7e58d7dbf970e1cf56bc481bf84f2 [formerly b0516c0938]
Former-commit-id: 1914ddd079
2013-12-02 14:57:20 -06:00
Brad Gonzales
2ac17d4f80 Issue #2541 Added exclude patterns to RequestPatterns.
Added an exclude pattern to grib.xml to exclude data delivery sbn files.

Change-Id: Id92865e1b58bdcf3744328bd0362636093a03521

Former-commit-id: 5a29ccf45a [formerly abafd2bc13] [formerly dc7e255d43] [formerly 8acfa99e77 [formerly dc7e255d43 [formerly 396a9a99863ce9a616eecde6466f1c4d43b8d566]]]
Former-commit-id: 8acfa99e77
Former-commit-id: ae02142a37272496582f2ecc88cfd8d603853aa7 [formerly dd8eb8c2b4]
Former-commit-id: f25d05d871
2013-12-02 11:44:09 -06:00