Commit graph

20 commits

Author SHA1 Message Date
Roger Ferrel
6c78b5e04c Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085

Former-commit-id: 44a23b4500 [formerly 44a23b4500 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]
Former-commit-id: 825e2c1b19
Former-commit-id: 15545c5239
2014-05-29 12:33:15 -05:00
Richard Peter
24a3fe1466 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 44b1782461 [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 32957285fc
Former-commit-id: 80d4153878
2014-04-28 16:27:40 -05:00
Brian.Dyke
c6d3fe6952 Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: fb1f5aa593 [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: 3524838f9f
Former-commit-id: 029f5753ad
2014-04-25 11:06:11 -04:00
Roger Ferrel
3d744452af Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13

Former-commit-id: 3a2a6afaf1 [formerly 3a2a6afaf1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: 0490023b2c
2014-04-24 16:25:01 -05:00
Roger Ferrel
ca30aa6b8a Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120

Former-commit-id: 9dad4c959b [formerly 9dad4c959b [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]
Former-commit-id: 2a0a9b5334
Former-commit-id: d73f61c7e7
2014-04-24 14:48:15 -05:00
Roger Ferrel
2e98b24e91 Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0

Former-commit-id: 8ce590c31c [formerly 8ce590c31c [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]
Former-commit-id: 3af564a653
Former-commit-id: 1214aac2a2
2014-04-17 08:57:15 -05:00
Lee Venable
31c8e61cb6 Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e

Former-commit-id: 7f068f164c [formerly 7f068f164c [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]
Former-commit-id: ff3b42468f
Former-commit-id: 4cdbf301f3
2014-04-16 13:15:31 -05:00
Roger Ferrel
ac1946609e Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b

Former-commit-id: 5570261d74 [formerly 5570261d74 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]
Former-commit-id: cfea0489d7
Former-commit-id: d66a346c65
2014-04-11 16:07:58 -05:00
Brian.Dyke
be574897cc Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 6a28fcb156 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]
Former-commit-id: dd98c213c7
Former-commit-id: 9f37f61cf8
2014-04-04 12:57:32 -04:00
Roger Ferrel
d44c677b5a Issue #2879 Code clean up.
Former-commit-id: dd09032119 [formerly dd09032119 [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]
Former-commit-id: f6fe26d3de
Former-commit-id: 867d85e17d
2014-03-27 16:17:02 -05:00
Roger Ferrel
9c1dc3c8ab Issue #2879 Loading case no longer changes start/end time.
Former-commit-id: 2f9c62bd0c [formerly 2f9c62bd0c [formerly 60275732b2abcecf671a8338c8f87334baad3702]]
Former-commit-id: b78a05658d
Former-commit-id: 16ade55cb6
2014-03-27 15:52:31 -05:00
Brian.Dyke
d1db845406 14.1.1-18 baseline
Former-commit-id: 575e328123 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]
Former-commit-id: 1d6a9456b7
Former-commit-id: c5857c30f2
2014-02-11 15:52:50 -05:00
Steve Harris
a2bdee5cc1 14.1.1-14 baseline
Former-commit-id: f2ad9da4eb [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 43cc501e0d
2014-01-06 14:02:30 -05:00
Steve Harris
36d788890a 14.1.1-10 baseline
Former-commit-id: ca0f65bd9a [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]
Former-commit-id: 9248695a1f
Former-commit-id: ef6e0b0304
2013-11-19 16:40:25 -05:00
Steve Harris
647b908fed 14.1.1-7 baseline
Former-commit-id: 3328e2dd1d [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 4fff87723f
Former-commit-id: 48df058653
2013-11-06 14:16:14 -05:00
Steve Harris
98ae84da42 14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: 99e3707c5b
Former-commit-id: 7590a56e0e
2013-10-28 10:55:16 -04:00
Steve Harris
1a3197efdf 13.5.1-8 baseline
Former-commit-id: 3bece5e5d0 [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 2afb46f814
2013-07-26 09:02:34 -04:00
Greg Armendariz
ec2637676d 13.5.1-6 baseline
Former-commit-id: 7e09fa5a0b [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]
Former-commit-id: b9044b1195
Former-commit-id: 12a09f9aa7
2013-07-10 10:04:22 -04:00
Steve Harris
c183e08922 13.5.1-4 baseline
Former-commit-id: 70e4ff30a6 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
2013-06-28 09:46:25 -04:00
Steve Harris
146c5e8940 13.5.1-1 baseline
Former-commit-id: 998961612c [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
2013-06-10 15:17:17 -04:00