Roger Ferrel
|
196e1fa22d
|
Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085
Former-commit-id: 176a2fb8cf [formerly eebc5096b2] [formerly 44a23b4500] [formerly 176a2fb8cf [formerly eebc5096b2] [formerly 44a23b4500] [formerly 825e2c1b19 [formerly 44a23b4500 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]]]
Former-commit-id: 825e2c1b19
Former-commit-id: 8ab7513068 [formerly 73be1f66e9] [formerly edd5113dfda01da0c2e182625ddc3f1b5c02231b [formerly 15545c5239]]
Former-commit-id: 0d93eba78efa2bd1b9ec5aa5f43168c99f377894 [formerly 6c78b5e04c]
Former-commit-id: c882871747
|
2014-05-29 12:33:15 -05:00 |
|
Richard Peter
|
e748b7c1e5
|
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: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
19b4bb7dcc
|
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: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
|
2014-04-25 11:06:11 -04:00 |
|
Roger Ferrel
|
541ee5a81d
|
Issue #3045 Change column label to "Data Set".
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: dd679c7978 [formerly 8eb4c91ab3] [formerly 3a2a6afaf1] [formerly dd679c7978 [formerly 8eb4c91ab3] [formerly 3a2a6afaf1] [formerly cf6d1c8ca1 [formerly 3a2a6afaf1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: f88302b94d [formerly 555c8cf617] [formerly 675b98f9712eaa32b9b8d18b880b9cabd81a288f [formerly 0490023b2c]]
Former-commit-id: e456e77496a0301296471813c64c0022c292f98e [formerly 3d744452af]
Former-commit-id: 0ece281810
|
2014-04-24 16:25:01 -05:00 |
|
Roger Ferrel
|
457ae58495
|
Issue #3045 - Change to prevent race conditions while getting table labels.
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: dd86b04686 [formerly e2b03eb190] [formerly 9dad4c959b] [formerly dd86b04686 [formerly e2b03eb190] [formerly 9dad4c959b] [formerly 2a0a9b5334 [formerly 9dad4c959b [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]]
Former-commit-id: 2a0a9b5334
Former-commit-id: b511341dc4 [formerly ef81949dd1] [formerly 54b732727c2263f33c97df4d4d5ff55d84b6f396 [formerly d73f61c7e7]]
Former-commit-id: 61c965fb5391ac0a0e33f1f1fed5bd390ebde6eb [formerly ca30aa6b8a]
Former-commit-id: 5fda70501e
|
2014-04-24 14:48:15 -05:00 |
|
Roger Ferrel
|
a05ca67230
|
Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
Former-commit-id: 84c10d3cd2 [formerly dc25ece75f] [formerly 8ce590c31c] [formerly 84c10d3cd2 [formerly dc25ece75f] [formerly 8ce590c31c] [formerly 3af564a653 [formerly 8ce590c31c [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]]
Former-commit-id: 3af564a653
Former-commit-id: c1a0504758 [formerly 56da257816] [formerly 927fe825a123966e78c6c609abe7894b1787733e [formerly 1214aac2a2]]
Former-commit-id: 5ee188363d05f8c09d1fef8033e5b13d60428d1d [formerly 2e98b24e91]
Former-commit-id: 25c92e4b11
|
2014-04-17 08:57:15 -05:00 |
|
Lee Venable
|
3f3a5c1241
|
Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e
Former-commit-id: 27b5524848 [formerly f4fb7b24f6] [formerly 7f068f164c] [formerly 27b5524848 [formerly f4fb7b24f6] [formerly 7f068f164c] [formerly ff3b42468f [formerly 7f068f164c [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]]
Former-commit-id: ff3b42468f
Former-commit-id: 8380646a7a [formerly 885e17788d] [formerly aa35106e2bcb598175d4b13f4c68868a8f657f1d [formerly 4cdbf301f3]]
Former-commit-id: 65faea903b549640ea3eabe710a072be16df26cd [formerly 31c8e61cb6]
Former-commit-id: 9b085066c0
|
2014-04-16 13:15:31 -05:00 |
|
Roger Ferrel
|
8870f7412f
|
Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
Former-commit-id: 67399901a0 [formerly 16fab01b8b] [formerly 5570261d74] [formerly 67399901a0 [formerly 16fab01b8b] [formerly 5570261d74] [formerly cfea0489d7 [formerly 5570261d74 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]]]]
Former-commit-id: cfea0489d7
Former-commit-id: bd722b378a [formerly c5de39c162] [formerly 9eb23d5c82b57af43b0527c290b725d2880e27a1 [formerly d66a346c65]]
Former-commit-id: ef43f0b325ca5236eaa5d9184d710ea87cb0f8e5 [formerly ac1946609e]
Former-commit-id: 6f127a05e0
|
2014-04-11 16:07:58 -05:00 |
|
Brian.Dyke
|
ae3f5dbff6
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
|
2014-04-04 12:57:32 -04:00 |
|
Roger Ferrel
|
0d00028dbb
|
Issue #2879 Code clean up.
Former-commit-id: 131f48b094 [formerly 4a306121bd] [formerly dd09032119] [formerly 131f48b094 [formerly 4a306121bd] [formerly dd09032119] [formerly f6fe26d3de [formerly dd09032119 [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]]]
Former-commit-id: f6fe26d3de
Former-commit-id: 84af47197e [formerly ba38afeeb9] [formerly 6ccd977daf48d3ec39f823e632c44c3cf519092d [formerly 867d85e17d]]
Former-commit-id: 93ba9785644a1a92fd98cf1c11a27afb2927fe88 [formerly d44c677b5a]
Former-commit-id: 17fe559a70
|
2014-03-27 16:17:02 -05:00 |
|
Roger Ferrel
|
d0d2da8c96
|
Issue #2879 Loading case no longer changes start/end time.
Former-commit-id: db88893eac [formerly 6e2d462052] [formerly 2f9c62bd0c] [formerly db88893eac [formerly 6e2d462052] [formerly 2f9c62bd0c] [formerly b78a05658d [formerly 2f9c62bd0c [formerly 60275732b2abcecf671a8338c8f87334baad3702]]]]
Former-commit-id: b78a05658d
Former-commit-id: 7a33681851 [formerly 394e8fcbcf] [formerly c545ff124a95b3a99150b9de93f0f583ad152243 [formerly 16ade55cb6]]
Former-commit-id: 57445f1cdff14fed91c5451d70a4254ed882e1b8 [formerly 9c1dc3c8ab]
Former-commit-id: c907b28a02
|
2014-03-27 15:52:31 -05:00 |
|
Brian.Dyke
|
fc21d2dee4
|
14.1.1-18 baseline
Former-commit-id: 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 1c7bf39f73 [formerly d61ae6c5f4] [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2]]
Former-commit-id: 48b7eeaa6cb834b10db17643ac629aaa112f6878 [formerly d1db845406]
Former-commit-id: f47dd3ef59
|
2014-02-11 15:52:50 -05:00 |
|
Steve Harris
|
f8f17037ca
|
14.1.1-14 baseline
Former-commit-id: 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 4a516444b6 [formerly 0989c17710] [formerly 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d]]
Former-commit-id: a6acd13ea8d0052cec52c8cee5a726953d78e66e [formerly a2bdee5cc1]
Former-commit-id: 5862555160
|
2014-01-06 14:02:30 -05:00 |
|
Steve Harris
|
8a1ea4d35f
|
14.1.1-10 baseline
Former-commit-id: 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]]
Former-commit-id: 9248695a1f
Former-commit-id: 2c49ed51ac [formerly e35ec60f7e] [formerly 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304]]
Former-commit-id: 1da4cf492cf27e8f6e06f3cfbfcc4a4b3ce25255 [formerly 36d788890a]
Former-commit-id: ea65181d19
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
2608595d90
|
14.1.1-7 baseline
Former-commit-id: 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]]
Former-commit-id: 4fff87723f
Former-commit-id: 4d2f53ebc6 [formerly b694612fe0] [formerly d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653]]
Former-commit-id: 39afc27726ae906146c56faa8073b17caaeb711d [formerly 647b908fed]
Former-commit-id: cfb3194426
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
cbf859daf6
|
14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
dded20dc93
|
13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60 [formerly a7d4c6274e] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf]
Former-commit-id: 767b7fdb4d
|
2013-07-26 09:02:34 -04:00 |
|
Greg Armendariz
|
df73c0e2e9
|
13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]]
Former-commit-id: b9044b1195
Former-commit-id: f23d42e977 [formerly 93b71934c0] [formerly 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]]
Former-commit-id: cca9e123a3f6f9da3810eec2cc36ef7c717f111a [formerly ec2637676d]
Former-commit-id: b601345c9f
|
2013-07-10 10:04:22 -04:00 |
|
Steve Harris
|
9f5469bc6e
|
13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922]
Former-commit-id: c05a6c8b50
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
97a4c59662
|
13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
|
2013-06-10 15:17:17 -04:00 |
|