Steve Harris
|
76b1145249
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 9be38903d8 [formerly 6900bb61c1] [formerly 3598e9b5b6] [formerly 3598e9b5b6 [formerly 90e08b96e1]] [formerly 9be38903d8 [formerly 6900bb61c1] [formerly 3598e9b5b6] [formerly 3598e9b5b6 [formerly 90e08b96e1]] [formerly 3b6a8a1447 [formerly 3598e9b5b6 [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 4e8987e6b6 [formerly e9774e46ea] [formerly 842abaad49] [formerly be19990bc976dbe97bd739c32ff6391d0627fcf3 [formerly 1f609e71c1d55fbd64663d85caf8d8fbf61ab92c] [formerly 842abaad49 [formerly 6330a62e85]]]
Former-commit-id: aac1e47bdaf5643e37e850ed9e4da24bd88eb3f4 [formerly df06a15df0e12cfd77916f5f59e1b95c241b34d2] [formerly 4c4380580f [formerly 30f0d27dfb]]
Former-commit-id: 4c4380580f
Former-commit-id: 10752cbc42
|
2014-09-29 12:58:56 -05:00 |
|
Brian.Dyke
|
84d1a38b11
|
Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: cb6efcafd5 [formerly b89a2459ee] [formerly 9661a1d7b1] [formerly 9661a1d7b1 [formerly 0c1b83b644]] [formerly cb6efcafd5 [formerly b89a2459ee] [formerly 9661a1d7b1] [formerly 9661a1d7b1 [formerly 0c1b83b644]] [formerly 0e0255ce5b [formerly 9661a1d7b1 [formerly 0c1b83b644] [formerly 0e0255ce5b [formerly 6e79993fbf34ebd832ca07356cbac003efaf6405]]]]]
Former-commit-id: 0e0255ce5b
Former-commit-id: e601197582 [formerly 1cc416b17b] [formerly 3b3e81d4a2] [formerly 859641109a6174e888b4275b16a36d130e60165a [formerly e1d7c0bc2a75cdb11de7602ec3d70def4a84dc95] [formerly 3b3e81d4a2 [formerly 77e8985bdd]]]
Former-commit-id: 62717383e1a7b4db97ecd7ac463b2b498746ac04 [formerly b95dc8cf8203e0355bb74fbd1477f87572b22689] [formerly 5a3c7d3510 [formerly 7bcee86aa2]]
Former-commit-id: 5a3c7d3510
Former-commit-id: ade65cb1ab
|
2014-09-29 11:55:16 -04:00 |
|
Ben Steffensmeier
|
475c661560
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: afe4515c8e [formerly a0d9cbede4] [formerly 6090625040] [formerly 6090625040 [formerly f92d021e96]] [formerly afe4515c8e [formerly a0d9cbede4] [formerly 6090625040] [formerly 6090625040 [formerly f92d021e96]] [formerly 5b10ac2f36 [formerly 6090625040 [formerly f92d021e96] [formerly 5b10ac2f36 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]]]]
Former-commit-id: 5b10ac2f36
Former-commit-id: d7197704bf [formerly 7af0ea9a67] [formerly 0724aa4e71] [formerly ecf7295b9ba16d0b84389b9f19bfa11851a737fc [formerly c2fe7f41a12299fdb484361788b79338e9ad2fb8] [formerly 0724aa4e71 [formerly 107ccbf332]]]
Former-commit-id: cc6d404f0fb2f426da0a69967582837bed6e3676 [formerly dc765b86dda41ab7f5eb30a55c9560bd57a0313f] [formerly a69ec7c7af [formerly fc49d0bd55]]
Former-commit-id: a69ec7c7af
Former-commit-id: f91216c747
|
2014-09-29 10:49:14 -05:00 |
|
Brian.Dyke
|
fe5cc31dcc
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: c9d59dd05e [formerly fac7a6aaa1] [formerly fce029653d] [formerly fce029653d [formerly 0a497fc015]] [formerly c9d59dd05e [formerly fac7a6aaa1] [formerly fce029653d] [formerly fce029653d [formerly 0a497fc015]] [formerly 46af1d0857 [formerly fce029653d [formerly 0a497fc015] [formerly 46af1d0857 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]]]]
Former-commit-id: 46af1d0857
Former-commit-id: ec3afdf0ec [formerly ad3338e07f] [formerly 886c1b7e3d] [formerly e42c57aabe9cb24a8caa5a4a189961974fa4f085 [formerly 9fc151f40941f9cab99d6eb050662408c5746324] [formerly 886c1b7e3d [formerly 85676ff532]]]
Former-commit-id: d7ae3d94ec7bf0a013d3f8d6113ac342bca78362 [formerly 0acefdbae8bda17deeb120ade9ca40a2e782cfaa] [formerly 23450210b1 [formerly 4d5f7db303]]
Former-commit-id: 23450210b1
Former-commit-id: ab1f21c096
|
2014-09-29 11:20:57 -04:00 |
|
Sean.Webb
|
85b561da85
|
ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225
Former-commit-id: 3b4a5f51ef [formerly d3df1699db] [formerly 224cddfe9b] [formerly 224cddfe9b [formerly 02e187a609]] [formerly 3b4a5f51ef [formerly d3df1699db] [formerly 224cddfe9b] [formerly 224cddfe9b [formerly 02e187a609]] [formerly 600b75bd9f [formerly 224cddfe9b [formerly 02e187a609] [formerly 600b75bd9f [formerly c2af0284e9146dff8431ecd4f6ce88437ea83d9f]]]]]
Former-commit-id: 600b75bd9f
Former-commit-id: 0bbac8bc69 [formerly 9c5957ef9f] [formerly 1538817a38] [formerly 6fe0b324ae25c5d59f52e090b281d29115ecec87 [formerly f41e6444ab2ff3f5348a13f52e0f8be3af16c39c] [formerly 1538817a38 [formerly 293f860e93]]]
Former-commit-id: ca4d4a1d2ce843db5321671e0a8726930f1bf667 [formerly e39674a87d4139148f14864f620545df8022ec71] [formerly e45ec5cac9 [formerly f80a90d69f]]
Former-commit-id: e45ec5cac9
Former-commit-id: 9d0e79bb1d
|
2014-09-29 10:24:04 -04:00 |
|
Sean.Webb
|
59bf9d67e6
|
ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683
Former-commit-id: 227768d024 [formerly 86382f5396] [formerly 6840d55343] [formerly 6840d55343 [formerly 0738a41cbf]] [formerly 227768d024 [formerly 86382f5396] [formerly 6840d55343] [formerly 6840d55343 [formerly 0738a41cbf]] [formerly 78f83fa594 [formerly 6840d55343 [formerly 0738a41cbf] [formerly 78f83fa594 [formerly 4faea9724adf17d0bec7f013bafc7f8dd2f7499e]]]]]
Former-commit-id: 78f83fa594
Former-commit-id: bb28ce4ca4 [formerly 88580b8666] [formerly d70bc9fd9f] [formerly 684d35a9e5a2ae046581e3bfe4c6bbddeaadfa45 [formerly 7d13704772f862b4d8ca1264bf50de7ba0cbcd2d] [formerly d70bc9fd9f [formerly 197908686e]]]
Former-commit-id: 3ef04acadcdd27cb30564106aa056d2065ec54e9 [formerly 079aaf5290e12bd890cc6e5d9fb1b9599c781840] [formerly b7bae10212 [formerly c69f833921]]
Former-commit-id: b7bae10212
Former-commit-id: 89aa38db4a
|
2014-09-29 08:21:00 -04:00 |
|
mjames-upc
|
f8d3334985
|
build updates
Former-commit-id: a38a3b112e
|
2014-09-26 17:32:27 -06:00 |
|
Sean.Webb
|
7a8f22eb28
|
ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5
Former-commit-id: 6b6abb17ff [formerly b186a8e714] [formerly eb959d100a] [formerly eb959d100a [formerly 628ab54d68]] [formerly 6b6abb17ff [formerly b186a8e714] [formerly eb959d100a] [formerly eb959d100a [formerly 628ab54d68]] [formerly 7d75d994c1 [formerly eb959d100a [formerly 628ab54d68] [formerly 7d75d994c1 [formerly d59054c870fee17076aec22cd683ef1586a153da]]]]]
Former-commit-id: 7d75d994c1
Former-commit-id: ede47e19e1 [formerly b8d4676a9d] [formerly 9b63e571a7] [formerly 24a46e742442f90f0155c175691ff3cca8e9d180 [formerly d1d9f82966b42c43a0e84a2a3cb4b7703be092c9] [formerly 9b63e571a7 [formerly 039619264f]]]
Former-commit-id: c93eed1cb1675c2d1183079aa614ae7fbfd903b0 [formerly fe4b07e604c1f035cc4a768f1adcaba533724766] [formerly dfdd922054 [formerly 16b034a9e1]]
Former-commit-id: dfdd922054
Former-commit-id: 6f25dd644f
|
2014-09-26 10:49:37 -04:00 |
|
Brian.Dyke
|
d9a49a8233
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: 5dd9692bc6 [formerly 6dafb062e9] [formerly b49b13f77e] [formerly b49b13f77e [formerly 4b418918d4]] [formerly 5dd9692bc6 [formerly 6dafb062e9] [formerly b49b13f77e] [formerly b49b13f77e [formerly 4b418918d4]] [formerly 87fa32d2d4 [formerly b49b13f77e [formerly 4b418918d4] [formerly 87fa32d2d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: d51cde50c2 [formerly e16e6e5a2a] [formerly cf8f88a5b3] [formerly c1a0c387d27b7a5f32f94c8b900773ce8574eea7 [formerly cd9613c4078591bf28ad1064690bfbbbf551cbaa] [formerly cf8f88a5b3 [formerly 1f09dad9e9]]]
Former-commit-id: 8d96098dc5e4b7cfe1cbe548a8b579d5549ad7ca [formerly c0bfed574e2fa14299c865bac77af847704ef3c7] [formerly c22973f909 [formerly 8997f79ae4]]
Former-commit-id: 65b3082fdabf0c7cbc3a1484fb44861e90f8e6d3 [formerly c22973f909]
Former-commit-id: b8b9d3105b
|
2014-09-24 11:05:37 -04:00 |
|
Sean.Webb
|
85dff04fd1
|
ASM #16761 - Fixed typo on variable character
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37
Former-commit-id: 02013e8b08 [formerly 8c41cb256d] [formerly be3bb99abe] [formerly be3bb99abe [formerly 00479a436d]] [formerly 02013e8b08 [formerly 8c41cb256d] [formerly be3bb99abe] [formerly be3bb99abe [formerly 00479a436d]] [formerly a9dddb44ce [formerly be3bb99abe [formerly 00479a436d] [formerly a9dddb44ce [formerly 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36]]]]]
Former-commit-id: a9dddb44ce
Former-commit-id: 0766e26953 [formerly dd5d61e33d] [formerly 8c2044b91e] [formerly a583ab4691af8d9867bf81372194b8d43c34743f [formerly 1283a5fbd8fbcf7377715f639509217bd8db178f] [formerly 8c2044b91e [formerly df7e6a9ad2]]]
Former-commit-id: 7f02c6011dc18b8c9c3b3a029ec43d3e8fea17cc [formerly 511a2d6a81fe2234c359be57d267eadde6fbc04b] [formerly 2f0e866285 [formerly 9f22c26d38]]
Former-commit-id: 2f0e866285
Former-commit-id: 8fafbd5864
|
2014-09-22 14:10:28 -04:00 |
|
Sean.Webb
|
995f3b7dd5
|
ASM #16761 - Fixed typo on variable character
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2
Former-commit-id: 78bbbc907a [formerly c32fde89f9] [formerly 07589bbdda] [formerly 07589bbdda [formerly 47aef24f6f]] [formerly 78bbbc907a [formerly c32fde89f9] [formerly 07589bbdda] [formerly 07589bbdda [formerly 47aef24f6f]] [formerly 4c936b9bc8 [formerly 07589bbdda [formerly 47aef24f6f] [formerly 4c936b9bc8 [formerly 721bead655f9a384ea12444617774b7ef404feb0]]]]]
Former-commit-id: 4c936b9bc8
Former-commit-id: 69a4834ef6 [formerly d2b3641bc8] [formerly 79431d7f1d] [formerly ed5dd0d87a1ed5fbd97bc7f687c327222860d1ea [formerly 83b31eab4d2587b3082902561edec8cec766b707] [formerly 79431d7f1d [formerly 56b09560ff]]]
Former-commit-id: e934a8fca8b0b70b37bdebaa71702a498e9d996a [formerly 5bf69c0782b13d23d3c5261a5a8aea4cf2b7f58a] [formerly dcbb4f82f9 [formerly 7da8b68a22]]
Former-commit-id: dcbb4f82f9
Former-commit-id: 4590cd4f4b
|
2014-09-22 07:18:21 -04:00 |
|
mjames-upc
|
6eccee8c6f
|
datadelivery plugin putback for 14.2.1-16n13
Former-commit-id: 79c1e489f9
|
2014-09-19 14:51:51 -06:00 |
|
mjames-upc
|
05c257b910
|
fix for /awips2/cave root perms added to Installer.cave-feature/component.spec
Former-commit-id: 12b9bbe24d
|
2014-09-19 14:29:02 -06:00 |
|
Sean.Webb
|
2149188799
|
ASM #16761 - Fixed typo on variable character
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275
Former-commit-id: 28ac013c0e [formerly e3ad9053d7] [formerly 502f7520a7] [formerly 502f7520a7 [formerly 4368f4650b]] [formerly 28ac013c0e [formerly e3ad9053d7] [formerly 502f7520a7] [formerly 502f7520a7 [formerly 4368f4650b]] [formerly e0abd14986 [formerly 502f7520a7 [formerly 4368f4650b] [formerly e0abd14986 [formerly 5c541f50dcc68a856e8c81bff8577334abf1ff75]]]]]
Former-commit-id: e0abd14986
Former-commit-id: 8eaf31bffe [formerly 6734ed0a24] [formerly ddcc0fa20a] [formerly 308c9fb4928d698d823101ffae9acb19d91d4285 [formerly 3c6f69f29e4f9f9da55dc92943f38d19a2561e69] [formerly ddcc0fa20a [formerly 23ec020b8d]]]
Former-commit-id: 2229f74035ae1c8d177a798c2251f8f70df4c5d7 [formerly 433e63ebca5e54341033773da1f756c4a02e0d17] [formerly d49f49f805 [formerly eb5a76cfe8]]
Former-commit-id: d49f49f805
Former-commit-id: 050af275c7
|
2014-09-19 13:43:45 -04:00 |
|
Steve Harris
|
5169f11c70
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: cf2e045de3 [formerly e3a7796362] [formerly da530db540] [formerly da530db540 [formerly 091555cf10]] [formerly cf2e045de3 [formerly e3a7796362] [formerly da530db540] [formerly da530db540 [formerly 091555cf10]] [formerly 4c56844e29 [formerly da530db540 [formerly 091555cf10] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]]]
Former-commit-id: 4c56844e29
Former-commit-id: e3127a1d3c [formerly a1bf8ecdb1] [formerly 84a98ec4ca] [formerly 6a5333aeb239eb379e054282c3776a23e3f91fe7 [formerly 275a024694cc566f868a949d844ab91490e424f6] [formerly 84a98ec4ca [formerly 214b48dcb8]]]
Former-commit-id: 14860c498982e4d1f8e090ef58738fc8574c11ef [formerly 9adb015794435a13e656ce09cd891bfd9e4d53db] [formerly f4ea796cea [formerly fdc523a026]]
Former-commit-id: f4ea796cea
Former-commit-id: b316e73f24
|
2014-09-19 10:28:57 -05:00 |
|
Sean.Webb
|
fd1cf3273d
|
ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b
Former-commit-id: 5ffad7ceb7 [formerly c061f7b1a0] [formerly c90c45f303] [formerly c90c45f303 [formerly b0b01694f7]] [formerly 5ffad7ceb7 [formerly c061f7b1a0] [formerly c90c45f303] [formerly c90c45f303 [formerly b0b01694f7]] [formerly 6ffb17540e [formerly c90c45f303 [formerly b0b01694f7] [formerly 6ffb17540e [formerly 031c41d4f7801c8a5127cf007358856bf771593a]]]]]
Former-commit-id: 6ffb17540e
Former-commit-id: 52d21c5030 [formerly 28d64b103e] [formerly f2e207e86e] [formerly 9a7077b856e7a71bfbfa5739eb95f4c1de191a99 [formerly cd684d9da149567c3e25ae1ec02c6dba3ad9ab95] [formerly f2e207e86e [formerly f808f0840d]]]
Former-commit-id: 723f586c2e549338717c79710b5a1aedc46c5779 [formerly 4e828548865f894bac34d45562f6859074140db6] [formerly 1b848836ce [formerly a023244a62]]
Former-commit-id: 1b848836ce
Former-commit-id: 1c74767e93
|
2014-09-19 09:29:31 -04:00 |
|
Sean.Webb
|
c8bcf28708
|
ASM #16761 - Added retrans code updates from ISG
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c
Former-commit-id: 9ca623e2a8 [formerly 90fbb6bf28] [formerly 7f898635f9] [formerly 7f898635f9 [formerly 5c84cadaf6]] [formerly 9ca623e2a8 [formerly 90fbb6bf28] [formerly 7f898635f9] [formerly 7f898635f9 [formerly 5c84cadaf6]] [formerly 51380a2363 [formerly 7f898635f9 [formerly 5c84cadaf6] [formerly 51380a2363 [formerly 165b9a9b3481b3fa1d31b771eead03180430be59]]]]]
Former-commit-id: 51380a2363
Former-commit-id: d24956a479 [formerly 620380c79d] [formerly a651c7ea69] [formerly b0c32e1eecce8bfcd96836d365c0b1ad88820dda [formerly 4e6bbc221847b4a3a5b6046d9f84f9c01130927a] [formerly a651c7ea69 [formerly 10f14f8032]]]
Former-commit-id: 7ef452a097ce515aab71888f41c40940207d5df1 [formerly 252796d7bbfccbfce225e3fbb59de5cc643dd6b8] [formerly 4fdd58193c [formerly ded5ad2e48]]
Former-commit-id: 4fdd58193c
Former-commit-id: 788834162c
|
2014-09-19 07:25:18 -04:00 |
|
Sean.Webb
|
53a9a70279
|
ASM #16761 - Updated ldm spec to add retrans
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229
Former-commit-id: 2a3f5a091c [formerly 57553e3c5a] [formerly b959842361] [formerly b959842361 [formerly 35bfd8269c]] [formerly 2a3f5a091c [formerly 57553e3c5a] [formerly b959842361] [formerly b959842361 [formerly 35bfd8269c]] [formerly 4c36280560 [formerly b959842361 [formerly 35bfd8269c] [formerly 4c36280560 [formerly bb9d431a842511b0081660224f3ddefd947f76fd]]]]]
Former-commit-id: 4c36280560
Former-commit-id: 297a07690d [formerly 622231e99f] [formerly b625f2067a] [formerly c7e38069a40ac52f6a6c41856d12bfb13a3b6562 [formerly bfb3fdfda5d267aca3d541fa86f2aee946e40185] [formerly b625f2067a [formerly 827386e60d]]]
Former-commit-id: 90f9ba077271967efbc6e006e274aa87c147b5a3 [formerly c06ddd91eb8b18b1557f00bc050d561a2e5db5c8] [formerly 7268c9b042 [formerly 9058ab3282]]
Former-commit-id: 7268c9b042
Former-commit-id: 75bc66ecfb
|
2014-09-18 09:33:47 -04:00 |
|
mjames-upc
|
336cc2bcd5
|
edex manager updated to check setup.env for localhost *every* time
Former-commit-id: 02c12d47bd
|
2014-09-17 15:38:31 -06:00 |
|
Stephen Gilbert
|
09e879f864
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 33438e7a83 [formerly aa11ac6e09] [formerly e7d21b0293] [formerly e7d21b0293 [formerly 5bf2ed644a]] [formerly 33438e7a83 [formerly aa11ac6e09] [formerly e7d21b0293] [formerly e7d21b0293 [formerly 5bf2ed644a]] [formerly 440bddda4b [formerly e7d21b0293 [formerly 5bf2ed644a] [formerly 440bddda4b [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]]]]]
Former-commit-id: 440bddda4b
Former-commit-id: b05e3afd4d [formerly d9a222f1ef] [formerly 1ceed41334] [formerly 092be65c7176b0f8617e9ae2131d4fc7938e726b [formerly 0680c0d2a7310de845600fb7564e790bfd925534] [formerly 1ceed41334 [formerly eee81971cc]]]
Former-commit-id: d942176b3411c1b04a5d496ccaa30d697aa35238 [formerly 468aa5036ea727433d05f2dfe4b23fee88875480] [formerly 99796454d2 [formerly 3106a4006c]]
Former-commit-id: c8c70a9e0eed157c60c472888896ac41174ea1e5 [formerly 99796454d2]
Former-commit-id: 9d6570b9f5
|
2014-09-15 13:20:34 -04:00 |
|
Sean.Webb
|
604d869578
|
ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib005b9e9af0979d4aa1463e5555fd7b42c7fcc89
Former-commit-id: fea7275452 [formerly 4b10cf2f9f] [formerly 268db31231] [formerly 268db31231 [formerly c805e132bd]] [formerly fea7275452 [formerly 4b10cf2f9f] [formerly 268db31231] [formerly 268db31231 [formerly c805e132bd]] [formerly 5918cb05c1 [formerly 268db31231 [formerly c805e132bd] [formerly 5918cb05c1 [formerly f07bb36b5f5e01000345a37719e43cb2df4ea7d8]]]]]
Former-commit-id: 5918cb05c1
Former-commit-id: a6b584781b [formerly 519ea8fcc7] [formerly 55190a347f] [formerly 0bb2bd74f47b36a514f053a40561a8d5d40cd614 [formerly a053c76757b4171b24e63c33b3571659f5309b58] [formerly 55190a347f [formerly 213208cbf2]]]
Former-commit-id: c07e030ec3c0fe964da4e8229650ea74374b99b2 [formerly 599092cbdfc728368ca6d2520284aa5bd41b7a3a] [formerly ff50aaf81d [formerly b36a1fdde0]]
Former-commit-id: ff50aaf81d
Former-commit-id: dc158de44d
|
2014-09-11 15:13:58 -04:00 |
|
Sean.Webb
|
16f3e6eab1
|
ASM #16720 - Updated to ldm 6.12.6
Change-Id: I39f4a529c18995e2b400afbaf0b36fbe7d30d001
Former-commit-id: 64729ece9f [formerly a59dce026a] [formerly dec97cd06f] [formerly dec97cd06f [formerly 928c334c03]] [formerly 64729ece9f [formerly a59dce026a] [formerly dec97cd06f] [formerly dec97cd06f [formerly 928c334c03]] [formerly a6c15ca070 [formerly dec97cd06f [formerly 928c334c03] [formerly a6c15ca070 [formerly fb95ea372530d699c4681cf8ec9e3abce23716c1]]]]]
Former-commit-id: a6c15ca070
Former-commit-id: 3e4e00e6d7 [formerly 760661ee73] [formerly d1614ae327] [formerly ae9e62c3abde3d8b524c8078f3963b6733f3e5d2 [formerly cf7da60d3066e6b91203dcc0dc39c56cff325666] [formerly d1614ae327 [formerly 6fa9e92a8c]]]
Former-commit-id: c6b8a2a757bdf33047621000a7d749759c8e3d38 [formerly 8a7c2071b5f15c57de7f1dc6c604ebc213b7c50d] [formerly 0d1375ba3d [formerly 6299e7382e]]
Former-commit-id: 0d1375ba3d
Former-commit-id: 95cc346e3f
|
2014-09-11 14:18:50 -04:00 |
|
Sean.Webb
|
982ce1f492
|
ASM #16720 - Updated to ldm 6.12.6
Change-Id: Icf050791541832b370f7d8ceb7a423b500a62d51
Former-commit-id: 484285eda1 [formerly c2e613e9f1] [formerly eb5418a3bb] [formerly eb5418a3bb [formerly dfc004e1f0]] [formerly 484285eda1 [formerly c2e613e9f1] [formerly eb5418a3bb] [formerly eb5418a3bb [formerly dfc004e1f0]] [formerly 0e72b63663 [formerly eb5418a3bb [formerly dfc004e1f0] [formerly 0e72b63663 [formerly 8b1b91c79fa7e59610e21f11af3babaf120859e4]]]]]
Former-commit-id: 0e72b63663
Former-commit-id: 3d62439e2c [formerly 7a31d0ea28] [formerly e186b2723d] [formerly b93006a842da4a816667311f72759524d230c7de [formerly 1e51b8d6e3ce391ff3127b0380a070f8ea54d789] [formerly e186b2723d [formerly 991ea6c13b]]]
Former-commit-id: 9885b6b775baa7f41374dfb25159e7b0a53b0174 [formerly 9d48fc8d039297aa30f20737d9adebe622f7224f] [formerly 5fe337b6bf [formerly f98fbd8e99]]
Former-commit-id: 5fe337b6bf
Former-commit-id: 72ca384247
|
2014-09-11 13:39:17 -04:00 |
|
Stephen Gilbert
|
47a61cbfc6
|
Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
cave/build/cave/customTargets.xml
edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties
Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6
Former-commit-id: ae3f1837aa [formerly d98c1adc91] [formerly 2406f0786f] [formerly 2406f0786f [formerly 561b751e58]] [formerly ae3f1837aa [formerly d98c1adc91] [formerly 2406f0786f] [formerly 2406f0786f [formerly 561b751e58]] [formerly 662436c2d5 [formerly 2406f0786f [formerly 561b751e58] [formerly 662436c2d5 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]]]]
Former-commit-id: 662436c2d5
Former-commit-id: 8c85885d1d [formerly c3e1eebd6d] [formerly 3251e256c6] [formerly caac6c3b1ec893ac5341b19e79e6804cb54161eb [formerly 4940723817b19e437897ef6ec6d862340b0a86f7] [formerly 3251e256c6 [formerly a631e61fe5]]]
Former-commit-id: 2d65208283d256e47747b30ed8e6dee9ef749052 [formerly 3248a201641e504c0b9e17abd8322cce5f5a0486] [formerly 2679b9ef8d [formerly bbabe5d087]]
Former-commit-id: 2679b9ef8d
Former-commit-id: 630efbf2f9
|
2014-09-11 11:14:33 -04:00 |
|
mjames-upc
|
badf695f7d
|
UPC build updates
Former-commit-id: 3c934c7e2d
|
2014-09-10 15:10:37 -06:00 |
|
mjames-upc
|
86c0cd38e4
|
awips2-edex-upc 14.2.1-16n2 update add EDEX services to startup with chkconfig
Former-commit-id: 215ffb0840
|
2014-09-10 15:09:10 -06:00 |
|
mjames-upc
|
25eb7e0b69
|
LDM updates: data_store file/path names changed to avoid unintended subdirs in grib2 tree.
Former-commit-id: 8d2853c57c
|
2014-09-10 15:07:18 -06:00 |
|
mjames-upc
|
3b8057dd93
|
default EDEX localization changed to BOU
Former-commit-id: ee08b6fdcd
|
2014-09-10 14:53:47 -06:00 |
|
Sean.Webb
|
6519b47c51
|
ASM #16720 - Updated to ldm 6.12.6
Change-Id: Ib4c4689eb32f298b8be8782d878c243689608f6a
Former-commit-id: 5161b60e59 [formerly 4850be3f96] [formerly bc6f7cfa3f] [formerly bc6f7cfa3f [formerly db156a51de]] [formerly 5161b60e59 [formerly 4850be3f96] [formerly bc6f7cfa3f] [formerly bc6f7cfa3f [formerly db156a51de]] [formerly 71d128a180 [formerly bc6f7cfa3f [formerly db156a51de] [formerly 71d128a180 [formerly ded6663441d8b916ad5b45f2668feac431e84bce]]]]]
Former-commit-id: 71d128a180
Former-commit-id: 58d51297d7 [formerly 314694f6fb] [formerly ce7bae10ea] [formerly ee1c2563efdb82143559333a357375fcc98dd3eb [formerly b7acedd41364c684cc15e350507c87281fc5b316] [formerly ce7bae10ea [formerly 2683f36e09]]]
Former-commit-id: 1f6f6b01ac886b863fa05fffc397bcce0b824834 [formerly aad85b79c2b5ba889033b2d1b2d83fd6cf630f19] [formerly b5b7f5622b [formerly d03c5a03fc]]
Former-commit-id: b5b7f5622b
Former-commit-id: 854c00cab3
|
2014-09-10 14:48:19 -04:00 |
|
Brian.Dyke
|
5f21fc890c
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: ca5b785430 [formerly a344be95c8] [formerly 5415a4939a] [formerly 5415a4939a [formerly 858b91d677]] [formerly ca5b785430 [formerly a344be95c8] [formerly 5415a4939a] [formerly 5415a4939a [formerly 858b91d677]] [formerly af477df90e [formerly 5415a4939a [formerly 858b91d677] [formerly af477df90e [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]]]]
Former-commit-id: af477df90e
Former-commit-id: cee7b18bb7 [formerly 4582533601] [formerly dde3efc567] [formerly 905104ae885e3b6871106bcd685d27d95e9545bf [formerly f892d9608dc1fb65163dac3714b16398a7d89022] [formerly dde3efc567 [formerly 6c4b121752]]]
Former-commit-id: b9d5c3f60edb9de6fdee9b40c209e4881341caeb [formerly 2c8a415a8d01954bd8f0e11fa551974a70c7759e] [formerly b42aba7839 [formerly 66c4758f2d]]
Former-commit-id: b42aba7839
Former-commit-id: 0c715b7439
|
2014-09-08 14:54:16 -04:00 |
|
Steve Harris
|
aeef8875da
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly 5d58625abc [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]]
Former-commit-id: 5d58625abc
Former-commit-id: bdf54d6c9b [formerly 10070d2762] [formerly 66b485c000] [formerly ae5df07fa69c767a230e2a3c9b71b0100d0048c1 [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54] [formerly 66b485c000 [formerly d984dd538f]]]
Former-commit-id: 529333408e5e144c649cd66c50031cc56795aa1e [formerly ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4] [formerly ecf26b3ac5 [formerly e681e0a457]]
Former-commit-id: e61b05086c2c01b59d4b8382331f85c7ecd4efa2 [formerly ecf26b3ac5]
Former-commit-id: 3c8bfc8160
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
d238fe909f
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly aa83bf804f [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]]
Former-commit-id: aa83bf804f
Former-commit-id: a19455a35a [formerly 4a56b6f6e1] [formerly f90649d7e7] [formerly 68463cb724c8468f8978b5fb07a99445cf027313 [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3] [formerly f90649d7e7 [formerly f7f16ff9eb]]]
Former-commit-id: 44ca35c910c7065b51dd3a76485e002ac8fcb63b [formerly 2b5f667a78842762d60c8ab0ba442f22b9229095] [formerly 7e4ab705cc [formerly c0dc594eda]]
Former-commit-id: 1cde9cd7bdfb3330564a42c1fce83730b50bbe4c [formerly 7e4ab705cc]
Former-commit-id: 2da6c7b93b
|
2014-08-27 11:19:19 -04:00 |
|
mjames-upc
|
e4c7b94b36
|
bash profile.d file added for LDM
Former-commit-id: c257b1cac7
|
2014-08-25 17:41:27 -06:00 |
|
Brian.Dyke
|
6a99c2269e
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: e6e748f80c [formerly 6402cb7d89] [formerly 2ddc920a4a] [formerly 2ddc920a4a [formerly 325887e605]] [formerly e6e748f80c [formerly 6402cb7d89] [formerly 2ddc920a4a] [formerly 2ddc920a4a [formerly 325887e605]] [formerly dd9d7133d9 [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: b1125b7ead [formerly e348a6abc7] [formerly c8e9153884] [formerly aeb4c05a55d78fcd7c75024d8266f07f6153e495 [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b] [formerly c8e9153884 [formerly 1839b614df]]]
Former-commit-id: 4ebaf1487954a27857fde0b53c4ede7217a27c50 [formerly 85ccff40908964b07fef1c572de049c609434728] [formerly 27372f098c [formerly cd1b914f50]]
Former-commit-id: 27372f098c
Former-commit-id: 272905b186
|
2014-08-22 14:16:22 -04:00 |
|
mjames-upc
|
cbf16995f5
|
1) edex manager update. 2) cave launch script re-config. 3) AK-NAM removed from NCP
Former-commit-id: 2ee65a097c
|
2014-08-22 10:53:10 -06:00 |
|
Richard Peter
|
73d7919695
|
Merge "Omaha #3528 - removed unused versions of ldm from the baseline" into omaha_14.4.1
Former-commit-id: eaecb20823 [formerly b9a08291ec] [formerly 5a35e873ac] [formerly 5a35e873ac [formerly 7331754776]] [formerly eaecb20823 [formerly b9a08291ec] [formerly 5a35e873ac] [formerly 5a35e873ac [formerly 7331754776]] [formerly fffa5f5294 [formerly 5a35e873ac [formerly 7331754776] [formerly fffa5f5294 [formerly 61a982c8624ab6e433692255109119ab9f74655c]]]]]
Former-commit-id: fffa5f5294
Former-commit-id: 554ed8931b [formerly 238d1aa554] [formerly 9bb17c886d] [formerly 107b039a8b1aca8059786b65aee6a34f61885185 [formerly 78778cd279204109f20aa6114d0cee533bb01487] [formerly 9bb17c886d [formerly ea3ae775c4]]]
Former-commit-id: 9ca57d4bae17ac2fdb2bff907cc9df5c1a0389b7 [formerly 047dfe5227ab6a00529519249b0efdbf1cea0ff5] [formerly e731db9f47 [formerly ff2891df3b]]
Former-commit-id: e731db9f47
Former-commit-id: c381203200
|
2014-08-21 18:10:00 -05:00 |
|
Bryan Kowal
|
0adc5747a2
|
Omaha #3528 - removed unused versions of ldm from the baseline
Former-commit-id: c5f2d96c37 [formerly 23017f003c] [formerly 8cca8ef455] [formerly 8cca8ef455 [formerly 77fa6fcacb]] [formerly c5f2d96c37 [formerly 23017f003c] [formerly 8cca8ef455] [formerly 8cca8ef455 [formerly 77fa6fcacb]] [formerly 15457162e7 [formerly 8cca8ef455 [formerly 77fa6fcacb] [formerly 15457162e7 [formerly 6a627c05dfc4960c6ec71c95df308b145ff192c7]]]]]
Former-commit-id: 15457162e7
Former-commit-id: b1c9107769 [formerly 4f558834f0] [formerly 0ab65e92bd] [formerly 25b844d77b924608b6080139f864d93736470907 [formerly 6a5d64858a2ec95608119611ffe96a489232694c] [formerly 0ab65e92bd [formerly 2a6af78773]]]
Former-commit-id: 7820bd76287a62fc58d29f321fe612e0718ee94a [formerly 4ddb3ad4b56e02ffe96a4a4e7b299a47331a7954] [formerly 5463bca0f3 [formerly b7fc6f5c86]]
Former-commit-id: 67dfe6ae78df02f10c568fc5978156380419945f [formerly 5463bca0f3]
Former-commit-id: 77e0a19bc2
|
2014-08-21 10:21:15 -05:00 |
|
Bryan Kowal
|
36435c1599
|
Omaha #3544 - unpack the Linux 64-bit SWT jar file post-install.
Former-commit-id: 64900bb75d [formerly 324eb07a85] [formerly 6d3611101e] [formerly 6d3611101e [formerly c93a830f59]] [formerly 64900bb75d [formerly 324eb07a85] [formerly 6d3611101e] [formerly 6d3611101e [formerly c93a830f59]] [formerly 734e4bcc7b [formerly 6d3611101e [formerly c93a830f59] [formerly 734e4bcc7b [formerly 75df4503184b6e41eb8075f64552aec30e112d12]]]]]
Former-commit-id: 734e4bcc7b
Former-commit-id: bf20a7fa3b [formerly c6f29b573a] [formerly 1ee075dfd0] [formerly 39415d1cf2f63d7f1fb0e660c6bd1fa9578b72ae [formerly ee82061bc968ebbcdf921f4aa4ea0fb22b316950] [formerly 1ee075dfd0 [formerly 341c09fb76]]]
Former-commit-id: d7b520a9a00efca706309a651dd48b269948e2a0 [formerly 34d44ef0c81f0a64ebcc07193ba6388ed74edbd7] [formerly bcbfb778d3 [formerly 6b25d78b84]]
Former-commit-id: bcbfb778d3
Former-commit-id: 8db05b7633
|
2014-08-21 09:45:16 -05:00 |
|
Steve Harris
|
bd324b140c
|
Issue #2875 - re-compile grib2.so with g2clib changes
This reverts commit b7e05d94f9a8d00d081605a63fbe96f098aa35cd [formerly fab7989b69] [formerly d299cfb3c7 [formerly 42418f76de] [formerly 68d2d83309] [formerly 68d2d83309 [formerly 2c7e22f825]] [formerly d299cfb3c7 [formerly 42418f76de] [formerly 68d2d83309] [formerly 68d2d83309 [formerly 2c7e22f825]] [formerly fab7989b69 [formerly 68d2d83309 [formerly 2c7e22f825] [formerly fab7989b69 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]]]]]].
Former-commit-id: 6ffd03c308 [formerly cd7b8ccb74] [formerly 7fa6315202] [formerly 7fa6315202 [formerly 5f6a29c515]] [formerly 6ffd03c308 [formerly cd7b8ccb74] [formerly 7fa6315202] [formerly 7fa6315202 [formerly 5f6a29c515]] [formerly cddc961f2c [formerly 7fa6315202 [formerly 5f6a29c515] [formerly cddc961f2c [formerly 2b1665a1d9a1314bb6b0012161a6409ca2e6ebf8]]]]]
Former-commit-id: cddc961f2c
Former-commit-id: cf5496ace1 [formerly d06ac748a8] [formerly eeb928761d] [formerly b17b51718d98589fce571713e1ac8501b03348ef [formerly a482ba4bffd956c79173823968070a3f3199b4bb] [formerly eeb928761d [formerly 2ce04bce32]]]
Former-commit-id: 6bb028fcad45183ceb14b3f4beda8e20168f1db5 [formerly 464103bd5da4a2cff39bca8dce7028cda3d70a26] [formerly e55cb7c48e [formerly 41f4647d48]]
Former-commit-id: 802fa62b3844ba97a9a9832d4599da5e56af8528 [formerly e55cb7c48e]
Former-commit-id: c428a1c7d7
|
2014-08-19 08:18:11 -05:00 |
|
mjames-upc
|
4ac6087ad8
|
defaultTopo.h5 added to Installer.topo spec file, copied from srtm30.h5.
Former-commit-id: 4e19daaf89
|
2014-08-18 12:52:15 -06:00 |
|
Ana Rivera
|
9cbb3aebe0
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: c8feca05c5 [formerly 2f13aed851] [formerly 11073fdece] [formerly 11073fdece [formerly 9ada9356c5]] [formerly c8feca05c5 [formerly 2f13aed851] [formerly 11073fdece] [formerly 11073fdece [formerly 9ada9356c5]] [formerly 4c585af933 [formerly 11073fdece [formerly 9ada9356c5] [formerly 4c585af933 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]]]]]
Former-commit-id: 4c585af933
Former-commit-id: 5d50637fb1 [formerly 1c9c634cbd] [formerly 706336e633] [formerly ac5aab7430ebbb5afc06834a627670c505fe230d [formerly 0a133cea945d17da6363d9f19082865a41af0dc3] [formerly 706336e633 [formerly b5e6172652]]]
Former-commit-id: 2235627ce0c998013d079fc8ec7be679a5be7e7a [formerly 8c09880e14992eb3d51f00d57659cc59ea79b21d] [formerly 15b766c9f5 [formerly 80a0799f46]]
Former-commit-id: ed4390bf6591957a1ae66956019fe23ded820980 [formerly 15b766c9f5]
Former-commit-id: eff21cac5d
|
2014-08-15 11:04:23 -05:00 |
|
Ana Rivera
|
ad3bf12044
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: ae2aba0187 [formerly 0a812a313d] [formerly 1daa44291e] [formerly 1daa44291e [formerly a44d5d91db]] [formerly ae2aba0187 [formerly 0a812a313d] [formerly 1daa44291e] [formerly 1daa44291e [formerly a44d5d91db]] [formerly 9bf2df23be [formerly 1daa44291e [formerly a44d5d91db] [formerly 9bf2df23be [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]]]]
Former-commit-id: 9bf2df23be
Former-commit-id: b01b55edc2 [formerly 6c6efd68c0] [formerly c294608c37] [formerly c8d3f62ecc65daf433269bbdb9ad8a3e36bbfa6e [formerly 0dfe16e83678d27d979861133a85a641c588b678] [formerly c294608c37 [formerly eefe73ee51]]]
Former-commit-id: 78463d00b30bd8ead1c7ca3fb9b22e43adfe4355 [formerly 35a0a95e45117d91938da4179d30084369566fbe] [formerly 0ff1ac5357 [formerly 4b42e52ce3]]
Former-commit-id: 0ff1ac5357
Former-commit-id: 27b8eeca07
|
2014-08-15 11:02:36 -05:00 |
|
Bryan Kowal
|
30fb3c776d
|
Omaha #3475 - PostgreSQL Upgrade.
amend: vacuum databases after upgrade due to: http://www.postgresql.org/docs/9.3/static/release-9-3-2.html E.4.2 VACUUM tests
amend: update viz xdat to use the newer PostgreSQL jdbc driver
amend: fix formatting
Change-Id: Icda3348eea3e5edd879acb3a897bc530e73fb7f3
Former-commit-id: a2a8e48e2a [formerly b805f1db0d] [formerly 3d68ae0c78] [formerly 3d68ae0c78 [formerly f6bc96829e]] [formerly a2a8e48e2a [formerly b805f1db0d] [formerly 3d68ae0c78] [formerly 3d68ae0c78 [formerly f6bc96829e]] [formerly a2be914331 [formerly 3d68ae0c78 [formerly f6bc96829e] [formerly a2be914331 [formerly 426a8c8863ea6be7d6795ace387c214ce3b36790]]]]]
Former-commit-id: a2be914331
Former-commit-id: 52175d95ec [formerly 69a0dce7cb] [formerly c15190b7f6] [formerly 47f5ffd8ae77ca913b8e65d2343cfb30eb489918 [formerly 7264efe3b00ab6cbe7db1240eea4304e54781900] [formerly c15190b7f6 [formerly 0894026a79]]]
Former-commit-id: 3c40cd00edf97420f2cbccf2f610106ff3b89963 [formerly c201d541cc56ace0f640825213c54136d197f0bf] [formerly a60ab0de0c [formerly 0b5fc6aa0e]]
Former-commit-id: a60ab0de0c
Former-commit-id: f295c59dc4
|
2014-08-12 15:10:39 -05:00 |
|
Brian.Dyke
|
4f50ee732b
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 1cdca4b829 [formerly d023813321] [formerly 63f000f11d] [formerly 63f000f11d [formerly 59183249ed]] [formerly 1cdca4b829 [formerly d023813321] [formerly 63f000f11d] [formerly 63f000f11d [formerly 59183249ed]] [formerly aefe154e51 [formerly 63f000f11d [formerly 59183249ed] [formerly aefe154e51 [formerly 84fc55492f7eccf55d3bf8e7e3227c882286a8fb]]]]]
Former-commit-id: aefe154e51
Former-commit-id: cb09b80b11 [formerly 607e1f0c74] [formerly ba4ddf9ceb] [formerly 1c98459fae65a47d0340debb204c93cc01e71b2f [formerly 0894e361fba436b907c0d3bec483ef87116171dc] [formerly ba4ddf9ceb [formerly 6043825b4c]]]
Former-commit-id: 44ff7cc08a6cde15df0c399f748001312a4536d4 [formerly acf0c24a4fd521cd951401f0ac971ae23801048f] [formerly 10510022f3 [formerly 7164c95a12]]
Former-commit-id: 10510022f3
Former-commit-id: a75337e3e2
|
2014-08-12 13:24:35 -04:00 |
|
Steve Harris
|
0f7c3ab168
|
Issue #3507 - Revert "Issue #2875 - re-compile grib2.so with g2clib changes"
This reverts commit 28eacb64209fc40ec9623cf7868be0c8cd4f90eb [formerly e2a0ffe245] [formerly 1f3bc85403 [formerly 7ce040c760] [formerly 5b0b491d11] [formerly 5b0b491d11 [formerly 428bdf03c8]] [formerly 1f3bc85403 [formerly 7ce040c760] [formerly 5b0b491d11] [formerly 5b0b491d11 [formerly 428bdf03c8]] [formerly e2a0ffe245 [formerly 5b0b491d11 [formerly 428bdf03c8] [formerly e2a0ffe245 [formerly 9cab8c4cd5efc7ff30a0c75f3e3cd4459211c157]]]]]].
Former-commit-id: d299cfb3c7 [formerly 42418f76de] [formerly 68d2d83309] [formerly 68d2d83309 [formerly 2c7e22f825]] [formerly d299cfb3c7 [formerly 42418f76de] [formerly 68d2d83309] [formerly 68d2d83309 [formerly 2c7e22f825]] [formerly fab7989b69 [formerly 68d2d83309 [formerly 2c7e22f825] [formerly fab7989b69 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]]]]]
Former-commit-id: fab7989b69
Former-commit-id: 64e7d10503 [formerly c1203390da] [formerly ce4a52aa14] [formerly 8e86979a333425c1cb14bd6845c79af2fafc5300 [formerly cb4d910e84f610982ea6323078aa8305a1d01b59] [formerly ce4a52aa14 [formerly e21a119b8f]]]
Former-commit-id: f2d58bad12774aef079fe690dbb6a76f0650c064 [formerly 8256f96b82f8756e8851cc007fe6c50749ef8ebb] [formerly 56a6d18d9a [formerly 346f23a2cf]]
Former-commit-id: 56a6d18d9a
Former-commit-id: 0dad0cd381
|
2014-08-12 10:14:57 -05:00 |
|
Bryan Kowal
|
cd705bb860
|
Issue #2875 - re-compile grib2.so with g2clib changes
Former-commit-id: 1f3bc85403 [formerly 7ce040c760] [formerly 5b0b491d11] [formerly 5b0b491d11 [formerly 428bdf03c8]] [formerly 1f3bc85403 [formerly 7ce040c760] [formerly 5b0b491d11] [formerly 5b0b491d11 [formerly 428bdf03c8]] [formerly e2a0ffe245 [formerly 5b0b491d11 [formerly 428bdf03c8] [formerly e2a0ffe245 [formerly 9cab8c4cd5efc7ff30a0c75f3e3cd4459211c157]]]]]
Former-commit-id: e2a0ffe245
Former-commit-id: 219c2fb771 [formerly 477114dc5d] [formerly 3be068262b] [formerly 35b395510d695643ec9ec80d37178e190f99fbd9 [formerly e8923a9a2b8b0731aa4dfa72163036de71804729] [formerly 3be068262b [formerly 4eaf5c9b0e]]]
Former-commit-id: 9b1c98a9baf62356792bbd581a6c7cae36fee188 [formerly 1948bea24d5bca87a2d0504922debbb705017a5f] [formerly 53d6098d90 [formerly 626c29e113]]
Former-commit-id: 53d6098d90
Former-commit-id: 9087c62468
|
2014-08-12 10:05:08 -05:00 |
|
Richard Peter
|
1ad324d7c1
|
Issue #3458 Update ldm-6.11.5 queue size
Change-Id: I6e434d31c9f39c896630b685ee9d86e81cc32afb
Former-commit-id: 658c9d88a2 [formerly d63eb7e878] [formerly 635393cfb5] [formerly 635393cfb5 [formerly a9f8b72b6f]] [formerly 658c9d88a2 [formerly d63eb7e878] [formerly 635393cfb5] [formerly 635393cfb5 [formerly a9f8b72b6f]] [formerly 7317d99519 [formerly 635393cfb5 [formerly a9f8b72b6f] [formerly 7317d99519 [formerly c717d54c05cdae71b050eeee6afb06e6c71753a8]]]]]
Former-commit-id: 7317d99519
Former-commit-id: da67de45d8 [formerly e6d51c9740] [formerly 17be38c6f8] [formerly 0aff31cc4040dd309a80450166cbbdea76e3ac05 [formerly 66e0acf7f0af2dbdffc6fe5b38f0fc4ee6183eb6] [formerly 17be38c6f8 [formerly 45b822c7cf]]]
Former-commit-id: 90d933cba2ba0e24e6707564fac703c08a961664 [formerly 822ea61d0178197ef1bd9380f947164d6f40ead4] [formerly e59ee6e8c4 [formerly f8cfa2ed28]]
Former-commit-id: e59ee6e8c4
Former-commit-id: f35fab3963
|
2014-08-11 11:54:59 -05:00 |
|
Bryan Kowal
|
2e5a05e74b
|
Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.
Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903
Former-commit-id: 07563e7f91 [formerly 632e493332] [formerly 09442217cd] [formerly 09442217cd [formerly a9b4b4124a]] [formerly 07563e7f91 [formerly 632e493332] [formerly 09442217cd] [formerly 09442217cd [formerly a9b4b4124a]] [formerly b568c25e10 [formerly 09442217cd [formerly a9b4b4124a] [formerly b568c25e10 [formerly d11649deb78aa356f27a22f33b38f7238513576c]]]]]
Former-commit-id: b568c25e10
Former-commit-id: ed8e35815b [formerly fbc1786ab1] [formerly b0c94a2d61] [formerly b16853fe31f52b312142a087ba8a1161db03e2c9 [formerly 74192b218460ef7622e9a89c78967d022d36f146] [formerly b0c94a2d61 [formerly 1d6eb95f9f]]]
Former-commit-id: df69c9a1925207ea8b0825454c1b39bfc3ad11d1 [formerly 76739f9f732ad2b41a7cdf0ad838c5a360a6cc9b] [formerly 0a3fcc0c91 [formerly 25fd6f379f]]
Former-commit-id: 0a3fcc0c91
Former-commit-id: 8ba34e138a
|
2014-08-07 16:27:46 -05:00 |
|
Richard Peter
|
e223c1f50d
|
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: ed8c442352 [formerly d3ba2f19bf] [formerly fc6aae3c3c] [formerly fc6aae3c3c [formerly 477119b739]] [formerly ed8c442352 [formerly d3ba2f19bf] [formerly fc6aae3c3c] [formerly fc6aae3c3c [formerly 477119b739]] [formerly 96a1821753 [formerly fc6aae3c3c [formerly 477119b739] [formerly 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]]]]]
Former-commit-id: 96a1821753
Former-commit-id: bb4008cee3 [formerly 6bb571bc37] [formerly bc7d8bfe6d] [formerly 5a27e66a244460faec856b4274c52f7c2ef30ac6 [formerly 98331407f735241458d85aae0c3f5b6e298efa12] [formerly bc7d8bfe6d [formerly f7e0a6cf11]]]
Former-commit-id: e8709dcd40f81dda9f07dc5c29890dd54e8b2ab9 [formerly 04049b9d4b9e515e807702c87328284991445618] [formerly 83c71feeff [formerly fd18b7a134]]
Former-commit-id: f822f8cf294d2a0dbcc428f5238dfc5c128a4688 [formerly 83c71feeff]
Former-commit-id: 9f90398239
|
2014-08-07 14:01:54 -05:00 |
|
Bryan Kowal
|
d72b7b8cf4
|
Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: 67e65b45c1 [formerly 51cf294761] [formerly dd7ae1f7d3] [formerly dd7ae1f7d3 [formerly dd00d2fe38]] [formerly 67e65b45c1 [formerly 51cf294761] [formerly dd7ae1f7d3] [formerly dd7ae1f7d3 [formerly dd00d2fe38]] [formerly 3b080e7c36 [formerly dd7ae1f7d3 [formerly dd00d2fe38] [formerly 3b080e7c36 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]]]]]
Former-commit-id: 3b080e7c36
Former-commit-id: 0d615a05df [formerly 6a9bfbd79b] [formerly e1e6244b57] [formerly 8130a9d79e056e1068a024567dee26eb7ff23bb1 [formerly 6ec8397ba5668e78293c9747af09f6ddbe896496] [formerly e1e6244b57 [formerly 8576c55443]]]
Former-commit-id: e6624f1440a24014e93bf3109c92cd857a492967 [formerly 1418e0fe6ccbbc6cfa6a472d836d6367b444f12c] [formerly ab26a99200 [formerly 12be1442f1]]
Former-commit-id: ab26a99200
Former-commit-id: 5e18599cf4
|
2014-08-06 16:34:35 -05:00 |
|