Greg Armendariz
a1b39cf6a9
Omaha #2914 - Remove calls to PropertiesFactory
...
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be
Former-commit-id: 22ede9935d
[formerly e3f927e52c
] [formerly b34486973e
] [formerly 09f6bd471c
[formerly b34486973e
[formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]]]
Former-commit-id: 09f6bd471c
Former-commit-id: 2ee58e133d702407605acad88e5488fe7ab6aed5 [formerly fcf1b5ee8a
]
Former-commit-id: d51ab07c0e
2014-07-17 15:41:38 -05:00
Brian Clements
d927196b9f
Omaha #3373 jaxb manager refactor
...
api changes
reworked ogc jaxb manager to use parent class
Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48
Former-commit-id: a3f91f92cc
[formerly 33684f3c97
] [formerly 2f062b2c192eaf6526abc8e0461da95723a1daa3 [formerly e4c85f7cd5
]] [formerly e428f257cb
[formerly e4c85f7cd5
[formerly 125c31f035057676d8c97a9b6c7a1d7b1b7f5bcb]]]
Former-commit-id: e428f257cb
Former-commit-id: 2efa01412043caacf4d797b4b452319714c1d4dd [formerly 58a4410763
]
Former-commit-id: cf3bc3e4f4
2014-07-16 09:00:59 -05:00
Richard Peter
6ac180043f
Merge "Omaha #3184 throw incompatible request exceptions when trying to get levels on FFMP or IHFS" into omaha_15.1.1
...
Former-commit-id: 35b7c07625
[formerly 6eb299d022
] [formerly 58628db2c5
] [formerly 0a24d7452f
[formerly 58628db2c5
[formerly 95816d39509fa3499494b369ad09fb026c07108d]]]
Former-commit-id: 0a24d7452f
Former-commit-id: 751a1d475a5bf3f01aefe3af43f9e2423ccb171a [formerly b3583a805d
]
Former-commit-id: f44852d4e1
2014-07-14 17:05:22 -05:00
Nate Jensen
ffd26e8d42
Omaha #3184 throw incompatible request exceptions when trying to get
...
levels on FFMP or IHFS
Change-Id: I599799cc95835708fdb48b6ce8a8e977daceff26
Former-commit-id: 355f388653
[formerly 8cc62dae6b
] [formerly 9c1e33521e
] [formerly a1dadba524
[formerly 9c1e33521e
[formerly 2fdb210c8fe8e6763b6a6422b5710c35ee7e48a8]]]
Former-commit-id: a1dadba524
Former-commit-id: bc9a86df9aa8a4c4d162fa0ed9924fe758e88163 [formerly fcd43442ad
]
Former-commit-id: 29816caa7e
2014-07-14 14:25:51 -05:00
Steve Harris
914da113f1
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
Former-commit-id: a46c22c588
[formerly a893b9b08a
] [formerly 05de3fbe54
] [formerly a43ffbe052
[formerly 05de3fbe54
[formerly 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3]]]
Former-commit-id: a43ffbe052
Former-commit-id: bb3abdc3558b0f06299a9c4d87dd2431f2d137d1 [formerly 202c1a0316
]
Former-commit-id: 6920a273e5
2014-07-14 12:08:09 -05:00
Steve Harris
0e390da822
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 42123642eb
[formerly 27b08f8bcd
] [formerly 0cb8d202f5
] [formerly 4df5ae5a60
[formerly 0cb8d202f5
[formerly f352b47e1d930bfe2bc46f956c781375881e41f9]]]
Former-commit-id: 4df5ae5a60
Former-commit-id: 64e15ba68857c2ece6d688b1556814e69b181e79 [formerly 51d4907b76
]
Former-commit-id: bf236d5aa1
2014-07-14 11:54:53 -05:00
Nate Jensen
bfd642714a
Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
...
Former-commit-id: a67b7a3005
[formerly a55162c74b
] [formerly 2531649c55
] [formerly 9f58d2e08b
[formerly 2531649c55
[formerly 97a0d0d8be7dd87e472dc0422a68df94d43095e1]]]
Former-commit-id: 9f58d2e08b
Former-commit-id: 1baa67bc1c72c1e0f4b5c907fef13d98c99b0a66 [formerly 363766fcca
]
Former-commit-id: 289a4bf786
2014-07-14 11:15:01 -05:00
Brian Clements
642107eb90
Omaha #2587 update script to set reftime as non null in db
...
Change-Id: Ibcfb61b607645fcbb91e793f2088c8fb7432ecf4
Former-commit-id: 481e503df9
[formerly fbf4111d6c
] [formerly 2a5af8ce1f
] [formerly faa29355b0
[formerly 2a5af8ce1f
[formerly dfafe89ab5cb4589d2408564b82a03adc9fc1143]]]
Former-commit-id: faa29355b0
Former-commit-id: c594e4e9bf4022d06b899e23ef3f7f8e3b0620bc [formerly ade89ff05d
]
Former-commit-id: b52e7ef948
2014-07-14 08:40:37 -05:00
Brian Clements
97fc979b3b
Omaha #3371 all subprocesses now killed when cave.sh is killed
...
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2
Former-commit-id: d6e181d301
[formerly 0973e5ac41
] [formerly 7e70fbda27
] [formerly ae5fa893a9
[formerly 7e70fbda27
[formerly e4becce5325aad266fd93548d27e5e122b145011]]]
Former-commit-id: ae5fa893a9
Former-commit-id: ef9dbe97b4271805e63ea28026e72a445813455e [formerly e72c34d361
]
Former-commit-id: a1bce34fda
2014-07-14 08:05:18 -05:00
Richard Peter
1dab76f463
Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
...
Former-commit-id: 90d2108293
[formerly 88419fb8f3
] [formerly 0222a89cd4
] [formerly 1c40dc11ef
[formerly 0222a89cd4
[formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]]]
Former-commit-id: 1c40dc11ef
Former-commit-id: 91c2b9274636fd96628da212f4a5cb80811946f9 [formerly 2b75d79e0f
]
Former-commit-id: d16ddba2f5
2014-07-11 17:46:14 -05:00
Brian Clements
8fdcc3183e
Omaha #3333 added grid lightning to cave
...
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221
Former-commit-id: f969720868
[formerly 555251982b
] [formerly a50f1e8e70
] [formerly 29fc7e7ec4
[formerly a50f1e8e70
[formerly 33736a713a2c360e70f5a06972a7a21937f2b34c]]]
Former-commit-id: 29fc7e7ec4
Former-commit-id: e03addef9feeace5539e9b0f6c1a99cbfdc19c03 [formerly e25961a39a
]
Former-commit-id: 140a4a4b15
2014-07-11 12:18:05 -05:00
Benjamin Phillippe
63354789de
Omaha #3379 Removing DWR
...
Former-commit-id: e613cb932e
[formerly cc9e9b427a
] [formerly d110e8428b
] [formerly 4e1d93abf8
[formerly d110e8428b
[formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: c20f089fcf16ae33c66408335723c47e9c63b082 [formerly 06e73cd55f
]
Former-commit-id: 5eea012728
2014-07-11 11:56:44 -05:00
Brian Clements
e65e061622
Omaha #3364 added jmap -heap to capture script
...
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153
Former-commit-id: f24c94b118
[formerly 146318e49e
] [formerly 82cf017cbe
] [formerly d5506736df
[formerly 82cf017cbe
[formerly 65c88529acfb31c408777337f456da5dce879146]]]
Former-commit-id: d5506736df
Former-commit-id: f5420415ca79d293ff76af12e288fd0c399b84e5 [formerly 2c4fb16c12
]
Former-commit-id: 10a01f3556
2014-07-11 10:20:48 -05:00
Richard Peter
4a46fd36c4
Merge "Omaha #3318 Delta script for GEFS h5 file updates" into omaha_14.4.1
...
Former-commit-id: e84e988c7d
[formerly 57318e4446
] [formerly c3740f0f11
] [formerly 98d7cbab0d
[formerly c3740f0f11
[formerly b5d7d388acb17911b4592182884ac8bfac687c4f]]]
Former-commit-id: 98d7cbab0d
Former-commit-id: b73281af82ae0328cd4809c8b31bca66863e0b13 [formerly d9ea2c328c
]
Former-commit-id: 1dac01c298
2014-07-10 17:47:50 -05:00
Nate Jensen
69361f662e
Merge "Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh" into omaha_14.4.1
...
Former-commit-id: abd06c4d76
[formerly 205b90cb24
] [formerly 68170f4a3e
] [formerly f92d9eb817
[formerly 68170f4a3e
[formerly c114f3578804f9eb2fd130428bb327c968f0fbdf]]]
Former-commit-id: f92d9eb817
Former-commit-id: a5ad82ef7a8529fa594ecafa76615221d40cddb9 [formerly 0f254686cb
]
Former-commit-id: c69237b1b8
2014-07-10 17:02:48 -05:00
Nate Jensen
18a3177224
Merge "Omaha #3165 update manifests for ll.netcdf rename" into omaha_14.4.1
...
Former-commit-id: a19c2dde43
[formerly c3e7b245af
] [formerly ffa31a72ab
] [formerly b267109497
[formerly ffa31a72ab
[formerly 599f7a6d2eff8723cbf515b14afefc270f42cdd0]]]
Former-commit-id: b267109497
Former-commit-id: f3b73748f74fa8b0b05605ed4a2d14ca10de592e [formerly 55d87b6260
]
Former-commit-id: 2f163afff8
2014-07-10 16:32:02 -05:00
Brian Clements
034bf93c29
Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
...
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298
Former-commit-id: ed03db05ea
[formerly 987d514fa3
] [formerly 871a8655c8
] [formerly 0113e109d3
[formerly 871a8655c8
[formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]]
Former-commit-id: 0113e109d3
Former-commit-id: 177f6db44761392bd73fa9adfd0d53bb7bd07a4b [formerly c32592fd1c
]
Former-commit-id: ed9ba91d4e
2014-07-10 16:31:11 -05:00
Roger Ferrel
b90fa1ce13
Omaha #3318 Delta script for GEFS h5 file updates
...
Former-commit-id: c9601b1194
[formerly 577790589f
] [formerly d007725e9a
] [formerly 9eaeb01624
[formerly d007725e9a
[formerly 2e6eeaeac3018a34bf5a471f4ebcae58e608fbca]]]
Former-commit-id: 9eaeb01624
Former-commit-id: b6f7db8497a9d73ba949797da1517de23f7250f0 [formerly ee1a95ceb1
]
Former-commit-id: 4449133a46
2014-07-10 16:30:03 -05:00
Everett Kladstrup
173a773d0d
Omaha #3165 update manifests for ll.netcdf rename
...
Former-commit-id: 4abb66a103
[formerly 9cf007e546
] [formerly 4e3b76ae29
] [formerly febe13a241
[formerly 4e3b76ae29
[formerly 434ab5131e44d772d04c029833e2979fc19b6421]]]
Former-commit-id: febe13a241
Former-commit-id: 519082d3aa4581181c084c73ede2f8f07ecba91b [formerly e18ad7caec
]
Former-commit-id: c5e71e2348
2014-07-10 16:19:42 -05:00
Bryan Kowal
48e0656dff
Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration.
...
The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.
Former-commit-id: 7220057d30
[formerly 32aa07f1fc
] [formerly 984842331d
] [formerly 49ffec76ff
[formerly 984842331d
[formerly 146e5ebed335bf25cbae152eef1b0544e833f741]]]
Former-commit-id: 49ffec76ff
Former-commit-id: a0e7e5fc3cecd53e7af40ec39cf5fd688ffa6a2e [formerly 9fa0118ce9
]
Former-commit-id: 4e295dba49
2014-07-10 11:16:19 -05:00
Nate Jensen
c0da212407
Omaha #3165 fix bad manifests
...
Change-Id: I9cef6a2086a7688fa5db412073af2b565396958a
Former-commit-id: 61fa1f41f0
[formerly b874c80f93
] [formerly c323b72f48
] [formerly eef97e7ec0
[formerly c323b72f48
[formerly 4792e114d091b244b46d54b0846b8535583e4068]]]
Former-commit-id: eef97e7ec0
Former-commit-id: 9053af0969241e89bfd7400a1cdc95b60483b5c9 [formerly aef963a64e
]
Former-commit-id: 7ceb81ec48
2014-07-10 09:20:24 -05:00
Ron Anderson
d5ca7c1946
Issue #3146 Added check for duplicate smartInit.
...
Added alertViz message for GFE site activation failure
Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004
Former-commit-id: 6ead047f79
[formerly 9f4e89347a
] [formerly 0c0739bd72
] [formerly 468668e19b
[formerly 0c0739bd72
[formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]]]
Former-commit-id: 468668e19b
Former-commit-id: 0931f5b4440dd2ba692f9bb4936037c9fa726c26 [formerly a917ea16a4
]
Former-commit-id: ed7f6f731e
2014-07-09 16:42:43 -05:00
Brian Clements
e2d16bde70
Omaha #3214 fixed cache object usage in lightning resource
...
pulse and cloud flashes were not updated properly in the cache
Change-Id: Idf17aeb444f93c73901c26da9640f0a8f4a6a486
Former-commit-id: fc246aa082
[formerly dba1fb3fc1
] [formerly 7e169dc19dead51500d0201eb10e0b9e2f14cfd0 [formerly 994226e82b
]] [formerly ac8f861112
[formerly 994226e82b
[formerly 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393]]]
Former-commit-id: ac8f861112
Former-commit-id: 58cd6b777893efcab676bfb302e4f2adb7c4adbf [formerly e74fcfbce1
]
Former-commit-id: f9dad29ad8
2014-07-09 14:13:47 -05:00
Nate Jensen
a25d360ee4
Merge "Omaha #3361 reduce number of extraneous localization requests at GFE startup" into omaha_14.4.1
...
Former-commit-id: c3619bf0e6
[formerly 011089ab35
] [formerly 9f7aef5f3e
] [formerly 2a18111bdc
[formerly 9f7aef5f3e
[formerly 56263f9c5dbc38d838e8da5df252ba5043f846ab]]]
Former-commit-id: 2a18111bdc
Former-commit-id: 253a307a83e2ed42d7b0afc900a376b5d997aa46 [formerly f8386f0570
]
Former-commit-id: c07ae4fa3a
2014-07-09 09:47:07 -05:00
Nate Jensen
0d5c29fee9
Omaha #3361 reduce number of extraneous localization requests at GFE
...
startup
Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed
Former-commit-id: 93012a8b76
[formerly c3bd61a2c0
] [formerly 01e9674f04e037fd2014ec4ce3a27f2abe744e45 [formerly 0c397d2b7e
]] [formerly 5547ea1c7d
[formerly 0c397d2b7e
[formerly efa10ca2702ecee4535711be06373e5d079ac117]]]
Former-commit-id: 5547ea1c7d
Former-commit-id: 03c7194ee9d1c11cb9ccecc4e9a319197e8bdda4 [formerly af08cc189f
]
Former-commit-id: d5f944d203
2014-07-09 09:24:31 -05:00
Nate Jensen
a4c77cdc34
Merge "Omaha #3357 Ingest JVM shouldn't pull in DPA beans Change-Id: I59d0cf13a7704499093b401328bda5867197c525" into omaha_14.4.1
...
Former-commit-id: a226c1fde5
[formerly c818bca5c3
] [formerly 25f5e8f2e0
] [formerly b9b26f1b54
[formerly 25f5e8f2e0
[formerly a1a17c4757be0a60d6634384e5de1cbfd611096d]]]
Former-commit-id: b9b26f1b54
Former-commit-id: 00604eaa931583136d1b1624ef0d20bed0ae0dad [formerly 8e83a7d278
]
Former-commit-id: 9dd837e39d
2014-07-08 13:29:37 -05:00
Dave Hladky
bd0895b154
Omaha #3357 Ingest JVM shouldn't pull in DPA beans
...
Change-Id: I59d0cf13a7704499093b401328bda5867197c525
Former-commit-id: 8434edf807
[formerly 36b0428ff9
] [formerly 53f26636f7
] [formerly a0d305355b
[formerly 53f26636f7
[formerly 4a5e3dc51e01bfb1fa6c50df7ba4f1a65bac9ba1]]]
Former-commit-id: a0d305355b
Former-commit-id: 8785c728d3d3d1d5c38dc86075a0ae2a7c554104 [formerly d8fb83d443
]
Former-commit-id: e83c58641d
2014-07-08 12:29:04 -05:00
Bryan Kowal
b2d4debdce
Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
...
Former-commit-id: ee4b7c4ee8
[formerly 58a2ae8bc8
] [formerly 98a310f4a7
] [formerly 6a197f845d
[formerly 98a310f4a7
[formerly e0bb64fc5112a15d9d991eb8f39de42b541f4e54]]]
Former-commit-id: 6a197f845d
Former-commit-id: ed8425afeb482fb12b827adf7402a0eda661e5fb [formerly 0fdfc0fd4a
]
Former-commit-id: ac1b94c63f
2014-07-08 09:31:21 -05:00
Ben Steffensmeier
e71872c637
Merge "Omaha #3356 remove common register buddies to uf.viz.core" into omaha_15.1.1
...
Former-commit-id: ea41558db5
[formerly 3394a6230e
] [formerly 3bbf29f639
] [formerly 9eb9abd3f4
[formerly 3bbf29f639
[formerly 98cc84304173c5a8ae366b8a60273f46d97bf2ee]]]
Former-commit-id: 9eb9abd3f4
Former-commit-id: 3276cb926723cbcac07ee2c8e9637abd5685f275 [formerly 956e9bb5b0
]
Former-commit-id: fb17181baa
2014-07-07 18:48:49 -05:00
Nate Jensen
03c2a288a6
Omaha #3356 remove common register buddies to uf.viz.core
...
Change-Id: I8da0d7bb51c7aa3585c29ada43ba9d6470ec41e4
Former-commit-id: 356a23ce94
[formerly 57635e6f3f
] [formerly 5148898b23
] [formerly 886aee2bf9
[formerly 5148898b23
[formerly 3fc986e2d7b24a6a3a9642a9bb0c71b296573a68]]]
Former-commit-id: 886aee2bf9
Former-commit-id: c2da66810952b7d3af564b3e52fd2550ead243c0 [formerly 2a55f0db4e
]
Former-commit-id: aad51b7f11
2014-07-07 17:32:37 -05:00
Brian Clements
2d1fb0d3ab
Omaha #3333 removed redundant field from viz lightning
...
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978
Former-commit-id: 392b640b47
[formerly 91b136c2a0
] [formerly 572d95e78a
] [formerly e4795f6a13
[formerly 572d95e78a
[formerly 2e701ade395cb2ec81d86af714fad825e146dc25]]]
Former-commit-id: e4795f6a13
Former-commit-id: 5e6b3db09e1e362ab49d6d923a871327b0f365f5 [formerly e1d5d86d29
]
Former-commit-id: 9afb344828
2014-07-07 15:13:28 -05:00
Brian Clements
55c2c91ec9
Omaha #1255 fixed collaboration colors
...
config.xml was not in build.properties
provided a fallback default if config is missing
Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6
Former-commit-id: c024dd86a1
[formerly aeb093ad95
] [formerly 0d4cd4bab8
] [formerly da53d9ccc7
[formerly 0d4cd4bab8
[formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]]
Former-commit-id: da53d9ccc7
Former-commit-id: 1a54c47307e1f8f59e93102d31d75908a974c968 [formerly e6e84d2c71
]
Former-commit-id: 2cea766aed
2014-07-07 12:29:12 -05:00
Richard Peter
95aad91ab1
Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
...
Former-commit-id: 1dca75e12d
[formerly 4219dbeec8
] [formerly ba1bd20407
] [formerly 8c17e9cef2
[formerly ba1bd20407
[formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]]
Former-commit-id: 8c17e9cef2
Former-commit-id: 775632f0e76f18c983cc243c8d72112f19425048 [formerly 741fc59f34
]
Former-commit-id: 3e19911306
2014-07-07 09:39:28 -05:00
Richard Peter
8d8ff4bbfe
Merge "Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response" into omaha_15.1.1
...
Former-commit-id: c2deb63b76
[formerly 4312c9c569
] [formerly 33de536deb4442165b8541764ee59985287f9a6c [formerly 42ec8874c8
]] [formerly 06a1d1555c
[formerly 42ec8874c8
[formerly 6d960e34632c2f615720c0550296d38feb8c90f6]]]
Former-commit-id: 06a1d1555c
Former-commit-id: ef7eb34bc8e95ee28d5c262f83862f6faf359c49 [formerly 804e9d1035
]
Former-commit-id: d27ebb1175
2014-07-07 09:30:09 -05:00
Richard Peter
eca055364c
Merge "Omaha #3350 Removing OBE classes/files for registry user registry and identity management" into omaha_14.4.1
...
Former-commit-id: 16e6f93285
[formerly 8a5608d851
] [formerly a50a5b1663
] [formerly 98d82de231
[formerly a50a5b1663
[formerly 0312ae103ee4dedea47c9ede9bb5651629e5a5b9]]]
Former-commit-id: 98d82de231
Former-commit-id: 52fe3d8dbf07aa1e01c28065fe497d269a11fd68 [formerly ce245ac8cf
]
Former-commit-id: e57ce89b6b
2014-07-07 09:21:02 -05:00
Ron Anderson
d258c29189
Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
...
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc
Former-commit-id: 56389537c2
[formerly fd16321f82
] [formerly 8d50f9d15a
] [formerly 24faa48233
[formerly 8d50f9d15a
[formerly 1e9e5abc477785c5b8cda9dd214da7de83532b9f]]]
Former-commit-id: 24faa48233
Former-commit-id: a279ec0ef46f5b0790579386a6f658d12703774c [formerly 87664d86a5
]
Former-commit-id: ae401db2ab
2014-07-07 09:02:14 -05:00
Roger Ferrel
eee0c50e53
Omaha #3348 Handle Enter event on Open's tree and text field.
...
Change-Id: I3409e7cdee6c97d7d7f2c320ba0ac233fbf602d4
Former-commit-id: 045cd846ec
[formerly 1964c7c4f7
] [formerly 6305bfdcb6
] [formerly f064f0d102
[formerly 6305bfdcb6
[formerly 29cc43c5f9b43a51b24b702f04f0a62fab1bd356]]]
Former-commit-id: f064f0d102
Former-commit-id: abfc8ff360788b3eeb598ef96de13bbc85a6ac0e [formerly 7649930247
]
Former-commit-id: 74f5c7eb82
2014-07-07 08:52:50 -05:00
Steve Harris
1ddd3ce18e
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: dcab227f00
[formerly e7de4b7130
] [formerly b00f46868790075d2a5db958f631f10e5ca1c7c4 [formerly 9886a6aa5f
]] [formerly 77259e5c18
[formerly 9886a6aa5f
[formerly cdc44956b4cd8ee3415ffb83d0d652d7162541d5]]]
Former-commit-id: 77259e5c18
Former-commit-id: 0282927e9761c001518fd37ae7dca095a5771b52 [formerly 853d803527
]
Former-commit-id: 7071f50293
2014-07-07 08:35:33 -05:00
Brian Clements
b5c4951144
Omaha #3342 added count to collaboration participant list
...
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: aad63c257d
[formerly c3a25024ae
] [formerly bfd9f59de8
] [formerly e4c9a13adb
[formerly bfd9f59de8
[formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]
Former-commit-id: e4c9a13adb
Former-commit-id: e2f81d3a7a49c030107992abebd7d8580750a677 [formerly bd9520f4fe
]
Former-commit-id: 50d2c6e24c
2014-07-03 15:11:48 -05:00
Benjamin Phillippe
ed4acc088e
Omaha #3350 Removing OBE classes/files for registry user registry and identity management
...
Former-commit-id: 804a11f0f5
[formerly c6c2f9240e
] [formerly ba0472caad
] [formerly 7960578e2c
[formerly ba0472caad
[formerly b81d5e3de415fb08b83d76aafacfef2ca937115c]]]
Former-commit-id: 7960578e2c
Former-commit-id: d64030858d8145a55ff83ec2ca96c723cc274988 [formerly 29f98ed5ab
]
Former-commit-id: 600a6c245a
2014-07-03 12:53:22 -05:00
Nate Jensen
b5518c4d40
Omaha #3165 fix grib logging imports
...
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021
Former-commit-id: 76850794d6
[formerly e101d99ba2
] [formerly bd46c43240
] [formerly 063ccb25e6
[formerly bd46c43240
[formerly 12665e265f8490101099f96a84240b478e6f5a5f]]]
Former-commit-id: 063ccb25e6
Former-commit-id: 76f70688cd80e724ddad23691479b9c46e05c15c [formerly 4dc36437fa
]
Former-commit-id: 4cb1e42ddb
2014-07-03 11:07:41 -05:00
Bryan Kowal
83e3155ff9
Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration.
...
The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.
Former-commit-id: fb397099e0
[formerly d0d5a08057
] [formerly 38d2431518
] [formerly a83301c1e9
[formerly 38d2431518
[formerly 03364fb2cdde0b7d7f5456335c99bae433628711]]]
Former-commit-id: a83301c1e9
Former-commit-id: 7a7f8f4d23e3ff7d4e74b90652bb19ec5a9f88e1 [formerly fa496a44f6
]
Former-commit-id: 712ee6ea96
2014-07-02 15:58:50 -05:00
Roger Ferrel
e39f121e2f
Omaha #3318 Changes to add GEFS to volumen browser.
...
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: b56fe77cbf
[formerly 2723c92167
] [formerly 02d9609862
] [formerly 1869745cce
[formerly 02d9609862
[formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]]
Former-commit-id: 1869745cce
Former-commit-id: 2019d68e3d931cb5d78090dac17da8e40c293a1c [formerly 7f50b8fb93
]
Former-commit-id: 37c05adfaf
2014-07-02 14:27:28 -05:00
Brian Clements
fff99d35ee
Omaha #3245 caveUtil.sh handle memory overide in vm args
...
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: 92be869624
[formerly fdec99abc5
] [formerly 013292ce9d
] [formerly 2773cf8935
[formerly 013292ce9d
[formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]]
Former-commit-id: 2773cf8935
Former-commit-id: 6f1522e1278daecbab2015532d3b9735aa656635 [formerly 648ffac146
]
Former-commit-id: 767d8abd20
2014-07-02 14:20:10 -05:00
Richard Peter
2bcaeba573
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
...
Former-commit-id: 1c07ac97d1
[formerly 9c41b7c23e
] [formerly 59325cf1f1
] [formerly 27ba905947
[formerly 59325cf1f1
[formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]]]
Former-commit-id: 27ba905947
Former-commit-id: 419af79068d9745f445fda7d8a758b4df367781b [formerly 127ce13eb8
]
Former-commit-id: a22847695d
2014-07-02 11:51:26 -05:00
Nate Jensen
7f89f61ab6
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
...
Former-commit-id: 0031f7adf5
[formerly e193fe4719
] [formerly 324194117a
] [formerly 14b514df2c
[formerly 324194117a
[formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]]]
Former-commit-id: 14b514df2c
Former-commit-id: c2d54b4085047fd6f9014cc3a8a78b63b52a1bab [formerly f39f6858e2
]
Former-commit-id: be426fc965
2014-07-02 11:20:26 -05:00
Nate Jensen
480b5b5863
Omaha #3165 build viz.useradmin before viz.datadelivery
...
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: a38a776ac6
[formerly 15d6ff7f79
] [formerly f6cbccdc5c
] [formerly 74e2bd1670
[formerly f6cbccdc5c
[formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]]
Former-commit-id: 74e2bd1670
Former-commit-id: 75b52b38b35362eb3e87ef30cfcfd7e988c52e0c [formerly e9b31a4429
]
Former-commit-id: db24013aa6
2014-07-02 11:18:59 -05:00
Brian Clements
2d1a994bfc
Omaha #1255 added collaboration specific color presets
...
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: 6c381d53ed
[formerly 08724fefd7
] [formerly 8b5ad1ec33
] [formerly eac871eed7
[formerly 8b5ad1ec33
[formerly 87ed36851c390058ab4c92977ecc552cab869d26]]]
Former-commit-id: eac871eed7
Former-commit-id: 0a47f310c2bc5e76e5ed2484684f46b47351e783 [formerly cd282ef018
]
Former-commit-id: ea1ac8ee8f
2014-07-02 10:02:52 -05:00
Nate Jensen
b31f618153
Omaha #3165 attempt to fix build
...
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 6f28f24afa
[formerly 1373af3e55
] [formerly a93af621d8
] [formerly 765ac1258b
[formerly a93af621d8
[formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]]
Former-commit-id: 765ac1258b
Former-commit-id: 54fa8041ee3052325df6cccd79220220bae3bcdd [formerly 264ac4d8a3
]
Former-commit-id: bbd50040a5
2014-07-02 10:01:05 -05:00
Nate Jensen
bdb4d8e102
Omaha #3165 separate registry plugins for viz to support hazard services
...
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: d873599954
[formerly a16d8689e9
] [formerly 5f56dbece7b6b5c11d5ab260fc872fb81399b959 [formerly f10efa300c
]] [formerly f32bf19eb7
[formerly f10efa300c
[formerly 4fedf54b9e2102268c873550da9c567edc2dd255]]]
Former-commit-id: f32bf19eb7
Former-commit-id: 698bed9b285b34465367799322f3d30195e6be16 [formerly 55dcecc7a7
]
Former-commit-id: ec64800f28
2014-07-01 17:37:08 -05:00