Roger Ferrel
|
eebc5096b2
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
Former-commit-id: 825e2c1b19 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]
Former-commit-id: 44a23b4500
|
2014-05-29 12:33:15 -05:00 |
|
Richard Peter
|
67683dd891
|
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: 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]
Former-commit-id: 44b1782461
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
f0b8ea5822
|
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: 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]
Former-commit-id: fb1f5aa593
|
2014-04-25 11:06:11 -04:00 |
|
Roger Ferrel
|
8eb4c91ab3
|
Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: cf6d1c8ca1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]
Former-commit-id: 3a2a6afaf1
|
2014-04-24 16:25:01 -05:00 |
|
Roger Ferrel
|
e2b03eb190
|
Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: 2a0a9b5334 [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]
Former-commit-id: 9dad4c959b
|
2014-04-24 14:48:15 -05:00 |
|
Roger Ferrel
|
dc25ece75f
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
Former-commit-id: 3af564a653 [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]
Former-commit-id: 8ce590c31c
|
2014-04-17 08:57:15 -05:00 |
|
Lee Venable
|
f4fb7b24f6
|
Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e
Former-commit-id: ff3b42468f [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]
Former-commit-id: 7f068f164c
|
2014-04-16 13:15:31 -05:00 |
|
Roger Ferrel
|
16fab01b8b
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
Former-commit-id: cfea0489d7 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]
Former-commit-id: 5570261d74
|
2014-04-11 16:07:58 -05:00 |
|
Brian.Dyke
|
17477e7db1
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]
Former-commit-id: 6a28fcb156
|
2014-04-04 12:57:32 -04:00 |
|
Roger Ferrel
|
4a306121bd
|
Issue #2879 Code clean up.
Former-commit-id: f6fe26d3de [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]
Former-commit-id: dd09032119
|
2014-03-27 16:17:02 -05:00 |
|
Roger Ferrel
|
6e2d462052
|
Issue #2879 Loading case no longer changes start/end time.
Former-commit-id: b78a05658d [formerly 60275732b2abcecf671a8338c8f87334baad3702]
Former-commit-id: 2f9c62bd0c
|
2014-03-27 15:52:31 -05:00 |
|
Brian.Dyke
|
f05a2220cd
|
14.1.1-18 baseline
Former-commit-id: 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]
Former-commit-id: 575e328123
|
2014-02-11 15:52:50 -05:00 |
|
Steve Harris
|
6df7c67f95
|
14.1.1-14 baseline
Former-commit-id: 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]
Former-commit-id: f2ad9da4eb
|
2014-01-06 14:02:30 -05:00 |
|
Steve Harris
|
8251107646
|
14.1.1-10 baseline
Former-commit-id: 9248695a1f [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]
Former-commit-id: ca0f65bd9a
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
80614c0e52
|
14.1.1-7 baseline
Former-commit-id: 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]
Former-commit-id: 3328e2dd1d
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
82dec19b6a
|
14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: bd95bb6a4e
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
392faf86e7
|
13.5.1-8 baseline
Former-commit-id: dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]
Former-commit-id: 3bece5e5d0
|
2013-07-26 09:02:34 -04:00 |
|
Greg Armendariz
|
5894853996
|
13.5.1-6 baseline
Former-commit-id: b9044b1195 [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]
Former-commit-id: 7e09fa5a0b
|
2013-07-10 10:04:22 -04:00 |
|
Steve Harris
|
c56be8a332
|
13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: 70e4ff30a6
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
6384018950
|
13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
|
2013-06-10 15:17:17 -04:00 |
|