Steve Harris
f555652cd9
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: ab770c03d7
[formerly 42123642eb
] [formerly 27b08f8bcd
] [formerly 27b08f8bcd
[formerly 0cb8d202f5
]] [formerly 4df5ae5a60
[formerly 27b08f8bcd
[formerly 0cb8d202f5
] [formerly 4df5ae5a60
[formerly f352b47e1d930bfe2bc46f956c781375881e41f9]]]]
Former-commit-id: 4df5ae5a60
Former-commit-id: 54f4e95810b35bf4a0f392b39180bc241f36ef5a [formerly 64e15ba68857c2ece6d688b1556814e69b181e79] [formerly bf236d5aa1
[formerly 51d4907b76
]]
Former-commit-id: bf236d5aa1
Former-commit-id: 0e390da822
2014-07-14 11:54:53 -05:00
Nate Jensen
7a2475012b
Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
...
Former-commit-id: 445ac53a22
[formerly a67b7a3005
] [formerly a55162c74b
] [formerly a55162c74b
[formerly 2531649c55
]] [formerly 9f58d2e08b
[formerly a55162c74b
[formerly 2531649c55
] [formerly 9f58d2e08b
[formerly 97a0d0d8be7dd87e472dc0422a68df94d43095e1]]]]
Former-commit-id: 9f58d2e08b
Former-commit-id: 782b541e598e9f94c78bf821267e71cb9eba7d46 [formerly 1baa67bc1c72c1e0f4b5c907fef13d98c99b0a66] [formerly 289a4bf786
[formerly 363766fcca
]]
Former-commit-id: 289a4bf786
Former-commit-id: bfd642714a
2014-07-14 11:15:01 -05:00
Brian Clements
597b8d7377
Omaha #3371 all subprocesses now killed when cave.sh is killed
...
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2
Former-commit-id: ac70d5ff31
[formerly d6e181d301
] [formerly 0973e5ac41
] [formerly 0973e5ac41
[formerly 7e70fbda27
]] [formerly ae5fa893a9
[formerly 0973e5ac41
[formerly 7e70fbda27
] [formerly ae5fa893a9
[formerly e4becce5325aad266fd93548d27e5e122b145011]]]]
Former-commit-id: ae5fa893a9
Former-commit-id: 1589750d6ef3ab88dee548853789af4116287f7d [formerly ef9dbe97b4271805e63ea28026e72a445813455e] [formerly a1bce34fda
[formerly e72c34d361
]]
Former-commit-id: a1bce34fda
Former-commit-id: 97fc979b3b
2014-07-14 08:05:18 -05:00
Richard Peter
cb241406aa
Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
...
Former-commit-id: 65df97cdfa
[formerly 90d2108293
] [formerly 88419fb8f3
] [formerly 88419fb8f3
[formerly 0222a89cd4
]] [formerly 1c40dc11ef
[formerly 88419fb8f3
[formerly 0222a89cd4
] [formerly 1c40dc11ef
[formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]]]]
Former-commit-id: 1c40dc11ef
Former-commit-id: cfdb8ae489ebbe3962938c0a070864f5c2b04f12 [formerly 91c2b9274636fd96628da212f4a5cb80811946f9] [formerly d16ddba2f5
[formerly 2b75d79e0f
]]
Former-commit-id: d16ddba2f5
Former-commit-id: 1dab76f463
2014-07-11 17:46:14 -05:00
Benjamin Phillippe
cc04a23b0a
Omaha #3379 Removing DWR
...
Former-commit-id: 5c606a44b6
[formerly e613cb932e
] [formerly cc9e9b427a
] [formerly cc9e9b427a
[formerly d110e8428b
]] [formerly 4e1d93abf8
[formerly cc9e9b427a
[formerly d110e8428b
] [formerly 4e1d93abf8
[formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: 33501d62e4cecf73fb4dd9383720c0a85bf8fec5 [formerly c20f089fcf16ae33c66408335723c47e9c63b082] [formerly 5eea012728
[formerly 06e73cd55f
]]
Former-commit-id: 5eea012728
Former-commit-id: 63354789de
2014-07-11 11:56:44 -05:00
Brian Clements
9613712d46
Omaha #3364 added jmap -heap to capture script
...
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153
Former-commit-id: a39c8b7916
[formerly f24c94b118
] [formerly 146318e49e
] [formerly 146318e49e
[formerly 82cf017cbe
]] [formerly d5506736df
[formerly 146318e49e
[formerly 82cf017cbe
] [formerly d5506736df
[formerly 65c88529acfb31c408777337f456da5dce879146]]]]
Former-commit-id: d5506736df
Former-commit-id: 44f5c6097c0b26d843c82ef0121b0c91b4f67f29 [formerly f5420415ca79d293ff76af12e288fd0c399b84e5] [formerly 10a01f3556
[formerly 2c4fb16c12
]]
Former-commit-id: 10a01f3556
Former-commit-id: e65e061622
2014-07-11 10:20:48 -05:00
Richard Peter
4112b13486
Merge "Omaha #3318 Delta script for GEFS h5 file updates" into omaha_14.4.1
...
Former-commit-id: 1874d4ec86
[formerly e84e988c7d
] [formerly 57318e4446
] [formerly 57318e4446
[formerly c3740f0f11
]] [formerly 98d7cbab0d
[formerly 57318e4446
[formerly c3740f0f11
] [formerly 98d7cbab0d
[formerly b5d7d388acb17911b4592182884ac8bfac687c4f]]]]
Former-commit-id: 98d7cbab0d
Former-commit-id: 24b4d9c30b0a5a00608d2ae7074822dd035eaf2e [formerly b73281af82ae0328cd4809c8b31bca66863e0b13] [formerly 1dac01c298
[formerly d9ea2c328c
]]
Former-commit-id: 1dac01c298
Former-commit-id: 4a46fd36c4
2014-07-10 17:47:50 -05:00
Nate Jensen
6e8c864450
Merge "Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh" into omaha_14.4.1
...
Former-commit-id: c6dc6c6ff5
[formerly abd06c4d76
] [formerly 205b90cb24
] [formerly 205b90cb24
[formerly 68170f4a3e
]] [formerly f92d9eb817
[formerly 205b90cb24
[formerly 68170f4a3e
] [formerly f92d9eb817
[formerly c114f3578804f9eb2fd130428bb327c968f0fbdf]]]]
Former-commit-id: f92d9eb817
Former-commit-id: 85a81353d22003578cc46393a33b0cb5c4319bb1 [formerly a5ad82ef7a8529fa594ecafa76615221d40cddb9] [formerly c69237b1b8
[formerly 0f254686cb
]]
Former-commit-id: c69237b1b8
Former-commit-id: 69361f662e
2014-07-10 17:02:48 -05:00
Nate Jensen
8f607befb5
Merge "Omaha #3165 update manifests for ll.netcdf rename" into omaha_14.4.1
...
Former-commit-id: 1cdb318608
[formerly a19c2dde43
] [formerly c3e7b245af
] [formerly c3e7b245af
[formerly ffa31a72ab
]] [formerly b267109497
[formerly c3e7b245af
[formerly ffa31a72ab
] [formerly b267109497
[formerly 599f7a6d2eff8723cbf515b14afefc270f42cdd0]]]]
Former-commit-id: b267109497
Former-commit-id: 951f9af8c1c0cc26168431c37931b17c5fd61057 [formerly f3b73748f74fa8b0b05605ed4a2d14ca10de592e] [formerly 2f163afff8
[formerly 55d87b6260
]]
Former-commit-id: 2f163afff8
Former-commit-id: 18a3177224
2014-07-10 16:32:02 -05:00
Brian Clements
711c6e77a0
Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
...
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298
Former-commit-id: d6c9768385
[formerly ed03db05ea
] [formerly 987d514fa3
] [formerly 987d514fa3
[formerly 871a8655c8
]] [formerly 0113e109d3
[formerly 987d514fa3
[formerly 871a8655c8
] [formerly 0113e109d3
[formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]]]
Former-commit-id: 0113e109d3
Former-commit-id: e608f9ace6c7df0bec7802e9363ccda2f0f41ba5 [formerly 177f6db44761392bd73fa9adfd0d53bb7bd07a4b] [formerly ed9ba91d4e
[formerly c32592fd1c
]]
Former-commit-id: ed9ba91d4e
Former-commit-id: 034bf93c29
2014-07-10 16:31:11 -05:00
Roger Ferrel
c1f83178ff
Omaha #3318 Delta script for GEFS h5 file updates
...
Former-commit-id: 26fcb4b9aa
[formerly c9601b1194
] [formerly 577790589f
] [formerly 577790589f
[formerly d007725e9a
]] [formerly 9eaeb01624
[formerly 577790589f
[formerly d007725e9a
] [formerly 9eaeb01624
[formerly 2e6eeaeac3018a34bf5a471f4ebcae58e608fbca]]]]
Former-commit-id: 9eaeb01624
Former-commit-id: a0fd35c1700558360754311ea83febfbaa7e7c2b [formerly b6f7db8497a9d73ba949797da1517de23f7250f0] [formerly 4449133a46
[formerly ee1a95ceb1
]]
Former-commit-id: 4449133a46
Former-commit-id: b90fa1ce13
2014-07-10 16:30:03 -05:00
Everett Kladstrup
091b459325
Omaha #3165 update manifests for ll.netcdf rename
...
Former-commit-id: 1f9e1575a9
[formerly 4abb66a103
] [formerly 9cf007e546
] [formerly 9cf007e546
[formerly 4e3b76ae29
]] [formerly febe13a241
[formerly 9cf007e546
[formerly 4e3b76ae29
] [formerly febe13a241
[formerly 434ab5131e44d772d04c029833e2979fc19b6421]]]]
Former-commit-id: febe13a241
Former-commit-id: 4a0815dd8247cee0f55a15d2a27eb83b2aa2b35d [formerly 519082d3aa4581181c084c73ede2f8f07ecba91b] [formerly c5e71e2348
[formerly e18ad7caec
]]
Former-commit-id: c5e71e2348
Former-commit-id: 173a773d0d
2014-07-10 16:19:42 -05:00
Bryan Kowal
61880d47ff
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: 34da4d3e55
[formerly 7220057d30
] [formerly 32aa07f1fc
] [formerly 32aa07f1fc
[formerly 984842331d
]] [formerly 49ffec76ff
[formerly 32aa07f1fc
[formerly 984842331d
] [formerly 49ffec76ff
[formerly 146e5ebed335bf25cbae152eef1b0544e833f741]]]]
Former-commit-id: 49ffec76ff
Former-commit-id: c27d01f73823e26bb19fa966b59dcf744d1fd5af [formerly a0e7e5fc3cecd53e7af40ec39cf5fd688ffa6a2e] [formerly 4e295dba49
[formerly 9fa0118ce9
]]
Former-commit-id: 4e295dba49
Former-commit-id: 48e0656dff
2014-07-10 11:16:19 -05:00
Nate Jensen
7e3158ed5c
Omaha #3165 fix bad manifests
...
Change-Id: I9cef6a2086a7688fa5db412073af2b565396958a
Former-commit-id: 81e7660a82
[formerly 61fa1f41f0
] [formerly b874c80f93
] [formerly b874c80f93
[formerly c323b72f48
]] [formerly eef97e7ec0
[formerly b874c80f93
[formerly c323b72f48
] [formerly eef97e7ec0
[formerly 4792e114d091b244b46d54b0846b8535583e4068]]]]
Former-commit-id: eef97e7ec0
Former-commit-id: c30dda93aa270cf09995adbc546abff2f52c03d7 [formerly 9053af0969241e89bfd7400a1cdc95b60483b5c9] [formerly 7ceb81ec48
[formerly aef963a64e
]]
Former-commit-id: 7ceb81ec48
Former-commit-id: c0da212407
2014-07-10 09:20:24 -05:00
Ron Anderson
0d1a783be8
Issue #3146 Added check for duplicate smartInit.
...
Added alertViz message for GFE site activation failure
Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004
Former-commit-id: 7c78d28a95
[formerly 6ead047f79
] [formerly 9f4e89347a
] [formerly 9f4e89347a
[formerly 0c0739bd72
]] [formerly 468668e19b
[formerly 9f4e89347a
[formerly 0c0739bd72
] [formerly 468668e19b
[formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]]]]
Former-commit-id: 468668e19b
Former-commit-id: 79304e1b96440f254fd345accedc2a4f8ae3cdcf [formerly 0931f5b4440dd2ba692f9bb4936037c9fa726c26] [formerly ed7f6f731e
[formerly a917ea16a4
]]
Former-commit-id: ed7f6f731e
Former-commit-id: d5ca7c1946
2014-07-09 16:42:43 -05:00
Brian Clements
c2aeeff10e
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: 03a36d8626
[formerly fc246aa082
] [formerly dba1fb3fc1
] [formerly 7e169dc19dead51500d0201eb10e0b9e2f14cfd0 [formerly dba1fb3fc1
[formerly 994226e82b
]]] [formerly ac8f861112
[formerly dba1fb3fc1
[formerly 994226e82b
] [formerly ac8f861112
[formerly 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393]]]]
Former-commit-id: ac8f861112
Former-commit-id: 60d124459dc3ea12b7b4063900881d998f5dad12 [formerly 58cd6b777893efcab676bfb302e4f2adb7c4adbf] [formerly f9dad29ad8
[formerly e74fcfbce1
]]
Former-commit-id: f9dad29ad8
Former-commit-id: e2d16bde70
2014-07-09 14:13:47 -05:00
Nate Jensen
c49ce07af8
Merge "Omaha #3361 reduce number of extraneous localization requests at GFE startup" into omaha_14.4.1
...
Former-commit-id: 70dcfa3c6e
[formerly c3619bf0e6
] [formerly 011089ab35
] [formerly 011089ab35
[formerly 9f7aef5f3e
]] [formerly 2a18111bdc
[formerly 011089ab35
[formerly 9f7aef5f3e
] [formerly 2a18111bdc
[formerly 56263f9c5dbc38d838e8da5df252ba5043f846ab]]]]
Former-commit-id: 2a18111bdc
Former-commit-id: 98a1115041bb772df00b22e1bbf5703318f59e0e [formerly 253a307a83e2ed42d7b0afc900a376b5d997aa46] [formerly c07ae4fa3a
[formerly f8386f0570
]]
Former-commit-id: c07ae4fa3a
Former-commit-id: a25d360ee4
2014-07-09 09:47:07 -05:00
Nate Jensen
d7cbd10cd6
Omaha #3361 reduce number of extraneous localization requests at GFE
...
startup
Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed
Former-commit-id: dcfb7f5421
[formerly 93012a8b76
] [formerly c3bd61a2c0
] [formerly 01e9674f04e037fd2014ec4ce3a27f2abe744e45 [formerly c3bd61a2c0
[formerly 0c397d2b7e
]]] [formerly 5547ea1c7d
[formerly c3bd61a2c0
[formerly 0c397d2b7e
] [formerly 5547ea1c7d
[formerly efa10ca2702ecee4535711be06373e5d079ac117]]]]
Former-commit-id: 5547ea1c7d
Former-commit-id: 186f1bbbe8b4dc896d38f8ec3c08087d611aa69d [formerly 03c7194ee9d1c11cb9ccecc4e9a319197e8bdda4] [formerly d5f944d203
[formerly af08cc189f
]]
Former-commit-id: d5f944d203
Former-commit-id: 0d5c29fee9
2014-07-09 09:24:31 -05:00
Nate Jensen
43e41e2d2e
Merge "Omaha #3357 Ingest JVM shouldn't pull in DPA beans Change-Id: I59d0cf13a7704499093b401328bda5867197c525" into omaha_14.4.1
...
Former-commit-id: 8b8665ac71
[formerly a226c1fde5
] [formerly c818bca5c3
] [formerly c818bca5c3
[formerly 25f5e8f2e0
]] [formerly b9b26f1b54
[formerly c818bca5c3
[formerly 25f5e8f2e0
] [formerly b9b26f1b54
[formerly a1a17c4757be0a60d6634384e5de1cbfd611096d]]]]
Former-commit-id: b9b26f1b54
Former-commit-id: d77c3ba6bf4899f530c115af7b66d33ca6d144f3 [formerly 00604eaa931583136d1b1624ef0d20bed0ae0dad] [formerly 9dd837e39d
[formerly 8e83a7d278
]]
Former-commit-id: 9dd837e39d
Former-commit-id: a4c77cdc34
2014-07-08 13:29:37 -05:00
Dave Hladky
74f63f789c
Omaha #3357 Ingest JVM shouldn't pull in DPA beans
...
Change-Id: I59d0cf13a7704499093b401328bda5867197c525
Former-commit-id: 754fa3556e
[formerly 8434edf807
] [formerly 36b0428ff9
] [formerly 36b0428ff9
[formerly 53f26636f7
]] [formerly a0d305355b
[formerly 36b0428ff9
[formerly 53f26636f7
] [formerly a0d305355b
[formerly 4a5e3dc51e01bfb1fa6c50df7ba4f1a65bac9ba1]]]]
Former-commit-id: a0d305355b
Former-commit-id: cbcf0f6e1061d786d2fb3920a8a20d00b8fa8d7a [formerly 8785c728d3d3d1d5c38dc86075a0ae2a7c554104] [formerly e83c58641d
[formerly d8fb83d443
]]
Former-commit-id: e83c58641d
Former-commit-id: bd0895b154
2014-07-08 12:29:04 -05:00
Bryan Kowal
53c1396799
Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
...
Former-commit-id: f6a0d47fbd
[formerly ee4b7c4ee8
] [formerly 58a2ae8bc8
] [formerly 58a2ae8bc8
[formerly 98a310f4a7
]] [formerly 6a197f845d
[formerly 58a2ae8bc8
[formerly 98a310f4a7
] [formerly 6a197f845d
[formerly e0bb64fc5112a15d9d991eb8f39de42b541f4e54]]]]
Former-commit-id: 6a197f845d
Former-commit-id: 47f519de2a6f4881325b8e56e1bfc4bf4e64dd6e [formerly ed8425afeb482fb12b827adf7402a0eda661e5fb] [formerly ac1b94c63f
[formerly 0fdfc0fd4a
]]
Former-commit-id: ac1b94c63f
Former-commit-id: b2d4debdce
2014-07-08 09:31:21 -05:00
Brian Clements
942b584b8a
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: 533820d968
[formerly c024dd86a1
] [formerly aeb093ad95
] [formerly aeb093ad95
[formerly 0d4cd4bab8
]] [formerly da53d9ccc7
[formerly aeb093ad95
[formerly 0d4cd4bab8
] [formerly da53d9ccc7
[formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]]]
Former-commit-id: da53d9ccc7
Former-commit-id: 086e648f55c8ac519cf5f611fa1ae7d930954fe7 [formerly 1a54c47307e1f8f59e93102d31d75908a974c968] [formerly 2cea766aed
[formerly e6e84d2c71
]]
Former-commit-id: 2cea766aed
Former-commit-id: 55c2c91ec9
2014-07-07 12:29:12 -05:00
Richard Peter
b3c6b47573
Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
...
Former-commit-id: bb198ce76b
[formerly 1dca75e12d
] [formerly 4219dbeec8
] [formerly 4219dbeec8
[formerly ba1bd20407
]] [formerly 8c17e9cef2
[formerly 4219dbeec8
[formerly ba1bd20407
] [formerly 8c17e9cef2
[formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]]]
Former-commit-id: 8c17e9cef2
Former-commit-id: ed575e16f2802bd62bcb14a9c744169c6a04faf3 [formerly 775632f0e76f18c983cc243c8d72112f19425048] [formerly 3e19911306
[formerly 741fc59f34
]]
Former-commit-id: 3e19911306
Former-commit-id: 95aad91ab1
2014-07-07 09:39:28 -05:00
Richard Peter
114f069f32
Merge "Omaha #3350 Removing OBE classes/files for registry user registry and identity management" into omaha_14.4.1
...
Former-commit-id: 04954f9fbc
[formerly 16e6f93285
] [formerly 8a5608d851
] [formerly 8a5608d851
[formerly a50a5b1663
]] [formerly 98d82de231
[formerly 8a5608d851
[formerly a50a5b1663
] [formerly 98d82de231
[formerly 0312ae103ee4dedea47c9ede9bb5651629e5a5b9]]]]
Former-commit-id: 98d82de231
Former-commit-id: 8ed281fd2ca5b563f32917e128b9f5f77ac45ef3 [formerly 52fe3d8dbf07aa1e01c28065fe497d269a11fd68] [formerly e57ce89b6b
[formerly ce245ac8cf
]]
Former-commit-id: e57ce89b6b
Former-commit-id: eca055364c
2014-07-07 09:21:02 -05:00
Brian Clements
0c3365433b
Omaha #3342 added count to collaboration participant list
...
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: 7205488e68
[formerly aad63c257d
] [formerly c3a25024ae
] [formerly c3a25024ae
[formerly bfd9f59de8
]] [formerly e4c9a13adb
[formerly c3a25024ae
[formerly bfd9f59de8
] [formerly e4c9a13adb
[formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]]
Former-commit-id: e4c9a13adb
Former-commit-id: 4cd83a93955c7fb12bb1880e292dd61f8a54dc2e [formerly e2f81d3a7a49c030107992abebd7d8580750a677] [formerly 50d2c6e24c
[formerly bd9520f4fe
]]
Former-commit-id: 50d2c6e24c
Former-commit-id: b5c4951144
2014-07-03 15:11:48 -05:00
Benjamin Phillippe
5b4d794930
Omaha #3350 Removing OBE classes/files for registry user registry and identity management
...
Former-commit-id: d0cfe0b25e
[formerly 804a11f0f5
] [formerly c6c2f9240e
] [formerly c6c2f9240e
[formerly ba0472caad
]] [formerly 7960578e2c
[formerly c6c2f9240e
[formerly ba0472caad
] [formerly 7960578e2c
[formerly b81d5e3de415fb08b83d76aafacfef2ca937115c]]]]
Former-commit-id: 7960578e2c
Former-commit-id: 940395effdc56f6172a77b32c7e77042576ad4af [formerly d64030858d8145a55ff83ec2ca96c723cc274988] [formerly 600a6c245a
[formerly 29f98ed5ab
]]
Former-commit-id: 600a6c245a
Former-commit-id: ed4acc088e
2014-07-03 12:53:22 -05:00
Nate Jensen
1b8a16325e
Omaha #3165 fix grib logging imports
...
Change-Id: Ifde55c3d30207f976b2c8aef3571f3c5d356e021
Former-commit-id: 439716f041
[formerly 76850794d6
] [formerly e101d99ba2
] [formerly e101d99ba2
[formerly bd46c43240
]] [formerly 063ccb25e6
[formerly e101d99ba2
[formerly bd46c43240
] [formerly 063ccb25e6
[formerly 12665e265f8490101099f96a84240b478e6f5a5f]]]]
Former-commit-id: 063ccb25e6
Former-commit-id: e62a671131dbf7c31fe95a2df89328956257cc51 [formerly 76f70688cd80e724ddad23691479b9c46e05c15c] [formerly 4cb1e42ddb
[formerly 4dc36437fa
]]
Former-commit-id: 4cb1e42ddb
Former-commit-id: b5518c4d40
2014-07-03 11:07:41 -05:00
Roger Ferrel
f2de0d792b
Omaha #3318 Changes to add GEFS to volumen browser.
...
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: 8da1a9d1ef
[formerly b56fe77cbf
] [formerly 2723c92167
] [formerly 2723c92167
[formerly 02d9609862
]] [formerly 1869745cce
[formerly 2723c92167
[formerly 02d9609862
] [formerly 1869745cce
[formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]]]
Former-commit-id: 1869745cce
Former-commit-id: feb0338265611245ae75ce294c9f20153b494a27 [formerly 2019d68e3d931cb5d78090dac17da8e40c293a1c] [formerly 37c05adfaf
[formerly 7f50b8fb93
]]
Former-commit-id: 37c05adfaf
Former-commit-id: e39f121e2f
2014-07-02 14:27:28 -05:00
Brian Clements
b42a62bc7e
Omaha #3245 caveUtil.sh handle memory overide in vm args
...
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: bd406e27e7
[formerly 92be869624
] [formerly fdec99abc5
] [formerly fdec99abc5
[formerly 013292ce9d
]] [formerly 2773cf8935
[formerly fdec99abc5
[formerly 013292ce9d
] [formerly 2773cf8935
[formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]]]
Former-commit-id: 2773cf8935
Former-commit-id: b8152f66a7416f39b2a8fe95460902317a60ad61 [formerly 6f1522e1278daecbab2015532d3b9735aa656635] [formerly 767d8abd20
[formerly 648ffac146
]]
Former-commit-id: 767d8abd20
Former-commit-id: fff99d35ee
2014-07-02 14:20:10 -05:00
Richard Peter
9a8c018721
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
...
Former-commit-id: 82f11c2cf4
[formerly 1c07ac97d1
] [formerly 9c41b7c23e
] [formerly 9c41b7c23e
[formerly 59325cf1f1
]] [formerly 27ba905947
[formerly 9c41b7c23e
[formerly 59325cf1f1
] [formerly 27ba905947
[formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]]]]
Former-commit-id: 27ba905947
Former-commit-id: e753d59169487789d4f4e26e20b388acd45de04b [formerly 419af79068d9745f445fda7d8a758b4df367781b] [formerly a22847695d
[formerly 127ce13eb8
]]
Former-commit-id: a22847695d
Former-commit-id: 2bcaeba573
2014-07-02 11:51:26 -05:00
Nate Jensen
32bc696f1e
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
...
Former-commit-id: c51db2ec1c
[formerly 0031f7adf5
] [formerly e193fe4719
] [formerly e193fe4719
[formerly 324194117a
]] [formerly 14b514df2c
[formerly e193fe4719
[formerly 324194117a
] [formerly 14b514df2c
[formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]]]]
Former-commit-id: 14b514df2c
Former-commit-id: e615386afa945a060f2acecf0dd92d43d87e2971 [formerly c2d54b4085047fd6f9014cc3a8a78b63b52a1bab] [formerly be426fc965
[formerly f39f6858e2
]]
Former-commit-id: be426fc965
Former-commit-id: 7f89f61ab6
2014-07-02 11:20:26 -05:00
Nate Jensen
8cc8260136
Omaha #3165 build viz.useradmin before viz.datadelivery
...
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: 2ddd823a0a
[formerly a38a776ac6
] [formerly 15d6ff7f79
] [formerly 15d6ff7f79
[formerly f6cbccdc5c
]] [formerly 74e2bd1670
[formerly 15d6ff7f79
[formerly f6cbccdc5c
] [formerly 74e2bd1670
[formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]]]
Former-commit-id: 74e2bd1670
Former-commit-id: f8cbab637fc91c29fa6dce5b7e44d1fe41d381dc [formerly 75b52b38b35362eb3e87ef30cfcfd7e988c52e0c] [formerly db24013aa6
[formerly e9b31a4429
]]
Former-commit-id: db24013aa6
Former-commit-id: 480b5b5863
2014-07-02 11:18:59 -05:00
Brian Clements
d8fc6f7fc5
Omaha #1255 added collaboration specific color presets
...
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: 6e01a1ac51
[formerly 6c381d53ed
] [formerly 08724fefd7
] [formerly 08724fefd7
[formerly 8b5ad1ec33
]] [formerly eac871eed7
[formerly 08724fefd7
[formerly 8b5ad1ec33
] [formerly eac871eed7
[formerly 87ed36851c390058ab4c92977ecc552cab869d26]]]]
Former-commit-id: eac871eed7
Former-commit-id: 2bcf32ca5defd85a4d3c3d54ada538464f8c5123 [formerly 0a47f310c2bc5e76e5ed2484684f46b47351e783] [formerly ea1ac8ee8f
[formerly cd282ef018
]]
Former-commit-id: ea1ac8ee8f
Former-commit-id: 2d1a994bfc
2014-07-02 10:02:52 -05:00
Nate Jensen
8fce99e4d2
Omaha #3165 attempt to fix build
...
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 72ffe07428
[formerly 6f28f24afa
] [formerly 1373af3e55
] [formerly 1373af3e55
[formerly a93af621d8
]] [formerly 765ac1258b
[formerly 1373af3e55
[formerly a93af621d8
] [formerly 765ac1258b
[formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]]]
Former-commit-id: 765ac1258b
Former-commit-id: 5ea73a8c0bf466fabccad4ab2745407a02d66e87 [formerly 54fa8041ee3052325df6cccd79220220bae3bcdd] [formerly bbd50040a5
[formerly 264ac4d8a3
]]
Former-commit-id: bbd50040a5
Former-commit-id: b31f618153
2014-07-02 10:01:05 -05:00
Nate Jensen
b377e97d18
Omaha #3165 separate registry plugins for viz to support hazard services
...
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: c7d4332bdf
[formerly d873599954
] [formerly a16d8689e9
] [formerly 5f56dbece7b6b5c11d5ab260fc872fb81399b959 [formerly a16d8689e9
[formerly f10efa300c
]]] [formerly f32bf19eb7
[formerly a16d8689e9
[formerly f10efa300c
] [formerly f32bf19eb7
[formerly 4fedf54b9e2102268c873550da9c567edc2dd255]]]]
Former-commit-id: f32bf19eb7
Former-commit-id: aad06b7fe3f740b1544c643f90d4d73b898cf0a0 [formerly 698bed9b285b34465367799322f3d30195e6be16] [formerly ec64800f28
[formerly 55dcecc7a7
]]
Former-commit-id: ec64800f28
Former-commit-id: bdb4d8e102
2014-07-01 17:37:08 -05:00
Richard Peter
76ce81c4c8
Merge "Omaha #3230 Recursive search for model files." into omaha_14.4.1
...
Former-commit-id: a4ddb89994
[formerly 03290f682e
] [formerly 57ec1df5a5
] [formerly ac3d3273c3bd2cb626bb1b0aeaed6d3593bc5d10 [formerly 57ec1df5a5
[formerly b8f2fddd95
]]] [formerly 8dfa9696af
[formerly 57ec1df5a5
[formerly b8f2fddd95
] [formerly 8dfa9696af
[formerly 956c4d9672e8706774d00f58e42b848c9917eb9f]]]]
Former-commit-id: 8dfa9696af
Former-commit-id: c92d14d15b3b0d5682b4e05dc93dbc33b9ea1f71 [formerly 9739b814094f11e45c94e7fdc6d2f974a2b19e32] [formerly 93ef55e65e
[formerly d8687baba7
]]
Former-commit-id: 93ef55e65e
Former-commit-id: 01991dac3a
2014-07-01 16:03:36 -05:00
Richard Peter
2958b1e45d
Omaha 3300 Fix merge issue in gfe-spring.xml
...
Change-Id: I575616e8d3176baad77db276e2c43b43801686ea
Former-commit-id: c1f1cbc0cf
[formerly 003689101c
] [formerly b38dd722be
] [formerly b38dd722be
[formerly 40c01d05d4
]] [formerly eacaf068a7
[formerly b38dd722be
[formerly 40c01d05d4
] [formerly eacaf068a7
[formerly 59bf1aba9614d3206eb5e3d02d985d726a5c9fbe]]]]
Former-commit-id: eacaf068a7
Former-commit-id: 45704923e618600b81b97bce57972d092acb2cf1 [formerly 8eccf45838579a62294744c9b84732033edaf39d] [formerly 7961742ee6
[formerly a4beeb4d1b
]]
Former-commit-id: 7961742ee6
Former-commit-id: e5d6a4f421
2014-07-01 15:43:46 -05:00
Richard Peter
0d7f87bb5b
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: 94dfb1d2b8
[formerly ed38bf2372
] [formerly 6636b301e5
] [formerly 6636b301e5
[formerly 93bbd98cbc
]] [formerly 8ecc27f714
[formerly 6636b301e5
[formerly 93bbd98cbc
] [formerly 8ecc27f714
[formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 3802e1ae7885edfbc70e2a3fa559bbd04ab6bec5 [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e] [formerly 552ac6d640
[formerly fc27824dbc
]]
Former-commit-id: 552ac6d640
Former-commit-id: 948e0cd011
2014-07-01 15:34:39 -05:00
Roger Ferrel
a2f20c6732
Omaha #3230 Recursive search for model files.
...
Change-Id: Ia862269ddf42127fdd3b994da9320f99a6ff1c49
Former-commit-id: 43c21dcaa5
[formerly 3c2a477f46
] [formerly 69fab4d289
] [formerly 69fab4d289
[formerly cd3720035d
]] [formerly a8c93f7783
[formerly 69fab4d289
[formerly cd3720035d
] [formerly a8c93f7783
[formerly c4009c2b4e19c5c1d65a1844c12a7e63e9366b9b]]]]
Former-commit-id: a8c93f7783
Former-commit-id: bf6e3d0f2886208d18df624ce739e18320b3e4a5 [formerly ddf6db838ce3f17c1bae696502402d23509d6ed6] [formerly bb6e08ae2f
[formerly f7fe138cc1
]]
Former-commit-id: bb6e08ae2f
Former-commit-id: 0b96193de4
2014-07-01 15:33:30 -05:00
Steve Harris
dc180f85a6
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
...
Former-commit-id: bbcae6e52b
[formerly 6a7aeb3557
] [formerly f68e051938
] [formerly f68e051938
[formerly 1c8dc56d49
]] [formerly 30cdbff7f8
[formerly f68e051938
[formerly 1c8dc56d49
] [formerly 30cdbff7f8
[formerly 382c772c196711d230395f34a04559c188880622]]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: bb4576ffe3bccfcdbb7bd53cd66aeb47ec9b5a73 [formerly f86265bab0c346864e940cc8c360ec5235644553] [formerly a4d91c59d6
[formerly 6f9129ac78
]]
Former-commit-id: a4d91c59d6
Former-commit-id: 3369bc4a1d
2014-07-01 13:38:18 -05:00
Nate Jensen
5cdcf006c1
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
...
Former-commit-id: ea5067f614
[formerly 71025bcc3d
] [formerly 81ca7a9e9f
] [formerly 81ca7a9e9f
[formerly c0d36e9a69
]] [formerly 1183c0538e
[formerly 81ca7a9e9f
[formerly c0d36e9a69
] [formerly 1183c0538e
[formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]]]]
Former-commit-id: 1183c0538e
Former-commit-id: d2186b6c6185fa963b638e7958990b1ab897c273 [formerly ad38ccbb38ccc3c1e25afc6279df150354266fb5] [formerly 52d5edac63
[formerly cb9e715aec
]]
Former-commit-id: 52d5edac63
Former-commit-id: 886348da08
2014-07-01 10:30:54 -05:00
Nate Jensen
8dd0ba03c2
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
...
Former-commit-id: 6ce9aa0a28
[formerly 479b22f6a1
] [formerly ac0f0e2298
] [formerly ac0f0e2298
[formerly 0a9fc691b9
]] [formerly fbda7c4489
[formerly ac0f0e2298
[formerly 0a9fc691b9
] [formerly fbda7c4489
[formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]]]
Former-commit-id: fbda7c4489
Former-commit-id: 194c79f432b41fb1fc0dc95c3de449419c33910f [formerly 42f3d41f4fbd3ce168d8d1117e5ce0b5a752ff73] [formerly fe1f9e8977
[formerly 9e6433f44b
]]
Former-commit-id: fe1f9e8977
Former-commit-id: d1ce9eed5b
2014-07-01 10:22:25 -05:00
Greg Armendariz
a11e4bd853
Merge "Omaha #3299 - Remove project file and change build reference" into omaha_14.4.1
...
Former-commit-id: 29b87e136e
[formerly 80fd17a8c2
] [formerly 134f0e2e8b
] [formerly 134f0e2e8b
[formerly 82fe8608e0
]] [formerly 0688e9db1b
[formerly 134f0e2e8b
[formerly 82fe8608e0
] [formerly 0688e9db1b
[formerly e6a5ab99510887f28c4a98afaa28f122f814d5a5]]]]
Former-commit-id: 0688e9db1b
Former-commit-id: 28d18cd0e8b2a39218af9f8d4e5e52b5a7d57355 [formerly 0c71de38675483377fcc4044afeaeebf792c0ac2] [formerly 471814e891
[formerly fa76c0c1df
]]
Former-commit-id: 471814e891
Former-commit-id: 0cf0691534
2014-07-01 10:17:11 -05:00
Nate Jensen
edb2c8bb58
Merge "Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range." into omaha_14.4.1
...
Former-commit-id: c72961d063
[formerly 049450c5a9
] [formerly 3b2dc2915e
] [formerly 3b2dc2915e
[formerly 35e3626527
]] [formerly 1d2ae81ff6
[formerly 3b2dc2915e
[formerly 35e3626527
] [formerly 1d2ae81ff6
[formerly 76fd0a563baa40722ce645d8019c40dbc42405b6]]]]
Former-commit-id: 1d2ae81ff6
Former-commit-id: 7ed2f50672cb6e1792ed2a0d4691625b515b6dc0 [formerly b0a8ca8bad14719bc878aa96cef1d2c4e21ce2b8] [formerly 14d368f33b
[formerly 8a03a5ecb9
]]
Former-commit-id: 14d368f33b
Former-commit-id: 85cc42e2ea
2014-07-01 10:12:14 -05:00
Steve Harris
020a525bfd
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: b2ca44adc7
[formerly 741dc31fcb
] [formerly 2f2958df37
] [formerly 2f2958df37
[formerly d4dc1723c1
]] [formerly 7acd9ab2dd
[formerly 2f2958df37
[formerly d4dc1723c1
] [formerly 7acd9ab2dd
[formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 3e0604521c6e7522f3a4123eee8600cb5a71226f [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6] [formerly 7fb4663d75
[formerly dcbab5621f
]]
Former-commit-id: 7fb4663d75
Former-commit-id: d70da4127e
2014-07-01 11:08:46 -04:00
Richard Peter
f1278ccf7a
Merge "Omaha #3255 Updated Proxy classes to include all java proxy config settings" into omaha_14.4.1
...
Former-commit-id: 8ec0cec3d0
[formerly a15a86a911
] [formerly 838739ebbb
] [formerly 838739ebbb
[formerly 027fff1de0
]] [formerly e7d0dd1e28
[formerly 838739ebbb
[formerly 027fff1de0
] [formerly e7d0dd1e28
[formerly 33080d565ceb85a0a0945f7c0d6a81caaa715b62]]]]
Former-commit-id: e7d0dd1e28
Former-commit-id: 4fc9e5b0cb59728a16d726c47d283512addeb09b [formerly 3c7b196920448f0555c2b06dac63f232e194c048] [formerly d0ce3374a7
[formerly 0cef25a49c
]]
Former-commit-id: d0ce3374a7
Former-commit-id: 4a4439d2fd
2014-07-01 10:02:57 -05:00
Richard Peter
5e76bc4634
Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
...
Former-commit-id: feb82e79d9
[formerly 1024035422
] [formerly 20eeb493bb
] [formerly 20eeb493bb
[formerly 6d9db0784a
]] [formerly e6ac1b2ec8
[formerly 20eeb493bb
[formerly 6d9db0784a
] [formerly e6ac1b2ec8
[formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]]]]
Former-commit-id: e6ac1b2ec8
Former-commit-id: f2d0af8e3a62ee5a186b0baf968d5296cf2a8e88 [formerly f3ceb72fd3502a79aad5e85f5fd66b79cc0bab66] [formerly 2965150f36
[formerly 3de8492ff3
]]
Former-commit-id: 2965150f36
Former-commit-id: 17839c2514
2014-07-01 09:48:20 -05:00
Nathan Bowler
70b0511868
Omaha #3008 Refactor to use EventReport to parse reports and better log reports with missing fields. Update manifest. Log number of discarded reports. Discard all reports if missing the data range.
...
Change-Id: I63681d5172689711834f3d71df9424c68a1f5317
Former-commit-id: 2847cd3cb8
[formerly 7908a8a361
] [formerly f3fc00fb32
] [formerly f3fc00fb32
[formerly 43f164e682
]] [formerly 6099815272
[formerly f3fc00fb32
[formerly 43f164e682
] [formerly 6099815272
[formerly 2d389525e2897237a66eb145002a9ae8970c9993]]]]
Former-commit-id: 6099815272
Former-commit-id: bdabf7bdd400ac420be82c8362c8dd7770300a01 [formerly bb87e2875751743fc9de40e346825a9ff85d8040] [formerly f667260f7c
[formerly 175f879042
]]
Former-commit-id: f667260f7c
Former-commit-id: 90bbbda6a1
2014-07-01 09:19:15 -04:00
Nate Jensen
257a8cfef7
Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
...
Former-commit-id: 60a11475a6
[formerly 0080d97655
] [formerly 03efa73bd7
] [formerly 03efa73bd7
[formerly 63bc6ed372
]] [formerly fb84c94552
[formerly 03efa73bd7
[formerly 63bc6ed372
] [formerly fb84c94552
[formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]]]]
Former-commit-id: fb84c94552
Former-commit-id: bc6d5daed2bb92e84fe97bd33b8d0b4ad880462b [formerly 4978882e135ef3f25c2e0ca1dfb306b8b77a8b49] [formerly 7314f9c2f1
[formerly 01115d0ad0
]]
Former-commit-id: 7314f9c2f1
Former-commit-id: d4b265fcca
2014-06-30 16:21:09 -05:00
Benjamin Phillippe
8e1511b481
Omaha #3255 Updated Proxy classes to include all java proxy config settings
...
Change-Id: Id59993de7bc0f8402f2842161bf8ba4bc2532c79
Former-commit-id: 0dd46ea20e
[formerly 2075f59d58
] [formerly 15b1fb71dd
] [formerly 15b1fb71dd
[formerly 36ef9e7a1a
]] [formerly 0dd6262862
[formerly 15b1fb71dd
[formerly 36ef9e7a1a
] [formerly 0dd6262862
[formerly 6cd596e6ed8826365d0faeab766601f98ece4fca]]]]
Former-commit-id: 0dd6262862
Former-commit-id: b068f63f3180848fdcf49cbe50f00362c8889ea2 [formerly 10234eec2313785565f827f368277fe480ed8838] [formerly 2a294fcfce
[formerly 3a90b09dbf
]]
Former-commit-id: 2a294fcfce
Former-commit-id: 84c1981492
2014-06-30 16:00:58 -05:00