Commit graph

4423 commits

Author SHA1 Message Date
Brad Gonzales
7d479d8a73 Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c

Former-commit-id: 6515d6a9e5 [formerly 112649eff2] [formerly 6515d6a9e5 [formerly 112649eff2] [formerly 96dc3b65b1 [formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]]]
Former-commit-id: 96dc3b65b1
Former-commit-id: 3f5c25ff46 [formerly 79efc3b53a]
Former-commit-id: 133918fba6
2013-12-11 17:06:41 -06:00
Richard Peter
b3074e9215 Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1
Former-commit-id: f278dad7cc [formerly 63bd2b26eb] [formerly f278dad7cc [formerly 63bd2b26eb] [formerly 6f57e14406 [formerly 3d887a288459b786718a59d0c4a368408c3419f0]]]
Former-commit-id: 6f57e14406
Former-commit-id: cdf86e65ec [formerly 2f0e43e5a4]
Former-commit-id: fb3ccd066c
2013-12-11 16:19:02 -06:00
Richard Peter
ff66c6d1e5 Merge "Issue #2613 Registry performance enhancements" into omaha_14.2.1
Former-commit-id: 4ec080e015 [formerly 375c532376] [formerly 4ec080e015 [formerly 375c532376] [formerly 0ed2ba8024 [formerly 6a3b2d31829b4f6d39a6a06ec06c901b58506deb]]]
Former-commit-id: 0ed2ba8024
Former-commit-id: 1d339f16f5 [formerly 890f038a54]
Former-commit-id: 1c5dc1b952
2013-12-11 16:11:26 -06:00
Richard Peter
333ee2bbab Merge "Issue #2566 fix bandwidthmanager spring file resource resolution." into omaha_14.2.1
Former-commit-id: d720fbbd63 [formerly d9d19a1515] [formerly d720fbbd63 [formerly d9d19a1515] [formerly 51e46e08c5 [formerly 4ea822a22d2b21b4b3172a1f93773f01c2af20de]]]
Former-commit-id: 51e46e08c5
Former-commit-id: 6dbcd6677c [formerly 561706ef1e]
Former-commit-id: 7788a51f89
2013-12-11 16:08:06 -06:00
Mike Duff
00e00796ae Issue #2616 - Set overwrite allowed flag on madis records when decoded
Added delta script for table MADIS with the hibernate generated key name

Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519

Former-commit-id: 1a0893d70e [formerly 9a02ae7d68] [formerly 1a0893d70e [formerly 9a02ae7d68] [formerly 5a42580c2b [formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]]
Former-commit-id: 5a42580c2b
Former-commit-id: d65b7c1cf5 [formerly dc6ab027b5]
Former-commit-id: 3f98d329c9
2013-12-11 14:12:05 -06:00
Richard Peter
6a6462331c Merge "Issue #2581 remove LSR dataURI column" into omaha_14.2.1
Former-commit-id: fcbf2ff270 [formerly e441b548cc] [formerly fcbf2ff270 [formerly e441b548cc] [formerly 6e86c98c04 [formerly e1e34142baebc23917a975a60f9f45aab750a775]]]
Former-commit-id: 6e86c98c04
Former-commit-id: a9e4ee030d [formerly 3ebbced489]
Former-commit-id: 3204af5ce8
2013-12-11 13:56:38 -06:00
Greg Armendariz
276b7586bf Merge "Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change" into omaha_14.2.1
Former-commit-id: 78e1e9d78f [formerly 45c9f7352e] [formerly 78e1e9d78f [formerly 45c9f7352e] [formerly 4c1eb198d2 [formerly 00ef95580fa8ad1fe64694b1bc0a6cdf4ffe6823]]]
Former-commit-id: 4c1eb198d2
Former-commit-id: 5171847cdf [formerly 0e0bfc0521]
Former-commit-id: 23f6e3ecdf
2013-12-11 13:54:17 -06:00
Greg Armendariz
88437251d7 Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change
Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3

Former-commit-id: 57c98d4343 [formerly cb952cdb13] [formerly 57c98d4343 [formerly cb952cdb13] [formerly 2d2641ea7e [formerly 584c543fbab59889769570330e7d83529a6b733f]]]
Former-commit-id: 2d2641ea7e
Former-commit-id: fce327c001 [formerly f5f21141a4]
Former-commit-id: f9f10703e8
2013-12-11 13:46:27 -06:00
Ben Steffensmeier
df1bc54013 Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: bf508b4455 [formerly a37db9d1b4] [formerly bf508b4455 [formerly a37db9d1b4] [formerly 922674273e [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]
Former-commit-id: 922674273e
Former-commit-id: 0fb85fe4aa [formerly 4a86c90bfc]
Former-commit-id: b3ef07794a
2013-12-11 12:45:11 -06:00
Benjamin Phillippe
c330390a76 Issue #2613 Registry performance enhancements
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21

Former-commit-id: b2c565c173 [formerly 969099d4c4] [formerly b2c565c173 [formerly 969099d4c4] [formerly 0cb4e61261 [formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]]]
Former-commit-id: 0cb4e61261
Former-commit-id: bfa17652ff [formerly 0d98a48d18]
Former-commit-id: 61b206a82e
2013-12-11 12:20:12 -06:00
Brad Gonzales
ee8cbe414c Issue #2566 fix bandwidthmanager spring file resource resolution.
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731

Former-commit-id: 419230d6db [formerly 5dd466e22a] [formerly 419230d6db [formerly 5dd466e22a] [formerly cfa7128be2 [formerly c12676830e66cf8e18f10e835c0f95e25074d992]]]
Former-commit-id: cfa7128be2
Former-commit-id: 71d6ef856a [formerly 531c598e3b]
Former-commit-id: dbd7f3cc37
2013-12-11 11:19:40 -06:00
Slav Korolev
65720fea82 Issue #2570. Show All subscriptions in Subscription manager.
Former-commit-id: 85bc26b5a3 [formerly b59e9499d2] [formerly 85bc26b5a3 [formerly b59e9499d2] [formerly 67e18055cc [formerly 27e177b2425db0a0241884b18e2501a923d02be4]]]
Former-commit-id: 67e18055cc
Former-commit-id: 746157755b [formerly 6811b0e5c1]
Former-commit-id: 04bc1a3052
2013-12-11 08:57:13 -05:00
Nate Jensen
e548e47239 Issue #2581 remove LSR dataURI column
Change-Id: I9d5ddc8346e6b9ac0ec56d09d50b6b19a5bc682f

Former-commit-id: 6188356e72 [formerly fa674baf89] [formerly 6188356e72 [formerly fa674baf89] [formerly e037c179fe [formerly 88124207249673c3bf29915b6f6318bd2397ecd5]]]
Former-commit-id: e037c179fe
Former-commit-id: 4478983895 [formerly 34c1af18a7]
Former-commit-id: b5450572f2
2013-12-10 18:27:33 -06:00
Nate Jensen
6928a4ef8c Merge "Issue #2581 fix decoding of LSR freezing drizzle and latlon" into omaha_14.2.1
Former-commit-id: 50e0f15ec8 [formerly 7d4256d0d6] [formerly 50e0f15ec8 [formerly 7d4256d0d6] [formerly fed233aff3 [formerly ae4051f529397b7a8b955bfd6ed56d446235e2a4]]]
Former-commit-id: fed233aff3
Former-commit-id: 9cfb911c04 [formerly befa8a0b9a]
Former-commit-id: 367c8b73b4
2013-12-10 15:18:27 -06:00
Nate Jensen
34319cc97e Issue #2581 fix decoding of LSR freezing drizzle and latlon
Change-Id: Iec01ce82c1b3104e86a54cd9ec015d699d0703d5

Former-commit-id: c0c17822c2 [formerly 60d395b347] [formerly c0c17822c2 [formerly 60d395b347] [formerly 16b0650f67 [formerly f7324d1e9ab164c553f5c62920292fb0487bfcfb]]]
Former-commit-id: 16b0650f67
Former-commit-id: c96678bb3a [formerly 36845b1c1d]
Former-commit-id: 6b9ef6eddd
2013-12-10 10:10:11 -06:00
Mike Duff
bddf555eab Issue #2601 - Fix NullPointerException.
Former-commit-id: 773e546f62 [formerly 9e9706f55f] [formerly 773e546f62 [formerly 9e9706f55f] [formerly d2fe42c27c [formerly fbeeddbf895ec1568452df632c8147c17757bb0c]]]
Former-commit-id: d2fe42c27c
Former-commit-id: 02bbd4eaa6 [formerly 32b468023d]
Former-commit-id: dd1af02457
2013-12-10 09:03:42 -06:00
Lee Venable
099f3f504a Merge "Issue #2271 - Fix menu problem with previously selected points being selectable again" into omaha_14.2.1
Former-commit-id: 997c575919 [formerly 249435f17c] [formerly 997c575919 [formerly 249435f17c] [formerly 2c6b4309f0 [formerly c4cda041169c5fe3f813a71c1b09b5eaeba9e385]]]
Former-commit-id: 2c6b4309f0
Former-commit-id: 4850830125 [formerly cc7885610d]
Former-commit-id: 291c7f95c4
2013-12-09 09:51:41 -06:00
Richard Peter
5283e7c725 Issue #2170: Fix Ensemble notifications
Change-Id: I48cdd8dad18f0e4866f2e150acb37c8f6ada139b

Former-commit-id: 0c5a6af2f3 [formerly b3f90b4e07] [formerly 0c5a6af2f3 [formerly b3f90b4e07] [formerly 0c269d0a7c [formerly da7c2ba0cdc0e9108d987d9ff7531f657c7c832e]]]
Former-commit-id: 0c269d0a7c
Former-commit-id: 4a6d41871e [formerly d430167b2c]
Former-commit-id: 3376002d20
2013-12-06 15:41:10 -06:00
Mike Duff
74b19522a2 Issue #2271 - Fix menu problem with previously selected points being selectable again
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee

Former-commit-id: 850e4dfbde [formerly 0a5f2e3484] [formerly 850e4dfbde [formerly 0a5f2e3484] [formerly ebc730ac2d [formerly 959fcd37424b6261606d2ae65663403764be9c39]]]
Former-commit-id: ebc730ac2d
Former-commit-id: 1925177772 [formerly 4d210517bd]
Former-commit-id: 96de34b2c1
2013-12-06 12:58:38 -06:00
Nate Jensen
907a6e3304 Issue #2599 fix constructor
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e

Former-commit-id: ec6b5393ef [formerly 9bff38e0d3] [formerly ec6b5393ef [formerly 9bff38e0d3] [formerly 41014a105d [formerly 8b0c799cf132a90211d1344d4e16785895f76263]]]
Former-commit-id: 41014a105d
Former-commit-id: e8f28c6799 [formerly f3e455d1a3]
Former-commit-id: eb68a1be85
2013-12-06 12:35:22 -06:00
Ben Steffensmeier
fe53e49cb3 Issue #2537 Fix feature for poitndata dependency on dataaccess.
Former-commit-id: 067c510315 [formerly 59c6a24b68] [formerly 067c510315 [formerly 59c6a24b68] [formerly d883f8dbb1 [formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 899cb2628c [formerly 99afa17fd2]
Former-commit-id: c27934d7ad
2013-12-06 09:14:01 -06:00
Bryan Kowal
c2273bbf5f Issue #2509 - re-compile grib2.so for RHEL6 64-bit
Former-commit-id: 8f053f9fcd [formerly 187759698b] [formerly 8f053f9fcd [formerly 187759698b] [formerly 5b8a8ddbeb [formerly 90958e13e98147130848aad26d077e7a040ddb51]]]
Former-commit-id: 5b8a8ddbeb
Former-commit-id: ea0243e5da [formerly eceffc3880]
Former-commit-id: 91cdeb8c89
2013-12-05 15:53:51 -06:00
Brad Gonzales
143e160eae 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: 3d34764022 [formerly 410a00c72a] [formerly 3d34764022 [formerly 410a00c72a] [formerly 72df38075f [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]
Former-commit-id: 72df38075f
Former-commit-id: e18f7b2380 [formerly c54fe467a3]
Former-commit-id: 3d592d0b38
2013-12-05 15:17:14 -06:00
Richard Peter
8cde2b5e9d Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: df4a4c5121 [formerly d0b50eee3c] [formerly df4a4c5121 [formerly d0b50eee3c] [formerly 6fde307f0a [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]
Former-commit-id: 6fde307f0a
Former-commit-id: 45889cb80f [formerly 9f4dfc9051]
Former-commit-id: ef7ba1f1ee
2013-12-05 14:54:46 -06:00
Richard Peter
5744c6422c Issue #2509: Fix bad merge of DupElimSrv
Change-Id: I72702e9943016cd6e00ecc8755222d8de31ee322

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

Former-commit-id: a412a19583 [formerly 4796f43495] [formerly a412a19583 [formerly 4796f43495] [formerly 0c452e2434 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]
Former-commit-id: 0c452e2434
Former-commit-id: 45cf9384d8 [formerly 7f2ddb1360]
Former-commit-id: d3c5ee0468
2013-12-05 13:35:31 -06:00
Richard Peter
8e1984e6ed Merge "Issue #1829 Refactored EBXML registry objects" into development
Former-commit-id: 0cfe359507 [formerly bacfa33301] [formerly 0cfe359507 [formerly bacfa33301] [formerly 88c866256e [formerly 5f1736746f7594ba0bda3a48083a78ff5ec8d2c9]]]
Former-commit-id: 88c866256e
Former-commit-id: ba1bd01bca [formerly 9e64f22e8b]
Former-commit-id: b8e4812182
2013-12-05 13:01:02 -06:00
Nate Jensen
ecdbb80086 Merge "Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator." into development
Former-commit-id: 178b2bc3fa [formerly 34205de815] [formerly 178b2bc3fa [formerly 34205de815] [formerly db25d00dc5 [formerly 18437fb36f9fff510f526ba40b52c4ec4793e18b]]]
Former-commit-id: db25d00dc5
Former-commit-id: 8b4f6873a0 [formerly 280325460f]
Former-commit-id: a1ff972ae6
2013-12-05 13:00:06 -06:00
Nate Jensen
9740b5349b Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: b16c88133b [formerly c47f6546dd] [formerly b16c88133b [formerly c47f6546dd] [formerly ae0bd2a86f [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: 15fee953f5 [formerly 7163e28d35]
Former-commit-id: bd4e9158f0
2013-12-05 12:59:58 -06:00
Richard Peter
20b1c9cfbc Issue #2509: Fix IFPWE merge issue
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75

Former-commit-id: 5ad19e32a9 [formerly 73960ce29a] [formerly 5ad19e32a9 [formerly 73960ce29a] [formerly a8b251223a [formerly 9450ca459d6b2efdea0d0124a6f9e7100eb5472a]]]
Former-commit-id: a8b251223a
Former-commit-id: f473851db8 [formerly 7bcdabd8dd]
Former-commit-id: c909291e15
2013-12-05 12:33:51 -06:00
Richard Peter
ae6e34be4b 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: b3b23647b4 [formerly 0c4ae068ad] [formerly b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 60679a818a [formerly da027298d4]
Former-commit-id: fd93b7d85e
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
bff909c157 Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator.
Former-commit-id: 9036774493 [formerly a567f2af89] [formerly 9036774493 [formerly a567f2af89] [formerly 3d2439dc31 [formerly fb354f5242a3eac4bf3d3c35efef78ed7a7e01f4]]]
Former-commit-id: 3d2439dc31
Former-commit-id: d1cfb7f9d5 [formerly a5001016c9]
Former-commit-id: c3aa830346
2013-12-05 11:27:29 -06:00
Ben Steffensmeier
2eb9a45951 Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 7c2a4ef72c [formerly f682e66e9b] [formerly 7c2a4ef72c [formerly f682e66e9b] [formerly 46a466497c [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]
Former-commit-id: 46a466497c
Former-commit-id: fde968a834 [formerly ad9fee446d]
Former-commit-id: 956e8b04f2
2013-12-05 10:54:28 -06:00
Benjamin Phillippe
8c1e55db1f Issue #1829 Refactored EBXML registry objects
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d

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

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

Former-commit-id: 497236ca74 [formerly b5906249cc] [formerly 497236ca74 [formerly b5906249cc] [formerly 20eeb2796e [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 20eeb2796e
Former-commit-id: e30d6041ee [formerly 103fed386f]
Former-commit-id: 89e87a1683
2013-12-04 17:10:48 -06:00
Steve Harris
e36c9ca1b6 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: a5f141a2cc [formerly cc79281795] [formerly a5f141a2cc [formerly cc79281795] [formerly ce7808a309 [formerly bf9379caa6a1f156997e21a271f27b86d7689ef0]]]
Former-commit-id: ce7808a309
Former-commit-id: d67709483a [formerly 7611759aaa]
Former-commit-id: 57355f5eaf
2013-12-04 16:48:47 -06:00
Steve Harris
60f062ea59 14.1.1-12 baseline
Former-commit-id: 371d1ca63c [formerly b24d9c80b0] [formerly 371d1ca63c [formerly b24d9c80b0] [formerly a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 4e6f319422 [formerly 14421048af]
Former-commit-id: 234ca267ed
2013-12-04 16:47:59 -05:00
Ron Anderson
95d6bebb13 Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 54219aa03d [formerly 7459d65134] [formerly 54219aa03d [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: a99197c5c2 [formerly 75d2dd7a29]
Former-commit-id: 1988e86bbd
2013-12-04 15:29:28 -06:00
Richard Peter
54c056a310 Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: ff44393e90 [formerly ea7dac5993] [formerly ff44393e90 [formerly ea7dac5993] [formerly 0281447166 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]]
Former-commit-id: 0281447166
Former-commit-id: d937861d05 [formerly f6808e6623]
Former-commit-id: 8cdd151d64
2013-12-04 12:00:40 -06:00
Dave Hladky
25745e2782 Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: 6607e5fe30 [formerly 483ec5d22f] [formerly 6607e5fe30 [formerly 483ec5d22f] [formerly 593f24023d [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]]
Former-commit-id: 593f24023d
Former-commit-id: 09aa3a6c62 [formerly 4060748634]
Former-commit-id: dc5f5f3c87
2013-12-04 11:58:49 -06:00
Nate Jensen
b6f9b78e92 Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 286539f323 [formerly 020c4de47d] [formerly 286539f323 [formerly 020c4de47d] [formerly 0ead2a03ea [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 331df460ff [formerly 78629260d9]
Former-commit-id: 35abe8c3af
2013-12-04 11:54:11 -06:00
Dave Hladky
393d4a2967 Issue #2607 Fixed Nullpointer
Former-commit-id: 4b81f76ce3 [formerly 25ce37d2d8] [formerly 4b81f76ce3 [formerly 25ce37d2d8] [formerly 25f745bc12 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]]
Former-commit-id: 25f745bc12
Former-commit-id: c93d7b57a1 [formerly b0f12b6613]
Former-commit-id: 3cf23e1e4d
2013-12-04 11:36:23 -06:00
Ben Steffensmeier
ea09aaff72 Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: 80a98a3d7e [formerly 3c8962fb96] [formerly 80a98a3d7e [formerly 3c8962fb96] [formerly 0b4eaac59e [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]]
Former-commit-id: 0b4eaac59e
Former-commit-id: d6640590e9 [formerly d1b4fdd9c8]
Former-commit-id: cb6d8f6070
2013-12-04 11:22:47 -06:00
Nate Jensen
8fc153836a Merge "Issue #2170: Fix DataUriRouter Java 1.6 compliance" into development
Former-commit-id: d593a3248c [formerly ca02d9c7e0] [formerly d593a3248c [formerly ca02d9c7e0] [formerly 6f5ce44016 [formerly c269247a19c35b4e7f641d30ceb601f07cd9eb65]]]
Former-commit-id: 6f5ce44016
Former-commit-id: 2005435560 [formerly 30fcbc323a]
Former-commit-id: de177fb0cb
2013-12-04 10:00:06 -06:00
Nate Jensen
285c7f0f96 Merge "Issue #2551: Update NCEP objects to extend PersistablePluginDataObject. Amend: Remove IDecoderGettable." into development
Former-commit-id: fd361d7d5c [formerly 419c690953] [formerly fd361d7d5c [formerly 419c690953] [formerly 92262afcfd [formerly e85be3dba88f7f02564e583b360a5f40a90f95b6]]]
Former-commit-id: 92262afcfd
Former-commit-id: d8f5b9b7ca [formerly 2c45adcd0b]
Former-commit-id: 7213b7a07c
2013-12-04 09:54:13 -06:00
Richard Peter
da26ffa328 Issue #2170: Fix DataUriRouter Java 1.6 compliance
Change-Id: Iae25b28498f8fec8c76b764c3214f494acdde992

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

Change-Id: Ic01ebe373da1946a992e10150c1da34119e10d6b

Former-commit-id: 796293c036 [formerly 98117b4093] [formerly 796293c036 [formerly 98117b4093] [formerly f8f3ebc6e9 [formerly 0778a7f0123dd150894458fef6958fcdd9da39b6]]]
Former-commit-id: f8f3ebc6e9
Former-commit-id: 00c44b3a08 [formerly 1a554d9632]
Former-commit-id: 0932f3103b
2013-12-03 17:24:01 -06:00